@eclipse-che/che-e2e 7.99.0-next-1b2592f → 7.99.0-next-df43559
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/constants/MOCHA_CONSTANTS.ts +1 -1
- package/dist/constants/MOCHA_CONSTANTS.js +1 -1
- package/dist/specs/miscellaneous/CustomOpenVSXRegistry.spec.js +5 -1
- package/dist/specs/miscellaneous/CustomOpenVSXRegistry.spec.js.map +1 -1
- package/dist/specs/miscellaneous/WorkspaceWithParent.spec.js +2 -0
- package/dist/specs/miscellaneous/WorkspaceWithParent.spec.js.map +1 -1
- package/package.json +1 -1
- package/specs/miscellaneous/CustomOpenVSXRegistry.spec.ts +7 -1
- package/specs/miscellaneous/WorkspaceWithParent.spec.ts +3 -0
|
@@ -27,7 +27,7 @@ export const MOCHA_CONSTANTS: {
|
|
|
27
27
|
|
|
28
28
|
MOCHA_DELAYED_SUITE: process.env.MOCHA_DELAYED_SUITE === 'true',
|
|
29
29
|
|
|
30
|
-
MOCHA_DEFAULT_TIMEOUT: Number(process.env.MOCHA_DEFAULT_TIMEOUT) ||
|
|
30
|
+
MOCHA_DEFAULT_TIMEOUT: Number(process.env.MOCHA_DEFAULT_TIMEOUT) || 840000,
|
|
31
31
|
|
|
32
32
|
MOCHA_RETRIES: process.env.MOCHA_RETRIES || BASE_TEST_CONSTANTS.TEST_ENVIRONMENT === '' ? 0 : 2,
|
|
33
33
|
|
|
@@ -16,7 +16,7 @@ exports.MOCHA_CONSTANTS = {
|
|
|
16
16
|
MOCHA_USERSTORY: process.env.USERSTORY || undefined,
|
|
17
17
|
MOCHA_BAIL: process.env.MOCHA_BAIL !== 'false',
|
|
18
18
|
MOCHA_DELAYED_SUITE: process.env.MOCHA_DELAYED_SUITE === 'true',
|
|
19
|
-
MOCHA_DEFAULT_TIMEOUT: Number(process.env.MOCHA_DEFAULT_TIMEOUT) ||
|
|
19
|
+
MOCHA_DEFAULT_TIMEOUT: Number(process.env.MOCHA_DEFAULT_TIMEOUT) || 840000,
|
|
20
20
|
MOCHA_RETRIES: process.env.MOCHA_RETRIES || BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TEST_ENVIRONMENT === '' ? 0 : 2,
|
|
21
21
|
MOCHA_SUITE: process.env.MOCHA_SUITE || undefined,
|
|
22
22
|
MOCHA_GREP: process.env.MOCHA_GREP || undefined
|
|
@@ -34,6 +34,7 @@ suite(`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTA
|
|
|
34
34
|
const appVersion = BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TESTING_APPLICATION_VERSION
|
|
35
35
|
? BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TESTING_APPLICATION_VERSION.split('.').slice(0, 2).join('.')
|
|
36
36
|
: 'next';
|
|
37
|
+
const createWorkspace = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.CreateWorkspace);
|
|
37
38
|
let currentNamespace = '';
|
|
38
39
|
let cheClusterNamespace = '';
|
|
39
40
|
let cheClusterName = '';
|
|
@@ -45,6 +46,7 @@ suite(`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTA
|
|
|
45
46
|
});
|
|
46
47
|
test('Navigate to the factory URL', async function () {
|
|
47
48
|
await browserTabsUtil.navigateTo(FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_URL() || 'https://github.com/redhat-developer/devspaces/');
|
|
49
|
+
await createWorkspace.performTrustAuthorPopup();
|
|
48
50
|
});
|
|
49
51
|
test('Obtain workspace name from workspace loader page', async function () {
|
|
50
52
|
await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
|
|
@@ -93,7 +95,7 @@ suite(`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTA
|
|
|
93
95
|
const podmanPushCommand = `podman push ${internalRegistry}/${currentNamespace}/che-plugin-registry:${appVersion}`;
|
|
94
96
|
const commandToBuildCustomVSXImage = `cd ${pathToPluginRegistry} && yes | ./build.sh`;
|
|
95
97
|
const commandLoginIntoInternalRegistry = 'podman login -u $(oc whoami | tr -d :) -p $(oc whoami -t) image-registry.openshift-image-registry.svc:5000';
|
|
96
|
-
const retagImageCommand = `podman tag quay.io/devspaces/pluginregistry-
|
|
98
|
+
const retagImageCommand = `podman tag quay.io/devspaces/pluginregistry-rhel9:next ${internalRegistry}/${currentNamespace}/che-plugin-registry:${appVersion}`;
|
|
97
99
|
const output = kubernetesCommandLineToolsExecutor.execInContainerCommand(commandToBuildCustomVSXImage);
|
|
98
100
|
(0, chai_1.expect)(output.code).equals(0);
|
|
99
101
|
const outputRetagCommand = kubernetesCommandLineToolsExecutor.execInContainerCommand(retagImageCommand);
|
|
@@ -105,6 +107,7 @@ suite(`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTA
|
|
|
105
107
|
});
|
|
106
108
|
test('Configure Che to use the embedded Eclipse Open VSX server', function () {
|
|
107
109
|
// create secret for using internal registry
|
|
110
|
+
kubernetesCommandLineToolsExecutor.execInContainerCommand(`oc delete secret regcred -n ${cheClusterNamespace} || true`);
|
|
108
111
|
const createRegistrySecretCommand = `oc create secret -n ${cheClusterNamespace} docker-registry regcred --docker-server=${internalRegistry} --docker-username=\$(oc whoami | tr -d :) --docker-password=\$(oc whoami -t)`;
|
|
109
112
|
const createSecretOutput = kubernetesCommandLineToolsExecutor.execInContainerCommand(createRegistrySecretCommand);
|
|
110
113
|
(0, chai_1.expect)(createSecretOutput).contains('regcred created');
|
|
@@ -165,6 +168,7 @@ suite(`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTA
|
|
|
165
168
|
(0, chai_1.expect)(await viewItems[0].getText()).contains('XML Language Support by Red Hat');
|
|
166
169
|
});
|
|
167
170
|
suiteTeardown('Clean up resources and restore default CHE cluster CR', async function () {
|
|
171
|
+
kubernetesCommandLineToolsExecutor.getPodAndContainerNames();
|
|
168
172
|
try {
|
|
169
173
|
kubernetesCommandLineToolsExecutor.execInContainerCommand(`oc delete secret regcred -n ${cheClusterNamespace}`);
|
|
170
174
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomOpenVSXRegistry.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/CustomOpenVSXRegistry.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,mFAAgF;AAChF,6EAA0E;AAE1E,qEAA8D;AAC9D,mEAA+D;AAC/D,uFAAoF;AAGpF,6DAAsF;AACtF,8CAAyD;AACzD,+CAA4C;AAC5C,+BAA8B;AAI9B,yEAAsE;AAEtE,2DAA2C;
|
|
1
|
+
{"version":3,"file":"CustomOpenVSXRegistry.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/CustomOpenVSXRegistry.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,7 @@ suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS_1.BASE_TEST_CON
|
|
|
29
29
|
const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
|
|
30
30
|
const kubernetesCommandLineToolsExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.KubernetesCommandLineToolsExecutor);
|
|
31
31
|
const driverHelper = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.DriverHelper);
|
|
32
|
+
const createWorkspace = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.CreateWorkspace);
|
|
32
33
|
let podName = '';
|
|
33
34
|
suiteSetup(function () {
|
|
34
35
|
kubernetesCommandLineToolsExecutor.loginToOcp();
|
|
@@ -43,6 +44,7 @@ suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS_1.BASE_TEST_CON
|
|
|
43
44
|
await dashboard.waitPage();
|
|
44
45
|
await testWorkspaceUtil.switchOffTrustDialogWithJavaScript();
|
|
45
46
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
47
|
+
await createWorkspace.performTrustAuthorPopup();
|
|
46
48
|
await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
|
|
47
49
|
(0, MochaHooks_1.registerRunningWorkspace)(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
48
50
|
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceWithParent.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/WorkspaceWithParent.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,qEAA8D;AAE9D,6DAA8G;AAC9G,mEAA+D;AAK/D,6EAA0E;AAC1E,+BAA8B;AAC9B,2EAAwE;AACxE,uFAAoF;AACpF,8CAAyD;AAIzD,yEAAsE;AACtE,mFAAgF;
|
|
1
|
+
{"version":3,"file":"WorkspaceWithParent.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/WorkspaceWithParent.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -25,6 +25,7 @@ import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
|
|
|
25
25
|
import { TIMEOUT_CONSTANTS } from '../../constants/TIMEOUT_CONSTANTS';
|
|
26
26
|
import { DriverHelper } from '../../utils/DriverHelper';
|
|
27
27
|
import { error } from 'selenium-webdriver';
|
|
28
|
+
import { CreateWorkspace } from '../../pageobjects/dashboard/CreateWorkspace';
|
|
28
29
|
|
|
29
30
|
suite(
|
|
30
31
|
`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL} repository`,
|
|
@@ -42,6 +43,7 @@ suite(
|
|
|
42
43
|
const appVersion: string = BASE_TEST_CONSTANTS.TESTING_APPLICATION_VERSION
|
|
43
44
|
? BASE_TEST_CONSTANTS.TESTING_APPLICATION_VERSION.split('.').slice(0, 2).join('.')
|
|
44
45
|
: 'next';
|
|
46
|
+
const createWorkspace: CreateWorkspace = e2eContainer.get(CLASSES.CreateWorkspace);
|
|
45
47
|
let currentNamespace: string | undefined = '';
|
|
46
48
|
let cheClusterNamespace: string | undefined = '';
|
|
47
49
|
let cheClusterName: string | undefined = '';
|
|
@@ -56,6 +58,7 @@ suite(
|
|
|
56
58
|
await browserTabsUtil.navigateTo(
|
|
57
59
|
FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_URL() || 'https://github.com/redhat-developer/devspaces/'
|
|
58
60
|
);
|
|
61
|
+
await createWorkspace.performTrustAuthorPopup();
|
|
59
62
|
});
|
|
60
63
|
|
|
61
64
|
test('Obtain workspace name from workspace loader page', async function (): Promise<void> {
|
|
@@ -112,7 +115,7 @@ suite(
|
|
|
112
115
|
const commandToBuildCustomVSXImage: string = `cd ${pathToPluginRegistry} && yes | ./build.sh`;
|
|
113
116
|
const commandLoginIntoInternalRegistry: string =
|
|
114
117
|
'podman login -u $(oc whoami | tr -d :) -p $(oc whoami -t) image-registry.openshift-image-registry.svc:5000';
|
|
115
|
-
const retagImageCommand: string = `podman tag quay.io/devspaces/pluginregistry-
|
|
118
|
+
const retagImageCommand: string = `podman tag quay.io/devspaces/pluginregistry-rhel9:next ${internalRegistry}/${currentNamespace}/che-plugin-registry:${appVersion}`;
|
|
116
119
|
|
|
117
120
|
const output: ShellString = kubernetesCommandLineToolsExecutor.execInContainerCommand(commandToBuildCustomVSXImage);
|
|
118
121
|
expect(output.code).equals(0);
|
|
@@ -130,6 +133,8 @@ suite(
|
|
|
130
133
|
|
|
131
134
|
test('Configure Che to use the embedded Eclipse Open VSX server', function (): void {
|
|
132
135
|
// create secret for using internal registry
|
|
136
|
+
kubernetesCommandLineToolsExecutor.execInContainerCommand(`oc delete secret regcred -n ${cheClusterNamespace} || true`);
|
|
137
|
+
|
|
133
138
|
const createRegistrySecretCommand: string = `oc create secret -n ${cheClusterNamespace} docker-registry regcred --docker-server=${internalRegistry} --docker-username=\$(oc whoami | tr -d :) --docker-password=\$(oc whoami -t)`;
|
|
134
139
|
const createSecretOutput: string = kubernetesCommandLineToolsExecutor.execInContainerCommand(createRegistrySecretCommand);
|
|
135
140
|
expect(createSecretOutput).contains('regcred created');
|
|
@@ -194,6 +199,7 @@ suite(
|
|
|
194
199
|
});
|
|
195
200
|
|
|
196
201
|
suiteTeardown('Clean up resources and restore default CHE cluster CR', async function (): Promise<void> {
|
|
202
|
+
kubernetesCommandLineToolsExecutor.getPodAndContainerNames();
|
|
197
203
|
try {
|
|
198
204
|
kubernetesCommandLineToolsExecutor.execInContainerCommand(`oc delete secret regcred -n ${cheClusterNamespace}`);
|
|
199
205
|
} catch (error) {
|
|
@@ -25,6 +25,7 @@ import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
|
|
|
25
25
|
import { DriverHelper } from '../../utils/DriverHelper';
|
|
26
26
|
import { TIMEOUT_CONSTANTS } from '../../constants/TIMEOUT_CONSTANTS';
|
|
27
27
|
import { FACTORY_TEST_CONSTANTS } from '../../constants/FACTORY_TEST_CONSTANTS';
|
|
28
|
+
import { CreateWorkspace } from '../../pageobjects/dashboard/CreateWorkspace';
|
|
28
29
|
|
|
29
30
|
suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
|
|
30
31
|
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
@@ -38,6 +39,7 @@ suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS.TEST_ENVIRONMEN
|
|
|
38
39
|
CLASSES.KubernetesCommandLineToolsExecutor
|
|
39
40
|
);
|
|
40
41
|
const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
|
|
42
|
+
const createWorkspace: CreateWorkspace = e2eContainer.get(CLASSES.CreateWorkspace);
|
|
41
43
|
let podName: string = '';
|
|
42
44
|
|
|
43
45
|
suiteSetup(function (): void {
|
|
@@ -56,6 +58,7 @@ suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS.TEST_ENVIRONMEN
|
|
|
56
58
|
await dashboard.waitPage();
|
|
57
59
|
await testWorkspaceUtil.switchOffTrustDialogWithJavaScript();
|
|
58
60
|
await browserTabsUtil.navigateTo(factoryUrl);
|
|
61
|
+
await createWorkspace.performTrustAuthorPopup();
|
|
59
62
|
await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
|
|
60
63
|
registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
|
|
61
64
|
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|