@eclipse-che/che-e2e 7.76.0-next-a90153c → 7.76.0-next-f98fe6d
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/configs/mocharc.ts +4 -2
- package/configs/reporters.config.js +51 -0
- package/configs/sh-scripts/runDevfileAcceptanceTests.sh +81 -0
- package/configs/sh-scripts/runFunctionalTests.sh +6 -6
- package/constants/BASE_TEST_CONSTANTS.ts +15 -3
- package/constants/MOCHA_CONSTANTS.ts +5 -2
- package/constants/REPORTER_CONSTANTS.ts +98 -5
- package/constants/TIMEOUT_CONSTANTS.ts +10 -22
- package/dist/configs/mocharc.js +4 -2
- package/dist/configs/mocharc.js.map +1 -1
- package/dist/constants/BASE_TEST_CONSTANTS.js +12 -2
- package/dist/constants/BASE_TEST_CONSTANTS.js.map +1 -1
- package/dist/constants/MOCHA_CONSTANTS.js +3 -2
- package/dist/constants/MOCHA_CONSTANTS.js.map +1 -1
- package/dist/constants/REPORTER_CONSTANTS.js +70 -2
- package/dist/constants/REPORTER_CONSTANTS.js.map +1 -1
- package/dist/constants/TIMEOUT_CONSTANTS.js +0 -8
- package/dist/constants/TIMEOUT_CONSTANTS.js.map +1 -1
- package/dist/specs/MochaHooks.js +4 -3
- package/dist/specs/MochaHooks.js.map +1 -1
- package/dist/specs/SmokeTest.spec.js +1 -1
- package/dist/specs/SmokeTest.spec.js.map +1 -1
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +3 -1
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -1
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js +0 -3
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
- package/dist/suites/devfile-acceptance-test-suite/DynamicallyGeneratingAPITest.suite.js +13 -0
- package/dist/suites/devfile-acceptance-test-suite/DynamicallyGeneratingAPITest.suite.js.map +1 -0
- package/dist/tests-library/LoginTests.js +1 -1
- package/dist/tests-library/LoginTests.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js +2 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
- package/dist/utils/DevfilesRegistryHelper.js +40 -37
- package/dist/utils/DevfilesRegistryHelper.js.map +1 -1
- package/dist/utils/KubernetesCommandLineToolsExecutor.js +9 -8
- package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
- package/package.json +10 -9
- package/specs/MochaHooks.ts +4 -3
- package/specs/SmokeTest.spec.ts +1 -1
- package/specs/api/DevfileAcceptanceTestAPI.spec.ts +5 -1
- package/specs/api/EmptyWorkspaceAPI.spec.ts +0 -4
- package/suites/devfile-acceptance-test-suite/DynamicallyGeneratingAPITest.suite.ts +10 -0
- package/tests-library/LoginTests.ts +4 -1
- package/tsconfig.json +1 -1
- package/utils/DevWorkspaceConfigurationHelper.ts +4 -1
- package/utils/DevfilesRegistryHelper.ts +41 -39
- package/utils/KubernetesCommandLineToolsExecutor.ts +8 -8
- package/configs/reporters-config.json +0 -6
package/dist/specs/MochaHooks.js
CHANGED
|
@@ -48,6 +48,7 @@ const CHROME_DRIVER_CONSTANTS_1 = require("../constants/CHROME_DRIVER_CONSTANTS"
|
|
|
48
48
|
const inversify_1 = require("inversify");
|
|
49
49
|
const main_1 = require("@eclipse-che/che-devworkspace-generator/lib/main");
|
|
50
50
|
const loader_1 = require("monaco-page-objects/out/locators/loader");
|
|
51
|
+
const REPORTER_CONSTANTS_1 = require("../constants/REPORTER_CONSTANTS");
|
|
51
52
|
const driverHelper = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.DriverHelper);
|
|
52
53
|
let latestWorkspace = '';
|
|
53
54
|
function registerRunningWorkspace(workspaceName) {
|
|
@@ -82,15 +83,15 @@ exports.mochaHooks = {
|
|
|
82
83
|
if (BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_DEBUG_MODE) {
|
|
83
84
|
for (const [timeout, seconds] of Object.entries(TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS)) {
|
|
84
85
|
Object.defineProperty(TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS, timeout, {
|
|
85
|
-
value: seconds *
|
|
86
|
+
value: seconds * 2
|
|
86
87
|
});
|
|
87
88
|
}
|
|
88
89
|
}
|
|
89
90
|
}
|
|
90
91
|
],
|
|
91
92
|
afterEach: [
|
|
92
|
-
async function () {
|
|
93
|
-
if (this.currentTest?.state === 'failed') {
|
|
93
|
+
async function saveAllureAttachments() {
|
|
94
|
+
if (REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.SAVE_ALLURE_REPORT_DATA && this.currentTest?.state === 'failed') {
|
|
94
95
|
try {
|
|
95
96
|
const screenshot = await driverHelper.getDriver().takeScreenshot();
|
|
96
97
|
runtime_1.allure.attachment('Screenshot', Buffer.from(screenshot, 'base64'), 'image/png');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MochaHooks.js","sourceRoot":"","sources":["../../specs/MochaHooks.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,gEAA4D;AAC5D,yFAAsF;AACtF,sEAAmE;AACnE,uEAAyD;AACzD,gGAAkF;AAClF,kEAA2D;AAG3D,4CAAyC;AACzC,kDAA8C;AAC9C,0EAAuE;AACvE,oEAAiE;AACjE,kFAA+E;AAC/E,yCAA4D;AAC5D,2EAAwE;AACxE,oEAAwE;
|
|
1
|
+
{"version":3,"file":"MochaHooks.js","sourceRoot":"","sources":["../../specs/MochaHooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const StringUtil_1 = require("../utils/StringUtil");
|
|
|
8
8
|
const FACTORY_TEST_CONSTANTS_1 = require("../constants/FACTORY_TEST_CONSTANTS");
|
|
9
9
|
const chai_1 = require("chai");
|
|
10
10
|
const BASE_TEST_CONSTANTS_1 = require("../constants/BASE_TEST_CONSTANTS");
|
|
11
|
-
suite(
|
|
11
|
+
suite(`The SmokeTest userstory ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function () {
|
|
12
12
|
const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
|
|
13
13
|
const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
|
|
14
14
|
const loginTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.LoginTests);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmokeTest.spec.js","sourceRoot":"","sources":["../../specs/SmokeTest.spec.ts"],"names":[],"mappings":";;AAWA,gEAAqD;AACrD,kEAA2D;AAC3D,oFAAiF;AACjF,6CAAwD;AAExD,oDAAiD;AACjD,gFAA6E;AAE7E,+BAA8B;AAC9B,0EAAuE;AAEvE,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"SmokeTest.spec.js","sourceRoot":"","sources":["../../specs/SmokeTest.spec.ts"],"names":[],"mappings":";;AAWA,gEAAqD;AACrD,kEAA2D;AAC3D,oFAAiF;AACjF,6CAAwD;AAExD,oDAAiD;AACjD,gFAA6E;AAE7E,+BAA8B;AAC9B,0EAAuE;AAEvE,KAAK,CAAC,2BAA2B,yCAAmB,CAAC,gBAAgB,EAAE,EAAE;IACxE,MAAM,mBAAmB,GAAwB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,mBAAmB,CAAC,CAAC;IAC/F,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;IACxG,MAAM,UAAU,GAAe,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,UAAU,CAAC,CAAC;IACpE,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;IACnF,MAAM,UAAU,GACf,+CAAsB,CAAC,gCAAgC,IAAI,0DAA0D,CAAC;IACvH,IAAI,cAA2B,CAAC;IAChC,KAAK,CAAC,iCAAiC,UAAU,EAAE,EAAE;QACpD,UAAU,CAAC,YAAY,EAAE,CAAC;QAC1B,IAAI,CAAC,8CAA8C,UAAU,EAAE,EAAE,KAAK;YACrE,MAAM,sBAAsB,CAAC,uCAAuC,CAAC,UAAU,CAAC,CAAC;QAClF,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,kDAAkD,EAAE,KAAK;YAC7D,MAAM,sBAAsB,CAAC,mCAAmC,EAAE,CAAC;QACpE,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,4BAA4B,EAAE;YAClC,IAAA,qCAAwB,EAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,0BAA0B,EAAE,KAAK;YACrC,MAAM,mBAAmB,CAAC,sCAAsC,EAAE,CAAC;QACpE,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,yCAAyC,EAAE,KAAK;YACpD,MAAM,WAAW,GAAW,+CAAsB,CAAC,wBAAwB,IAAI,uBAAU,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;YAC/H,cAAc,GAAG,MAAM,mBAAmB,CAAC,qBAAqB,EAAE,CAAC;YACnE,IAAA,aAAM,EAAC,MAAM,mBAAmB,CAAC,kBAAkB,CAAC,cAAc,EAAE,WAAW,CAAC,EAAE,iCAAiC,CAAC,CAAC,GAAG;iBACtH,SAAS,CAAC;QACb,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,sCAAsC,EAAE,KAAK;YACjD,IAAA,aAAM,EACL,MAAM,mBAAmB,CAAC,kBAAkB,CAAC,cAAc,EAAE,yCAAmB,CAAC,kCAAkC,CAAC,EACpH,iCAAiC,CACjC,CAAC,GAAG,CAAC,SAAS,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,oBAAoB,EAAE,KAAK;YAC/B,MAAM,sBAAsB,CAAC,aAAa,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;YACtF,MAAM,eAAe,CAAC,yBAAyB,EAAE,CAAC;QACnD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,sBAAsB,EAAE,KAAK;YACjC,MAAM,sBAAsB,CAAC,eAAe,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACzF,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,aAAa,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -8,6 +8,7 @@ const inversify_config_1 = require("../../configs/inversify.config");
|
|
|
8
8
|
const inversify_types_1 = require("../../configs/inversify.types");
|
|
9
9
|
const MOCHA_CONSTANTS_1 = require("../../constants/MOCHA_CONSTANTS");
|
|
10
10
|
const API_TEST_CONSTANTS_1 = require("../../constants/API_TEST_CONSTANTS");
|
|
11
|
+
const BASE_TEST_CONSTANTS_1 = require("../../constants/BASE_TEST_CONSTANTS");
|
|
11
12
|
/**
|
|
12
13
|
* dynamically generating tests
|
|
13
14
|
* info: https://mochajs.org/#delayed-root-suite
|
|
@@ -15,7 +16,8 @@ const API_TEST_CONSTANTS_1 = require("../../constants/API_TEST_CONSTANTS");
|
|
|
15
16
|
void (async function () {
|
|
16
17
|
const devfilesRegistryHelper = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.DevfilesRegistryHelper);
|
|
17
18
|
let devfileSamples = [];
|
|
18
|
-
if (MOCHA_CONSTANTS_1.MOCHA_CONSTANTS.MOCHA_DELAYED_SUITE &&
|
|
19
|
+
if (MOCHA_CONSTANTS_1.MOCHA_CONSTANTS.MOCHA_DELAYED_SUITE &&
|
|
20
|
+
!API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_ACCEPTANCE_TEST_REGISTRY_URL().includes(BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL)) {
|
|
19
21
|
devfileSamples = await devfilesRegistryHelper.collectPathsToDevfilesFromRegistry(false);
|
|
20
22
|
}
|
|
21
23
|
for (const devfileSample of devfileSamples) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevfileAcceptanceTestAPI.spec.js","sourceRoot":"","sources":["../../../specs/api/DevfileAcceptanceTestAPI.spec.ts"],"names":[],"mappings":";;AAUA,iGAA8F;AAE9F,+BAA8B;AAE9B,uDAAoD;AACpD,+CAA4C;AAC5C,qEAA8D;AAC9D,mEAAwD;AAExD,qEAAkE;AAClE,2EAAwE;
|
|
1
|
+
{"version":3,"file":"DevfileAcceptanceTestAPI.spec.js","sourceRoot":"","sources":["../../../specs/api/DevfileAcceptanceTestAPI.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,9 +50,6 @@ suite('Empty workspace API test', function () {
|
|
|
50
50
|
test('Check if project files are imported', function () {
|
|
51
51
|
(0, chai_1.expect)(containerTerminal.ls(`${containerWorkDir}/${clonedProjectName}`).stdout).includes(BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
|
|
52
52
|
});
|
|
53
|
-
suiteTeardown('Delete cloned project', function () {
|
|
54
|
-
containerTerminal.removeFolder(`${clonedProjectName}`);
|
|
55
|
-
});
|
|
56
53
|
});
|
|
57
54
|
suiteTeardown('Delete workspace', function () {
|
|
58
55
|
kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmptyWorkspaceAPI.spec.js","sourceRoot":"","sources":["../../../specs/api/EmptyWorkspaceAPI.spec.ts"],"names":[],"mappings":";;AAUA,+BAA8B;AAE9B,uDAAoD;AACpD,iGAA8F;AAE9F,2EAAwE;AACxE,6EAA0E;AAC1E,qEAA8D;AAC9D,mEAAwD;AAExD,KAAK,CAAC,0BAA0B,EAAE;IACjC,2BAA2B;IAC3B,MAAM,SAAS,GAAuB,uCAAkB,CAAC,qBAAqB,CAAC;IAC/E,IAAI,iBAAyB,CAAC;IAC9B,IAAI,gBAAwB,CAAC;IAC7B,IAAI,+BAAgE,CAAC;IACrE,IAAI,kCAAsE,CAAC;IAC3E,IAAI,cAA8B,CAAC;IACnC,IAAI,gBAAoC,CAAC;IACzC,IAAI,iBAAoC,CAAC;IAEzC,MAAM,aAAa,GAAW,6CAA6C,CAAC;IAE5E,UAAU,CAAC,yCAAyC,yCAAmB,CAAC,gBAAgB,EAAE,EAAE,KAAK;QAChG,MAAM,aAAa,GAAW,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;QAC1E,MAAM,cAAc,GAAW,wBAAwB,GAAG,aAAa,GAAG,WAAW,aAAa,IAAI,CAAC;QAEvG,+BAA+B,GAAG,IAAI,iEAA+B,CAAC;YACrE,cAAc;SACd,CAAC,CAAC;QACH,cAAc,GAAG,MAAM,+BAA+B,CAAC,sBAAsB,EAAE,CAAC;QAChF,gBAAgB,GAAG,cAAc,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC;QAChE,kCAAkC,GAAG,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,kCAAkC,CAAC,CAAC;QAClG,kCAAkC,CAAC,aAAa,GAAG,gBAAgB,CAAC;QACpE,kCAAkC,CAAC,SAAS,GAAG,SAAS,CAAC;QACzD,iBAAiB,GAAG,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,iBAAiB,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,wBAAwB,EAAE;QAC9B,kCAAkC,CAAC,UAAU,EAAE,CAAC;QAChD,MAAM,mCAAmC,GACxC,+BAA+B,CAAC,wCAAwC,CAAC,cAAc,CAAC,CAAC;QAC1F,MAAM,MAAM,GAAgB,kCAAkC,CAAC,wBAAwB,CAAC,mCAAmC,CAAC,CAAC;QAC7H,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,4CAA4C,yCAAmB,CAAC,gBAAgB,EAAE,EAAE;QACzF,IAAI,CAAC,oCAAoC,EAAE;YAC1C,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACpE,MAAM,WAAW,GAAgB,iBAAiB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC3E,IAAA,aAAM,EAAC,WAAW,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,8BAA8B,EAAE;YACpC,iBAAiB,GAAG,uBAAU,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;YACvE,IAAA,aAAM,EAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,qCAAqC,EAAE;YAC3C,IAAA,aAAM,EAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,gBAAgB,IAAI,iBAAiB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CACvF,yCAAmB,CAAC,kCAAkC,CACtD,CAAC;QACH,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"EmptyWorkspaceAPI.spec.js","sourceRoot":"","sources":["../../../specs/api/EmptyWorkspaceAPI.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
/** *******************************************************************
|
|
4
|
+
* copyright (c) 2023 Red Hat, Inc.
|
|
5
|
+
*
|
|
6
|
+
* This program and the accompanying materials are made
|
|
7
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
8
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
9
|
+
*
|
|
10
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
11
|
+
**********************************************************************/
|
|
12
|
+
require("../../specs/api/DevfileAcceptanceTestAPI.spec");
|
|
13
|
+
//# sourceMappingURL=DynamicallyGeneratingAPITest.suite.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DynamicallyGeneratingAPITest.suite.js","sourceRoot":"","sources":["../../../suites/devfile-acceptance-test-suite/DynamicallyGeneratingAPITest.suite.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,yDAAuD"}
|
|
@@ -47,7 +47,7 @@ let LoginTests = class LoginTests {
|
|
|
47
47
|
}
|
|
48
48
|
loginIntoOcpConsole() {
|
|
49
49
|
test('Login into ocp console', async () => {
|
|
50
|
-
const openshiftConsoleUrl = BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace(
|
|
50
|
+
const openshiftConsoleUrl = BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace(BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME(), 'console-openshift-console');
|
|
51
51
|
await this.browserTabsUtil.navigateTo(openshiftConsoleUrl);
|
|
52
52
|
await this.ocpLoginPage.login();
|
|
53
53
|
await this.browserTabsUtil.maximize();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginTests.js","sourceRoot":"","sources":["../../tests-library/LoginTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,gEAA4D;AAE5D,8DAA2D;AAC3D,yCAA+C;AAC/C,kEAA+D;AAE/D,0EAAuE;AACvE,oDAA+D;AAGxD,IAAM,UAAU,GAAhB,MAAM,UAAU;IACtB,YAEkB,eAAgC,EAEhC,gBAA+B,EACP,YAA2B,EACxB,SAAoB;QAJ/C,oBAAe,GAAf,eAAe,CAAiB;QAEhC,qBAAgB,GAAhB,gBAAgB,CAAe;QACP,iBAAY,GAAZ,YAAY,CAAe;QACxB,cAAS,GAAT,SAAS,CAAW;IAC9D,CAAC;IAEJ,YAAY,CAAC,QAAiB,EAAE,QAAiB;QAChD,IAAI,CAAC,OAAO,EAAE,KAAK,IAAmB,EAAE;YACvC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAC,yCAAmB,CAAC,oBAAoB,CAAC,EAAE;gBACrG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,yCAAmB,CAAC,oBAAoB,CAAC,CAAC;aAChF;YACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACtD,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,IAAI,CAAC,SAAS,CAAC,mCAAmC,EAAE,CAAC;QAC5D,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,mBAAmB;QAClB,IAAI,CAAC,wBAAwB,EAAE,KAAK,IAAmB,EAAE;YACxD,MAAM,mBAAmB,GAAW,yCAAmB,CAAC,oBAAoB,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"LoginTests.js","sourceRoot":"","sources":["../../tests-library/LoginTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,gEAA4D;AAE5D,8DAA2D;AAC3D,yCAA+C;AAC/C,kEAA+D;AAE/D,0EAAuE;AACvE,oDAA+D;AAGxD,IAAM,UAAU,GAAhB,MAAM,UAAU;IACtB,YAEkB,eAAgC,EAEhC,gBAA+B,EACP,YAA2B,EACxB,SAAoB;QAJ/C,oBAAe,GAAf,eAAe,CAAiB;QAEhC,qBAAgB,GAAhB,gBAAgB,CAAe;QACP,iBAAY,GAAZ,YAAY,CAAe;QACxB,cAAS,GAAT,SAAS,CAAW;IAC9D,CAAC;IAEJ,YAAY,CAAC,QAAiB,EAAE,QAAiB;QAChD,IAAI,CAAC,OAAO,EAAE,KAAK,IAAmB,EAAE;YACvC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAC,yCAAmB,CAAC,oBAAoB,CAAC,EAAE;gBACrG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,yCAAmB,CAAC,oBAAoB,CAAC,CAAC;aAChF;YACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACtD,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,IAAI,CAAC,SAAS,CAAC,mCAAmC,EAAE,CAAC;QAC5D,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,mBAAmB;QAClB,IAAI,CAAC,wBAAwB,EAAE,KAAK,IAAmB,EAAE;YACxD,MAAM,mBAAmB,GAAW,yCAAmB,CAAC,oBAAoB,CAAC,OAAO,CACnF,yCAAmB,CAAC,wBAAwB,EAAE,EAC9C,2BAA2B,CAC3B,CAAC;YACF,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;YAC3D,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QACvC,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,aAAa;QACZ,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAmB,EAAE;YACxC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YAC9B,IAAA,qCAAwB,EAAC,EAAE,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAvCY,UAAU;IADtB,IAAA,sBAAU,GAAE;IAGV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,eAAe,CAAC,CAAA;IAE/B,WAAA,IAAA,kBAAM,EAAC,uBAAK,CAAC,QAAQ,CAAC,CAAA;IAEtB,WAAA,IAAA,kBAAM,EAAC,uBAAK,CAAC,QAAQ,CAAC,CAAA;IACtB,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,SAAS,CAAC,CAAA;qCAJQ,iCAAe,kBAIM,qBAAS;GAPrD,UAAU,CAuCtB;AAvCY,gCAAU"}
|
|
@@ -97,7 +97,7 @@ let DevWorkspaceConfigurationHelper = class DevWorkspaceConfigurationHelper {
|
|
|
97
97
|
return allContentArray.join('---\n');
|
|
98
98
|
}
|
|
99
99
|
getDevWorkspaceConfigurationsAsYaml(allContentString) {
|
|
100
|
-
Logger_1.Logger.debug(
|
|
100
|
+
Logger_1.Logger.debug();
|
|
101
101
|
const content = {};
|
|
102
102
|
const contentArray = allContentString.split('---\n');
|
|
103
103
|
contentArray.forEach((e) => {
|
|
@@ -111,6 +111,7 @@ let DevWorkspaceConfigurationHelper = class DevWorkspaceConfigurationHelper {
|
|
|
111
111
|
return content;
|
|
112
112
|
}
|
|
113
113
|
patchDevWorkspaceConfigWithBuildContainerAttribute(devfileContextDevWorkspace) {
|
|
114
|
+
Logger_1.Logger.debug();
|
|
114
115
|
devfileContextDevWorkspace.spec.template.attributes = yaml_1.default.parse(`
|
|
115
116
|
controller.devfile.io/devworkspace-config:
|
|
116
117
|
name: devworkspace-config
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevWorkspaceConfigurationHelper.js","sourceRoot":"","sources":["../../utils/DevWorkspaceConfigurationHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,2EAAqF;AAGrF,gDAAwB;AACxB,6CAA+B;AAC/B,qCAAkC;AAClC,mDAAgD;AAChD,wEAAqE;AACrE,yCAAuC;AAEvC,kEAA2D;AAC3D,gEAAuE;AACvE,8FAAwD;AAExD,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,qCAAa,EAAC,+BAAY,CAAC,CAAC;AAG5C,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAO3C,YAAY,MAAsB;QACjC,yBAAyB;QACzB,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE;YACvE,MAAM,CAAC,WAAW,GAAG,+BAA+B,CAAC;SACrD;QACD,iCAAiC;QACjC,IAAI,uCAAkB,CAAC,qBAAqB,IAAI,MAAM,CAAC,qBAAqB,EAAE;YAC7E,MAAM,CAAC,sBAAsB,GAAG,MAAM,CAAC;YACvC,sEAAsE;YACtE,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE;gBAClC,MAAM,CAAC,qBAAqB,GAAG,uCAAkB,CAAC,qBAAqB,CAAC;aACxE;SACD;QACD,2DAA2D;QAC3D,IAAI,uCAAkB,CAAC,+BAA+B,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;YACpF,MAAM,CAAC,iBAAiB,GAAG,uCAAkB,CAAC,+BAA+B,CAAC;SAC9E;QACD,IAAI,uCAAkB,CAAC,uCAAuC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACxF,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,uCAAkB,CAAC,uCAAuC,CAAC,CAAC,MAAM,CAAC;SAClH;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC3B,eAAM,CAAC,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"DevWorkspaceConfigurationHelper.js","sourceRoot":"","sources":["../../utils/DevWorkspaceConfigurationHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,50 +32,53 @@ let DevfilesRegistryHelper = class DevfilesRegistryHelper {
|
|
|
32
32
|
}
|
|
33
33
|
async getGitHubCheDevfileRegistryContent() {
|
|
34
34
|
Logger_1.Logger.trace();
|
|
35
|
-
|
|
35
|
+
const url = API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_ACCEPTANCE_TEST_REGISTRY_URL() === ''
|
|
36
|
+
? API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES.GIT_HUB_CHE_DEVFILE_REGISTRY_URL
|
|
37
|
+
: API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_ACCEPTANCE_TEST_REGISTRY_URL();
|
|
38
|
+
return await this.getContent(url);
|
|
36
39
|
}
|
|
37
|
-
async collectPathsToDevfilesFromRegistry(isInbuilt
|
|
40
|
+
async collectPathsToDevfilesFromRegistry(isInbuilt, sampleNamePatterns) {
|
|
38
41
|
Logger_1.Logger.debug();
|
|
39
42
|
const devfileSamples = [];
|
|
40
43
|
const sampleNames = [];
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
sampleNames.push(e.name);
|
|
48
|
-
}
|
|
49
|
-
});
|
|
50
|
-
for (const sample of sampleNames) {
|
|
51
|
-
const sampleEndpoint = `${API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES.GIT_HUB_CHE_DEVFILE_REGISTRY_URL}${sample}/meta.yaml`;
|
|
52
|
-
const sampleEndpointContent = await this.getContent(sampleEndpoint);
|
|
53
|
-
const decodedFileContent = Buffer.from(sampleEndpointContent.content, 'base64').toString();
|
|
54
|
-
const metaYamlContent = yaml_1.default.parse(decodedFileContent);
|
|
55
|
-
devfileSamples.push({
|
|
56
|
-
name: sample,
|
|
57
|
-
link: metaYamlContent.links.v2
|
|
58
|
-
});
|
|
44
|
+
if (!isInbuilt) {
|
|
45
|
+
{
|
|
46
|
+
const content = await this.getGitHubCheDevfileRegistryContent();
|
|
47
|
+
content.forEach((e) => {
|
|
48
|
+
if (e.name[0] !== '.') {
|
|
49
|
+
sampleNames.push(e.name);
|
|
59
50
|
}
|
|
60
|
-
|
|
51
|
+
});
|
|
52
|
+
for (const sample of sampleNames) {
|
|
53
|
+
const sampleEndpoint = `${API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES.GIT_HUB_CHE_DEVFILE_REGISTRY_URL}${sample}/meta.yaml`;
|
|
54
|
+
const sampleEndpointContent = await this.getContent(sampleEndpoint);
|
|
55
|
+
const decodedFileContent = Buffer.from(sampleEndpointContent.content, 'base64').toString();
|
|
56
|
+
const metaYamlContent = yaml_1.default.parse(decodedFileContent);
|
|
57
|
+
devfileSamples.push({
|
|
58
|
+
name: sample,
|
|
59
|
+
link: metaYamlContent.links.v2
|
|
60
|
+
});
|
|
61
61
|
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
62
|
+
Logger_1.Logger.debug(`samples list: ${JSON.stringify(devfileSamples)}`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
else if (isInbuilt) {
|
|
66
|
+
{
|
|
67
|
+
const content = await this.getInbuiltDevfilesRegistryContent(sampleNamePatterns);
|
|
68
|
+
for (const sample of content) {
|
|
69
|
+
const linkToDevWorkspaceYaml = BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL +
|
|
70
|
+
'/devfile-registry' +
|
|
71
|
+
sample.links.devWorkspaces['che-incubator/che-code/latest'];
|
|
72
|
+
devfileSamples.push({
|
|
73
|
+
name: sample.displayName,
|
|
74
|
+
devWorkspaceConfigurationString: await this.getContent(linkToDevWorkspaceYaml)
|
|
75
|
+
});
|
|
76
76
|
}
|
|
77
|
-
|
|
78
|
-
|
|
77
|
+
Logger_1.Logger.debug(`samples list: ${JSON.stringify(devfileSamples)}`);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
{
|
|
79
82
|
Logger_1.Logger.error(`unsupported registry url - ${API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_ACCEPTANCE_TEST_REGISTRY_URL()}\n
|
|
80
83
|
supported registries: ${JSON.stringify(API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES)}`);
|
|
81
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevfilesRegistryHelper.js","sourceRoot":"","sources":["../../utils/DevfilesRegistryHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,kDAA6C;AAC7C,qCAAkC;AAClC,gDAAwB;AACxB,wEAAmG;AACnG,yCAAuC;AACvC,0EAAuE;AAGhE,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAClC,KAAK,CAAC,iCAAiC,CAAC,kBAA6B;QACpE,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,OAAO,IAAI,CAAC,aAAa,CACxB,kBAAkB,EAClB,MAAM,IAAI,CAAC,UAAU,CAAC,iDAA4B,CAAC,wCAAwC,EAAE,CAAC,CAC9F,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kCAAkC;QACvC,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,
|
|
1
|
+
{"version":3,"file":"DevfilesRegistryHelper.js","sourceRoot":"","sources":["../../utils/DevfilesRegistryHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,14 +70,15 @@ let KubernetesCommandLineToolsExecutor = KubernetesCommandLineToolsExecutor_1 =
|
|
|
70
70
|
return this._workspaceName;
|
|
71
71
|
}
|
|
72
72
|
get namespace() {
|
|
73
|
-
this._namespace
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
73
|
+
if (!this._namespace) {
|
|
74
|
+
const applicationName = BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME();
|
|
75
|
+
if (applicationName === 'default') {
|
|
76
|
+
this._namespace = applicationName;
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
this._namespace = OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME + '-' + applicationName;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
81
82
|
return this._namespace;
|
|
82
83
|
}
|
|
83
84
|
// login to Openshift cluster with username and password
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,qCAAkD;AAClD,qCAAkC;AAClC,mDAAgD;AAChD,2CAA6B;AAC7B,wEAAgG;AAChG,0EAAuE;AACvE,kEAA+D;AAE/D,yCAA+C;AAC/C,gEAAqD;AAG9C,IAAM,kCAAkC,0CAAxC,MAAM,kCAAkC;IAO9C,YAEoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAE/C,IAAI,CAAC,yBAAyB,GAAG,uCAAkB,CAAC,wCAAwC,CAAC;IAC9F,CAAC;IAED,IAAI,SAAS,CAAC,KAAyB;QACtC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IACzB,CAAC;IAED,IAAI,aAAa,CAAC,KAAyB;QAC1C,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;IAC7B,CAAC;IAED,IAAI,aAAa;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAED,IAAI,SAAS;QACZ,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-che/che-e2e",
|
|
3
|
-
"version": "7.76.0-next-
|
|
3
|
+
"version": "7.76.0-next-f98fe6d",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -16,18 +16,13 @@
|
|
|
16
16
|
"test-docker-mount-e2e": "npm run cleanup-docker && docker run -it --shm-size=2g -p 5920:5920 --name selenium-e2e -e TS_SELENIUM_BASE_URL=$TS_SELENIUM_BASE_URL -v $(pwd):/tmp/e2e:Z eclipse/che-e2e:nightly",
|
|
17
17
|
"test-all-devfiles": " ./configs/sh-scripts/initDefaultValues.sh && ./configs/sh-scripts/initDevfileTests.sh",
|
|
18
18
|
"functional-test-suite": "configs/sh-scripts/runFunctionalTests.sh",
|
|
19
|
-
"devfile-acceptance-test-suite": "
|
|
19
|
+
"devfile-acceptance-test-suite": "configs/sh-scripts/runDevfileAcceptanceTests.sh"
|
|
20
20
|
},
|
|
21
21
|
"author": "Ihor Okhrimenko (iokhrime@redhat.com)",
|
|
22
22
|
"license": "ISC",
|
|
23
23
|
"devDependencies": {
|
|
24
24
|
"@eclipse-che/che-devworkspace-generator": "next",
|
|
25
|
-
"
|
|
26
|
-
"allure-js-commons": "^2.4.0",
|
|
27
|
-
"allure-mocha": "^2.4.0",
|
|
28
|
-
"mocha-multi-reporters": "^1.5.1",
|
|
29
|
-
"allure-commandline": "^2.22.1",
|
|
30
|
-
"mocha-allure-reporter": "^1.4.0",
|
|
25
|
+
"@reportportal/agent-js-mocha": "^5.0.3",
|
|
31
26
|
"@types/chai": "^4.3.4",
|
|
32
27
|
"@types/clone-deep": "^4.0.1",
|
|
33
28
|
"@types/mocha": "5.2.6",
|
|
@@ -38,6 +33,10 @@
|
|
|
38
33
|
"@typescript-eslint/eslint-plugin": "^6.4.1",
|
|
39
34
|
"@typescript-eslint/eslint-plugin-tslint": "^6.1.0",
|
|
40
35
|
"@typescript-eslint/parser": "^6.1.0",
|
|
36
|
+
"allure-commandline": "^2.22.1",
|
|
37
|
+
"allure-decorators": "^2.4.0",
|
|
38
|
+
"allure-js-commons": "^2.4.0",
|
|
39
|
+
"allure-mocha": "^2.4.0",
|
|
41
40
|
"axios": "^0.25.0",
|
|
42
41
|
"chai": "^4.3.4",
|
|
43
42
|
"chrome-har": "^0.13.2",
|
|
@@ -48,9 +47,11 @@
|
|
|
48
47
|
"eslint-plugin-header": "^3.1.1",
|
|
49
48
|
"eslint-plugin-jsdoc": "^46.5.0",
|
|
50
49
|
"eslint-plugin-prettier": "^5.0.0",
|
|
51
|
-
"inversify-inject-decorators": "^3.1.0",
|
|
52
50
|
"husky": "^8.0.3",
|
|
51
|
+
"inversify-inject-decorators": "^3.1.0",
|
|
53
52
|
"mocha": "^9.1.3",
|
|
53
|
+
"mocha-allure-reporter": "^1.4.0",
|
|
54
|
+
"mocha-multi-reporters": "^1.5.1",
|
|
54
55
|
"monaco-page-objects": "3.9.1",
|
|
55
56
|
"prettier": "^3.0.2",
|
|
56
57
|
"rimraf": "2.6.2",
|
package/specs/MochaHooks.ts
CHANGED
|
@@ -25,6 +25,7 @@ import { CHROME_DRIVER_CONSTANTS } from '../constants/CHROME_DRIVER_CONSTANTS';
|
|
|
25
25
|
import { decorate, injectable, unmanaged } from 'inversify';
|
|
26
26
|
import { Main } from '@eclipse-che/che-devworkspace-generator/lib/main';
|
|
27
27
|
import { LocatorLoader } from 'monaco-page-objects/out/locators/loader';
|
|
28
|
+
import { REPORTER_CONSTANTS } from '../constants/REPORTER_CONSTANTS';
|
|
28
29
|
|
|
29
30
|
const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
|
|
30
31
|
let latestWorkspace: string = '';
|
|
@@ -69,15 +70,15 @@ exports.mochaHooks = {
|
|
|
69
70
|
if (BASE_TEST_CONSTANTS.TS_DEBUG_MODE) {
|
|
70
71
|
for (const [timeout, seconds] of Object.entries(TIMEOUT_CONSTANTS)) {
|
|
71
72
|
Object.defineProperty(TIMEOUT_CONSTANTS, timeout, {
|
|
72
|
-
value: seconds *
|
|
73
|
+
value: seconds * 2
|
|
73
74
|
});
|
|
74
75
|
}
|
|
75
76
|
}
|
|
76
77
|
}
|
|
77
78
|
],
|
|
78
79
|
afterEach: [
|
|
79
|
-
async function (this: Mocha.Context): Promise<void> {
|
|
80
|
-
if (this.currentTest?.state === 'failed') {
|
|
80
|
+
async function saveAllureAttachments(this: Mocha.Context): Promise<void> {
|
|
81
|
+
if (REPORTER_CONSTANTS.SAVE_ALLURE_REPORT_DATA && this.currentTest?.state === 'failed') {
|
|
81
82
|
try {
|
|
82
83
|
const screenshot: string = await driverHelper.getDriver().takeScreenshot();
|
|
83
84
|
allure.attachment('Screenshot', Buffer.from(screenshot, 'base64'), 'image/png');
|
package/specs/SmokeTest.spec.ts
CHANGED
|
@@ -20,7 +20,7 @@ import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
|
|
|
20
20
|
import { expect } from 'chai';
|
|
21
21
|
import { BASE_TEST_CONSTANTS } from '../constants/BASE_TEST_CONSTANTS';
|
|
22
22
|
|
|
23
|
-
suite(
|
|
23
|
+
suite(`The SmokeTest userstory ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
|
|
24
24
|
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
25
25
|
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
26
26
|
const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
|
|
@@ -19,6 +19,7 @@ import { CLASSES } from '../../configs/inversify.types';
|
|
|
19
19
|
import { DevfilesRegistryHelper } from '../../utils/DevfilesRegistryHelper';
|
|
20
20
|
import { MOCHA_CONSTANTS } from '../../constants/MOCHA_CONSTANTS';
|
|
21
21
|
import { API_TEST_CONSTANTS } from '../../constants/API_TEST_CONSTANTS';
|
|
22
|
+
import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
|
|
22
23
|
|
|
23
24
|
/**
|
|
24
25
|
* dynamically generating tests
|
|
@@ -28,7 +29,10 @@ void (async function (): Promise<void> {
|
|
|
28
29
|
const devfilesRegistryHelper: DevfilesRegistryHelper = e2eContainer.get(CLASSES.DevfilesRegistryHelper);
|
|
29
30
|
|
|
30
31
|
let devfileSamples: any = [];
|
|
31
|
-
if (
|
|
32
|
+
if (
|
|
33
|
+
MOCHA_CONSTANTS.MOCHA_DELAYED_SUITE &&
|
|
34
|
+
!API_TEST_CONSTANTS.TS_API_ACCEPTANCE_TEST_REGISTRY_URL().includes(BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL)
|
|
35
|
+
) {
|
|
32
36
|
devfileSamples = await devfilesRegistryHelper.collectPathsToDevfilesFromRegistry(false);
|
|
33
37
|
}
|
|
34
38
|
for (const devfileSample of devfileSamples) {
|
|
@@ -71,10 +71,6 @@ suite('Empty workspace API test', function (): void {
|
|
|
71
71
|
BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME
|
|
72
72
|
);
|
|
73
73
|
});
|
|
74
|
-
|
|
75
|
-
suiteTeardown('Delete cloned project', function (): void {
|
|
76
|
-
containerTerminal.removeFolder(`${clonedProjectName}`);
|
|
77
|
-
});
|
|
78
74
|
});
|
|
79
75
|
|
|
80
76
|
suiteTeardown('Delete workspace', function (): void {
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/** *******************************************************************
|
|
2
|
+
* copyright (c) 2023 Red Hat, Inc.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made
|
|
5
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
6
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
9
|
+
**********************************************************************/
|
|
10
|
+
import '../../specs/api/DevfileAcceptanceTestAPI.spec';
|
|
@@ -41,7 +41,10 @@ export class LoginTests {
|
|
|
41
41
|
|
|
42
42
|
loginIntoOcpConsole(): void {
|
|
43
43
|
test('Login into ocp console', async (): Promise<void> => {
|
|
44
|
-
const openshiftConsoleUrl: string = BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace(
|
|
44
|
+
const openshiftConsoleUrl: string = BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace(
|
|
45
|
+
BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME(),
|
|
46
|
+
'console-openshift-console'
|
|
47
|
+
);
|
|
45
48
|
await this.browserTabsUtil.navigateTo(openshiftConsoleUrl);
|
|
46
49
|
await this.ocpLoginPage.login();
|
|
47
50
|
await this.browserTabsUtil.maximize();
|
package/tsconfig.json
CHANGED
|
@@ -56,6 +56,7 @@ export class DevWorkspaceConfigurationHelper {
|
|
|
56
56
|
|
|
57
57
|
async generateDevfileContext(): Promise<DevfileContext> {
|
|
58
58
|
Logger.debug();
|
|
59
|
+
|
|
59
60
|
if (!this.params.projects) {
|
|
60
61
|
this.params.projects = [];
|
|
61
62
|
}
|
|
@@ -71,6 +72,7 @@ export class DevWorkspaceConfigurationHelper {
|
|
|
71
72
|
// write templates and then DevWorkspace in a single file
|
|
72
73
|
getDevWorkspaceConfigurationYamlAsString(context: DevfileContext): string {
|
|
73
74
|
Logger.debug();
|
|
75
|
+
|
|
74
76
|
const allContentArray: any[] = context.devWorkspaceTemplates.map((template: V1alpha2DevWorkspaceTemplate): string =>
|
|
75
77
|
YAML.stringify(template)
|
|
76
78
|
);
|
|
@@ -80,7 +82,7 @@ export class DevWorkspaceConfigurationHelper {
|
|
|
80
82
|
}
|
|
81
83
|
|
|
82
84
|
getDevWorkspaceConfigurationsAsYaml(allContentString: string): string {
|
|
83
|
-
Logger.debug(
|
|
85
|
+
Logger.debug();
|
|
84
86
|
const content: any = {};
|
|
85
87
|
const contentArray: string[] = allContentString.split('---\n');
|
|
86
88
|
contentArray.forEach((e: any): void => {
|
|
@@ -97,6 +99,7 @@ export class DevWorkspaceConfigurationHelper {
|
|
|
97
99
|
return content;
|
|
98
100
|
}
|
|
99
101
|
patchDevWorkspaceConfigWithBuildContainerAttribute(devfileContextDevWorkspace: any): void {
|
|
102
|
+
Logger.debug();
|
|
100
103
|
devfileContextDevWorkspace.spec.template.attributes = YAML.parse(`
|
|
101
104
|
controller.devfile.io/devworkspace-config:
|
|
102
105
|
name: devworkspace-config
|