Skip to content

Commit

Permalink
Merge pull request #13257 from rhamilto/CONSOLE-3788
Browse files Browse the repository at this point in the history
CONSOLE-3788: migrate console Protractor tests to Cypress
  • Loading branch information
openshift-ci[bot] committed Oct 27, 2023
2 parents 351effc + 75f624b commit d051f6d
Show file tree
Hide file tree
Showing 39 changed files with 1,494 additions and 2,051 deletions.
46 changes: 2 additions & 44 deletions frontend/integration-tests/protractor.conf.ts
Expand Up @@ -8,10 +8,7 @@ import * as failFast from 'protractor-fail-fast';
import { createWriteStream, writeFileSync } from 'fs';
import { format } from 'util';
import { resolvePluginPackages } from '@console/plugin-sdk/src/codegen/plugin-resolver';
import {
reducePluginTestSuites,
mergeTestSuites,
} from '@console/plugin-sdk/src/codegen/plugin-integration-tests';
import { reducePluginTestSuites } from '@console/plugin-sdk/src/codegen/plugin-integration-tests';

const tap = !!process.env.TAP;

Expand Down Expand Up @@ -48,42 +45,6 @@ const suite = (tests: string[]): string[] =>
...tests,
]);

// TODO(vojtech): move base Console test suites to console-app package
const testSuites = {
environment: suite(['tests/environment.scenario.ts']),
secrets: suite(['tests/secrets.scenario.ts']),
crud: suite(['tests/secrets.scenario.ts', 'tests/environment.scenario.ts']),
monitoring: suite(['tests/monitoring.scenario.ts']),
newApp: suite(['tests/deploy-image.scenario.ts']),
oauth: suite(['tests/oauth.scenario.ts']),
e2e: suite([
'tests/secrets.scenario.ts',
'tests/environment.scenario.ts',
'tests/deploy-image.scenario.ts',
'tests/monitoring.scenario.ts',
'tests/alertmanager.scenario.ts',
'tests/oauth.scenario.ts',
'tests/cluster-settings.scenario.ts',
]),
release: suite([
'tests/secrets.scenario.ts',
'tests/environment.scenario.ts',
'tests/deploy-image.scenario.ts',
'tests/monitoring.scenario.ts',
]),
all: suite([
'tests/secrets.scenario.ts',
'tests/deploy-image.scenario.ts',
'tests/monitoring.scenario.ts',
'tests/alertmanager.scenario.ts',
'tests/oauth.scenario.ts',
'tests/cluster-settings.scenario.ts',
]),
clusterSettings: suite(['tests/cluster-settings.scenario.ts']),
alertmanager: suite(['tests/alertmanager.scenario.ts']),
login: ['tests/login.scenario.ts'],
};

export const config = {
framework: 'jasmine',
directConnect: true,
Expand Down Expand Up @@ -170,10 +131,7 @@ export const config = {
failFast.clean();
return new Promise((resolve) => htmlReporter.afterLaunch(resolve.bind(this, exitCode)));
},
suites: mergeTestSuites(
testSuites,
reducePluginTestSuites(resolvePluginPackages(), __dirname, suite),
),
suites: reducePluginTestSuites(resolvePluginPackages(), __dirname, suite),
params: {
// Set to 'true' to enable OpenShift resources in the crud scenario.
// Use a string rather than boolean so it can be specified on the command line:
Expand Down
519 changes: 0 additions & 519 deletions frontend/integration-tests/tests/alertmanager.scenario.ts

This file was deleted.

25 changes: 0 additions & 25 deletions frontend/integration-tests/tests/base.scenario.ts

This file was deleted.

94 changes: 0 additions & 94 deletions frontend/integration-tests/tests/cluster-settings.scenario.ts

This file was deleted.

187 changes: 0 additions & 187 deletions frontend/integration-tests/tests/environment.scenario.ts

This file was deleted.

0 comments on commit d051f6d

Please sign in to comment.