@eclipse-che/che-e2e 7.76.0-next-6068ce8 → 7.76.0
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/CODE_STYLE.md +1 -1
- package/configs/inversify.config.ts +1 -7
- package/configs/mocharc.ts +7 -3
- package/configs/sh-scripts/runFunctionalTests.sh +104 -0
- package/constants/API_TEST_CONSTANTS.ts +5 -2
- package/constants/BASE_TEST_CONSTANTS.ts +25 -7
- package/constants/MOCHA_CONSTANTS.ts +9 -2
- package/dist/configs/inversify.config.js +0 -5
- package/dist/configs/inversify.config.js.map +1 -1
- package/dist/configs/mocharc.js +14 -11
- package/dist/configs/mocharc.js.map +1 -1
- package/dist/constants/API_TEST_CONSTANTS.js +3 -2
- package/dist/constants/API_TEST_CONSTANTS.js.map +1 -1
- package/dist/constants/BASE_TEST_CONSTANTS.js +12 -0
- package/dist/constants/BASE_TEST_CONSTANTS.js.map +1 -1
- package/dist/constants/MOCHA_CONSTANTS.js +7 -4
- package/dist/constants/MOCHA_CONSTANTS.js.map +1 -1
- package/dist/specs/MochaHooks.js +10 -0
- package/dist/specs/MochaHooks.js.map +1 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js +2 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +9 -7
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -1
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js +2 -2
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
- package/dist/specs/api/InbuiltApplicationDevWorkspacesAPI.spec.js +97 -0
- package/dist/specs/api/InbuiltApplicationDevWorkspacesAPI.spec.js.map +1 -0
- package/dist/specs/api/PodOverridesAPI.spec.js +1 -1
- package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/Documentation.spec.js +1 -1
- package/dist/specs/dashboard-samples/Documentation.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +2 -1
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/Quarkus.spec.js +1 -1
- package/dist/specs/dashboard-samples/Quarkus.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js +2 -1
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js.map +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
- package/dist/specs/factory/Factory.spec.js +1 -1
- package/dist/specs/factory/Factory.spec.js.map +1 -1
- package/dist/specs/factory/NoSetupRepoFactory.spec.js +1 -1
- package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
- package/dist/specs/miscellaneous/CreateWorkspaceWithExistedName.spec.js +1 -1
- package/dist/specs/miscellaneous/CreateWorkspaceWithExistedName.spec.js.map +1 -1
- package/dist/specs/miscellaneous/KubedockPodmanTest.spec.js +3 -2
- package/dist/specs/miscellaneous/KubedockPodmanTest.spec.js.map +1 -1
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js +2 -1
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js.map +1 -1
- package/dist/specs/miscellaneous/WorkspaceWithParent.spec.js +6 -1
- package/dist/specs/miscellaneous/WorkspaceWithParent.spec.js.map +1 -1
- package/dist/specs/web-terminal/WebTerminalTest.spec.js +2 -1
- package/dist/specs/web-terminal/WebTerminalTest.spec.js.map +1 -1
- package/dist/suites/disconnected-ocp/APITest.suite.js +14 -0
- package/dist/suites/disconnected-ocp/APITest.suite.js.map +1 -0
- package/dist/suites/disconnected-ocp/DynamicallyGeneratingAPITest.suite.js +13 -0
- package/dist/suites/disconnected-ocp/DynamicallyGeneratingAPITest.suite.js.map +1 -0
- package/dist/suites/disconnected-ocp/UITest.suite.js +19 -0
- package/dist/suites/disconnected-ocp/UITest.suite.js.map +1 -0
- package/dist/suites/online-ocp/APITest.suite.js +15 -0
- package/dist/suites/online-ocp/APITest.suite.js.map +1 -0
- package/dist/suites/online-ocp/DynamicallyGeneratingAPITest.suite.js +13 -0
- package/dist/suites/online-ocp/DynamicallyGeneratingAPITest.suite.js.map +1 -0
- package/dist/suites/online-ocp/UITest.suite.js +22 -0
- package/dist/suites/online-ocp/UITest.suite.js.map +1 -0
- package/dist/tests-library/LoginTests.js +2 -0
- package/dist/tests-library/LoginTests.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js +43 -2
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
- package/dist/utils/DevfilesRegistryHelper.js +22 -8
- package/dist/utils/DevfilesRegistryHelper.js.map +1 -1
- package/dist/utils/KubernetesCommandLineToolsExecutor.js +6 -6
- package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
- package/package.json +5 -2
- package/specs/MochaHooks.ts +11 -0
- package/specs/api/ContainerOverridesAPI.spec.ts +2 -1
- package/specs/api/DevfileAcceptanceTestAPI.spec.ts +10 -8
- package/specs/api/EmptyWorkspaceAPI.spec.ts +2 -2
- package/specs/api/InbuiltApplicationDevWorkspacesAPI.spec.ts +130 -0
- package/specs/api/PodOverridesAPI.spec.ts +1 -1
- package/specs/dashboard-samples/Documentation.spec.ts +1 -1
- package/specs/dashboard-samples/EmptyWorkspace.spec.ts +2 -1
- package/specs/dashboard-samples/Quarkus.spec.ts +1 -1
- package/specs/dashboard-samples/RecommendedExtensions.spec.ts +2 -1
- package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +1 -1
- package/specs/factory/Factory.spec.ts +1 -1
- package/specs/factory/NoSetupRepoFactory.spec.ts +1 -1
- package/specs/factory/RefusedOAuthFactory.spec.ts +1 -1
- package/specs/miscellaneous/CreateWorkspaceWithExistedName.spec.ts +1 -1
- package/specs/miscellaneous/KubedockPodmanTest.spec.ts +63 -59
- package/specs/miscellaneous/PredefinedNamespace.spec.ts +2 -1
- package/specs/miscellaneous/WorkspaceWithParent.spec.ts +9 -2
- package/specs/web-terminal/WebTerminalTest.spec.ts +2 -1
- package/suites/disconnected-ocp/APITest.suite.ts +11 -0
- package/suites/disconnected-ocp/DynamicallyGeneratingAPITest.suite.ts +10 -0
- package/suites/disconnected-ocp/UITest.suite.ts +16 -0
- package/suites/online-ocp/APITest.suite.ts +12 -0
- package/suites/online-ocp/DynamicallyGeneratingAPITest.suite.ts +10 -0
- package/suites/online-ocp/UITest.suite.ts +19 -0
- package/tests-library/LoginTests.ts +2 -0
- package/utils/DevWorkspaceConfigurationHelper.ts +33 -3
- package/utils/DevfilesRegistryHelper.ts +28 -9
- package/utils/IKubernetesCommandLineToolsExecutor.ts +1 -1
- package/utils/KubernetesCommandLineToolsExecutor.ts +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebTerminalTest.spec.js","sourceRoot":"","sources":["../../../specs/web-terminal/WebTerminalTest.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,mEAAwD;AACxD,qEAA8D;
|
|
1
|
+
{"version":3,"file":"WebTerminalTest.spec.js","sourceRoot":"","sources":["../../../specs/web-terminal/WebTerminalTest.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,mEAAwD;AACxD,qEAA8D;AAG9D,6EAA0E;AAE1E,KAAK,CAAC,oDAAoD,yCAAmB,CAAC,gBAAgB,EAAE,EAAE;IACjG,MAAM,UAAU,GAAe,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,UAAU,CAAC,CAAC;IACpE,MAAM,WAAW,GAAgB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,WAAW,CAAC,CAAC;IAEvE,UAAU,CAAC,mBAAmB,EAAE,CAAC;IAEjC,IAAI,CAAC,mBAAmB,EAAE,KAAK;QAC9B,MAAM,WAAW,CAAC,gBAAgB,EAAE,CAAC;QACrC,MAAM,WAAW,CAAC,eAAe,EAAE,CAAC;IACrC,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
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/ContainerOverridesAPI.spec");
|
|
13
|
+
require("../../specs/api/PodOverridesAPI.spec");
|
|
14
|
+
//# sourceMappingURL=APITest.suite.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"APITest.suite.js","sourceRoot":"","sources":["../../../suites/disconnected-ocp/APITest.suite.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,sDAAoD;AACpD,gDAA8C"}
|
|
@@ -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/InbuiltApplicationDevWorkspacesAPI.spec");
|
|
13
|
+
//# sourceMappingURL=DynamicallyGeneratingAPITest.suite.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DynamicallyGeneratingAPITest.suite.js","sourceRoot":"","sources":["../../../suites/disconnected-ocp/DynamicallyGeneratingAPITest.suite.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,mEAAiE"}
|
|
@@ -0,0 +1,19 @@
|
|
|
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/dashboard-samples/Quarkus.spec");
|
|
13
|
+
require("../../specs/dashboard-samples/RecommendedExtensions.spec");
|
|
14
|
+
require("../../specs/dashboard-samples/Documentation.spec");
|
|
15
|
+
require("../../specs/devconsole-intergration/DevConsoleIntegration.spec");
|
|
16
|
+
require("../../specs/miscellaneous/CreateWorkspaceWithExistedName.spec");
|
|
17
|
+
require("../../specs/miscellaneous/PredefinedNamespace.spec");
|
|
18
|
+
require("../../specs/miscellaneous/WorkspaceWithParent.spec");
|
|
19
|
+
//# sourceMappingURL=UITest.suite.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UITest.suite.js","sourceRoot":"","sources":["../../../suites/disconnected-ocp/UITest.suite.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,sDAAoD;AACpD,oEAAkE;AAClE,4DAA0D;AAC1D,0EAAwE;AACxE,yEAAuE;AACvE,8DAA4D;AAC5D,8DAA4D"}
|
|
@@ -0,0 +1,15 @@
|
|
|
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/ContainerOverridesAPI.spec");
|
|
13
|
+
require("../../specs/api/EmptyWorkspaceAPI.spec");
|
|
14
|
+
require("../../specs/api/PodOverridesAPI.spec");
|
|
15
|
+
//# sourceMappingURL=APITest.suite.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"APITest.suite.js","sourceRoot":"","sources":["../../../suites/online-ocp/APITest.suite.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,sDAAoD;AACpD,kDAAgD;AAChD,gDAA8C"}
|
|
@@ -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/InbuiltApplicationDevWorkspacesAPI.spec");
|
|
13
|
+
//# sourceMappingURL=DynamicallyGeneratingAPITest.suite.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DynamicallyGeneratingAPITest.suite.js","sourceRoot":"","sources":["../../../suites/online-ocp/DynamicallyGeneratingAPITest.suite.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,mEAAiE"}
|
|
@@ -0,0 +1,22 @@
|
|
|
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/SmokeTest.spec");
|
|
13
|
+
require("../../specs/dashboard-samples/EmptyWorkspace.spec");
|
|
14
|
+
require("../../specs/dashboard-samples/Quarkus.spec");
|
|
15
|
+
require("../../specs/dashboard-samples/RecommendedExtensions.spec");
|
|
16
|
+
require("../../specs/dashboard-samples/Documentation.spec");
|
|
17
|
+
require("../../specs/devconsole-intergration/DevConsoleIntegration.spec");
|
|
18
|
+
require("../../specs/miscellaneous/CreateWorkspaceWithExistedName.spec");
|
|
19
|
+
require("../../specs/miscellaneous/KubedockPodmanTest.spec");
|
|
20
|
+
require("../../specs/miscellaneous/PredefinedNamespace.spec");
|
|
21
|
+
require("../../specs/miscellaneous/WorkspaceWithParent.spec");
|
|
22
|
+
//# sourceMappingURL=UITest.suite.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UITest.suite.js","sourceRoot":"","sources":["../../../suites/online-ocp/UITest.suite.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,sCAAoC;AACpC,6DAA2D;AAC3D,sDAAoD;AACpD,oEAAkE;AAClE,4DAA0D;AAC1D,0EAAwE;AACxE,yEAAuE;AACvE,6DAA2D;AAC3D,8DAA4D;AAC5D,8DAA4D"}
|
|
@@ -27,6 +27,7 @@ const BrowserTabsUtil_1 = require("../utils/BrowserTabsUtil");
|
|
|
27
27
|
const inversify_1 = require("inversify");
|
|
28
28
|
const Dashboard_1 = require("../pageobjects/dashboard/Dashboard");
|
|
29
29
|
const BASE_TEST_CONSTANTS_1 = require("../constants/BASE_TEST_CONSTANTS");
|
|
30
|
+
const MochaHooks_1 = require("../specs/MochaHooks");
|
|
30
31
|
let LoginTests = class LoginTests {
|
|
31
32
|
constructor(browserTabsUtil, productLoginPage, ocpLoginPage, dashboard) {
|
|
32
33
|
this.browserTabsUtil = browserTabsUtil;
|
|
@@ -55,6 +56,7 @@ let LoginTests = class LoginTests {
|
|
|
55
56
|
logoutFromChe() {
|
|
56
57
|
test('Logout', async () => {
|
|
57
58
|
await this.dashboard.logout();
|
|
59
|
+
(0, MochaHooks_1.registerRunningWorkspace)('');
|
|
58
60
|
});
|
|
59
61
|
}
|
|
60
62
|
};
|
|
@@ -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;
|
|
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,WAAW,EAAE,2BAA2B,CAAC,CAAC;YAC/H,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;AApCY,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,CAoCtB;AApCY,gCAAU"}
|
|
@@ -36,17 +36,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
38
|
exports.DevWorkspaceConfigurationHelper = void 0;
|
|
39
|
+
/** *******************************************************************
|
|
40
|
+
* copyright (c) 2023 Red Hat, Inc.
|
|
41
|
+
*
|
|
42
|
+
* This program and the accompanying materials are made
|
|
43
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
44
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
45
|
+
*
|
|
46
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
47
|
+
**********************************************************************/
|
|
48
|
+
const main_1 = require("@eclipse-che/che-devworkspace-generator/lib/main");
|
|
39
49
|
const yaml_1 = __importDefault(require("yaml"));
|
|
40
50
|
const axios = __importStar(require("axios"));
|
|
41
51
|
const Logger_1 = require("./Logger");
|
|
52
|
+
const ShellExecutor_1 = require("./ShellExecutor");
|
|
42
53
|
const API_TEST_CONSTANTS_1 = require("../constants/API_TEST_CONSTANTS");
|
|
43
54
|
const inversify_1 = require("inversify");
|
|
44
55
|
const inversify_config_1 = require("../configs/inversify.config");
|
|
45
56
|
const inversify_types_1 = require("../configs/inversify.types");
|
|
57
|
+
const inversify_inject_decorators_1 = __importDefault(require("inversify-inject-decorators"));
|
|
58
|
+
const { lazyInject } = (0, inversify_inject_decorators_1.default)(inversify_config_1.e2eContainer);
|
|
46
59
|
let DevWorkspaceConfigurationHelper = class DevWorkspaceConfigurationHelper {
|
|
47
60
|
constructor(params) {
|
|
48
|
-
this.generator = inversify_config_1.e2eContainer.get(inversify_types_1.EXTERNAL_CLASSES.Generator);
|
|
49
|
-
this.shellExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ShellExecutor);
|
|
50
61
|
// check if all undefined
|
|
51
62
|
if (!(params.editorPath || params.editorEntry || params.editorContent)) {
|
|
52
63
|
params.editorEntry = 'che-incubator/che-code/latest';
|
|
@@ -85,7 +96,37 @@ let DevWorkspaceConfigurationHelper = class DevWorkspaceConfigurationHelper {
|
|
|
85
96
|
allContentArray.push(yaml_1.default.stringify(context.devWorkspace));
|
|
86
97
|
return allContentArray.join('---\n');
|
|
87
98
|
}
|
|
99
|
+
getDevWorkspaceConfigurationsAsYaml(allContentString) {
|
|
100
|
+
Logger_1.Logger.debug(`${this.constructor.name}.${this.getDevWorkspaceConfigurationsAsYaml.name}`);
|
|
101
|
+
const content = {};
|
|
102
|
+
const contentArray = allContentString.split('---\n');
|
|
103
|
+
contentArray.forEach((e) => {
|
|
104
|
+
e = yaml_1.default.parse(e);
|
|
105
|
+
e.kind === 'DevWorkspace'
|
|
106
|
+
? (content.DevWorkspace = e)
|
|
107
|
+
: e.kind === 'DevWorkspaceTemplate'
|
|
108
|
+
? (content.DevWorkspaceTemplate = e)
|
|
109
|
+
: Logger_1.Logger.error('Problems with configuration parsing, string should be in format "DevWorkspace\\n---\\nDevWorkspaceTemplate"');
|
|
110
|
+
});
|
|
111
|
+
return content;
|
|
112
|
+
}
|
|
113
|
+
patchDevWorkspaceConfigWithBuildContainerAttribute(devfileContextDevWorkspace) {
|
|
114
|
+
devfileContextDevWorkspace.spec.template.attributes = yaml_1.default.parse(`
|
|
115
|
+
controller.devfile.io/devworkspace-config:
|
|
116
|
+
name: devworkspace-config
|
|
117
|
+
namespace: openshift-devspaces
|
|
118
|
+
controller.devfile.io/scc: container-build
|
|
119
|
+
controller.devfile.io/storage-type: per-user`);
|
|
120
|
+
}
|
|
88
121
|
};
|
|
122
|
+
__decorate([
|
|
123
|
+
lazyInject(inversify_types_1.EXTERNAL_CLASSES.Generator),
|
|
124
|
+
__metadata("design:type", main_1.Main)
|
|
125
|
+
], DevWorkspaceConfigurationHelper.prototype, "generator", void 0);
|
|
126
|
+
__decorate([
|
|
127
|
+
lazyInject(inversify_types_1.CLASSES.ShellExecutor),
|
|
128
|
+
__metadata("design:type", ShellExecutor_1.ShellExecutor)
|
|
129
|
+
], DevWorkspaceConfigurationHelper.prototype, "shellExecutor", void 0);
|
|
89
130
|
DevWorkspaceConfigurationHelper = __decorate([
|
|
90
131
|
(0, inversify_1.injectable)(),
|
|
91
132
|
__metadata("design:paramtypes", [Object])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevWorkspaceConfigurationHelper.js","sourceRoot":"","sources":["../../utils/DevWorkspaceConfigurationHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"DevWorkspaceConfigurationHelper.js","sourceRoot":"","sources":["../../utils/DevWorkspaceConfigurationHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,21 +24,22 @@ const Logger_1 = require("./Logger");
|
|
|
24
24
|
const yaml_1 = __importDefault(require("yaml"));
|
|
25
25
|
const API_TEST_CONSTANTS_1 = require("../constants/API_TEST_CONSTANTS");
|
|
26
26
|
const inversify_1 = require("inversify");
|
|
27
|
+
const BASE_TEST_CONSTANTS_1 = require("../constants/BASE_TEST_CONSTANTS");
|
|
27
28
|
let DevfilesRegistryHelper = class DevfilesRegistryHelper {
|
|
28
|
-
async getInbuiltDevfilesRegistryContent() {
|
|
29
|
+
async getInbuiltDevfilesRegistryContent(sampleNamePatterns) {
|
|
29
30
|
Logger_1.Logger.trace();
|
|
30
|
-
return await this.getContent(API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES.INBUILT_APPLICATION_DEVFILE_REGISTRY_URL());
|
|
31
|
+
return this.filterSamples(sampleNamePatterns, await this.getContent(API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES.INBUILT_APPLICATION_DEVFILE_REGISTRY_URL()));
|
|
31
32
|
}
|
|
32
33
|
async getGitHubCheDevfileRegistryContent() {
|
|
33
34
|
Logger_1.Logger.trace();
|
|
34
35
|
return await this.getContent(API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES.GIT_HUB_CHE_DEVFILE_REGISTRY_URL);
|
|
35
36
|
}
|
|
36
|
-
async collectPathsToDevfilesFromRegistry() {
|
|
37
|
+
async collectPathsToDevfilesFromRegistry(isInbuilt = true, sampleNamePatterns) {
|
|
37
38
|
Logger_1.Logger.debug();
|
|
38
39
|
const devfileSamples = [];
|
|
39
40
|
const sampleNames = [];
|
|
40
|
-
switch (
|
|
41
|
-
case
|
|
41
|
+
switch (isInbuilt) {
|
|
42
|
+
case false:
|
|
42
43
|
{
|
|
43
44
|
const content = await this.getGitHubCheDevfileRegistryContent();
|
|
44
45
|
content.forEach((e) => {
|
|
@@ -59,13 +60,16 @@ let DevfilesRegistryHelper = class DevfilesRegistryHelper {
|
|
|
59
60
|
Logger_1.Logger.debug(`samples list: ${JSON.stringify(devfileSamples)}`);
|
|
60
61
|
}
|
|
61
62
|
break;
|
|
62
|
-
case
|
|
63
|
+
case true:
|
|
63
64
|
{
|
|
64
|
-
const content = await this.getInbuiltDevfilesRegistryContent();
|
|
65
|
+
const content = await this.getInbuiltDevfilesRegistryContent(sampleNamePatterns);
|
|
65
66
|
for (const sample of content) {
|
|
67
|
+
const linkToDevWorkspaceYaml = BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL +
|
|
68
|
+
'/devfile-registry' +
|
|
69
|
+
sample.links.devWorkspaces['che-incubator/che-code/latest'];
|
|
66
70
|
devfileSamples.push({
|
|
67
71
|
name: sample.displayName,
|
|
68
|
-
|
|
72
|
+
devWorkspaceConfigurationString: await this.getContent(linkToDevWorkspaceYaml)
|
|
69
73
|
});
|
|
70
74
|
}
|
|
71
75
|
Logger_1.Logger.debug(`samples list: ${JSON.stringify(devfileSamples)}`);
|
|
@@ -78,6 +82,16 @@ let DevfilesRegistryHelper = class DevfilesRegistryHelper {
|
|
|
78
82
|
}
|
|
79
83
|
return devfileSamples;
|
|
80
84
|
}
|
|
85
|
+
async getEditorContent(entry) {
|
|
86
|
+
return await this.getContent(`${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL}/${entry}`);
|
|
87
|
+
}
|
|
88
|
+
filterSamples(sampleNamePatterns, content) {
|
|
89
|
+
if (sampleNamePatterns) {
|
|
90
|
+
const commonSampleNamePattern = new RegExp(sampleNamePatterns.join('|'), 'i');
|
|
91
|
+
content = content.filter((e) => commonSampleNamePattern.test(e.displayName));
|
|
92
|
+
}
|
|
93
|
+
return content;
|
|
94
|
+
}
|
|
81
95
|
async getContent(url, headers) {
|
|
82
96
|
Logger_1.Logger.trace(`${url}`);
|
|
83
97
|
let response;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"DevfilesRegistryHelper.js","sourceRoot":"","sources":["../../utils/DevfilesRegistryHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -122,7 +122,7 @@ let KubernetesCommandLineToolsExecutor = KubernetesCommandLineToolsExecutor_1 =
|
|
|
122
122
|
this.applyYamlConfigurationAsStringOutput(yamlConfiguration);
|
|
123
123
|
return this.waitDevWorkspace();
|
|
124
124
|
}
|
|
125
|
-
|
|
125
|
+
execInContainerCommand(commandToExecute, container = KubernetesCommandLineToolsExecutor_1.container) {
|
|
126
126
|
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool}`);
|
|
127
127
|
return this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} exec -i ${KubernetesCommandLineToolsExecutor_1.pod} -n ${this.namespace} -c ${container} -- sh -c '${commandToExecute}'`);
|
|
128
128
|
}
|
|
@@ -191,19 +191,19 @@ let ContainerTerminal = class ContainerTerminal extends KubernetesCommandLineToo
|
|
|
191
191
|
this.cluster = cluster;
|
|
192
192
|
}
|
|
193
193
|
ls(path = '') {
|
|
194
|
-
return this.
|
|
194
|
+
return this.execInContainerCommand('ls ' + path);
|
|
195
195
|
}
|
|
196
196
|
pwd() {
|
|
197
|
-
return this.
|
|
197
|
+
return this.execInContainerCommand('pwd');
|
|
198
198
|
}
|
|
199
199
|
cd(path) {
|
|
200
|
-
return this.
|
|
200
|
+
return this.execInContainerCommand('cd ' + path);
|
|
201
201
|
}
|
|
202
202
|
gitClone(repository) {
|
|
203
|
-
return this.
|
|
203
|
+
return this.execInContainerCommand('git clone ' + repository);
|
|
204
204
|
}
|
|
205
205
|
removeFolder(path) {
|
|
206
|
-
return this.
|
|
206
|
+
return this.execInContainerCommand('rm -rf ' + path);
|
|
207
207
|
}
|
|
208
208
|
};
|
|
209
209
|
ContainerTerminal = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":"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
|
|
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
|
|
3
|
+
"version": "7.76.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -9,11 +9,13 @@
|
|
|
9
9
|
"tsc": "rm -rf ./dist && ./configs/sh-scripts/generateIndex.sh && tsc -p .",
|
|
10
10
|
"test": "./configs/sh-scripts/initDefaultValues.sh npm run lint && npm run tsc && export USERSTORY=$USERSTORY && mocha --config dist/configs/mocharc.js",
|
|
11
11
|
"driver-less-test": "export TS_USE_WEB_DRIVER_FOR_TEST=false && npm run test",
|
|
12
|
+
"delayed-test": "npm run lint && npm run tsc && export TS_USE_WEB_DRIVER_FOR_TEST=false && export MOCHA_DELAYED_SUITE=true && mocha --config dist/configs/mocharc.js --delay",
|
|
12
13
|
"open-allure-dasboard": "allure generate .allure-results --clean -o .allure-report && allure open .allure-report",
|
|
13
14
|
"cleanup-docker": "if [ $(docker ps -a | grep -c selenium-e2e) -gt 0 ]; then docker rm -f $(docker ps --filter \"name=selenium-e2e\" -aq); fi;",
|
|
14
15
|
"test-docker": "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 eclipse/che-e2e:nightly",
|
|
15
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",
|
|
16
17
|
"test-all-devfiles": " ./configs/sh-scripts/initDefaultValues.sh && ./configs/sh-scripts/initDevfileTests.sh",
|
|
18
|
+
"functional-test-suite": "configs/sh-scripts/runFunctionalTests.sh",
|
|
17
19
|
"devfile-acceptance-test-suite": "./configs/sh-scripts/initDefaultValues.sh npm run lint && npm run tsc && export TS_USE_WEB_DRIVER_FOR_TEST=false && mocha 'dist/specs/api/*.js' --config dist/configs/mocharc.js --delay --grep 'Devfile acceptance test suite'"
|
|
18
20
|
},
|
|
19
21
|
"author": "Ihor Okhrimenko (iokhrime@redhat.com)",
|
|
@@ -62,7 +64,8 @@
|
|
|
62
64
|
"dependencies": {
|
|
63
65
|
"@eclipse-che/api": "latest",
|
|
64
66
|
"inversify": "6.0.1",
|
|
65
|
-
"reflect-metadata": "0.1.13"
|
|
67
|
+
"reflect-metadata": "0.1.13",
|
|
68
|
+
"@eclipse-che/che-devworkspace-generator": "7.76.0"
|
|
66
69
|
},
|
|
67
70
|
"resolutions": {
|
|
68
71
|
"minimist": "^1.2.5"
|
package/specs/MochaHooks.ts
CHANGED
|
@@ -22,6 +22,9 @@ import { allure } from 'allure-mocha/runtime';
|
|
|
22
22
|
import { BASE_TEST_CONSTANTS } from '../constants/BASE_TEST_CONSTANTS';
|
|
23
23
|
import { MONACO_CONSTANTS } from '../constants/MONACO_CONSTANTS';
|
|
24
24
|
import { CHROME_DRIVER_CONSTANTS } from '../constants/CHROME_DRIVER_CONSTANTS';
|
|
25
|
+
import { decorate, injectable, unmanaged } from 'inversify';
|
|
26
|
+
import { Main } from '@eclipse-che/che-devworkspace-generator/lib/main';
|
|
27
|
+
import { LocatorLoader } from 'monaco-page-objects/out/locators/loader';
|
|
25
28
|
|
|
26
29
|
const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
|
|
27
30
|
let latestWorkspace: string = '';
|
|
@@ -34,6 +37,14 @@ export function registerRunningWorkspace(workspaceName: string): void {
|
|
|
34
37
|
|
|
35
38
|
exports.mochaHooks = {
|
|
36
39
|
beforeAll: [
|
|
40
|
+
function decorateExternalClasses(): void {
|
|
41
|
+
decorate(injectable(), Main);
|
|
42
|
+
decorate(injectable(), LocatorLoader);
|
|
43
|
+
decorate(unmanaged(), LocatorLoader, 0);
|
|
44
|
+
decorate(unmanaged(), LocatorLoader, 1);
|
|
45
|
+
decorate(unmanaged(), LocatorLoader, 2);
|
|
46
|
+
},
|
|
47
|
+
|
|
37
48
|
function enableRequestInterceptor(): void {
|
|
38
49
|
if (BASE_TEST_CONSTANTS.TS_SELENIUM_REQUEST_INTERCEPTOR) {
|
|
39
50
|
CheApiRequestHandler.enableRequestInterceptor();
|
|
@@ -15,8 +15,9 @@ import { expect } from 'chai';
|
|
|
15
15
|
import { ShellExecutor } from '../../utils/ShellExecutor';
|
|
16
16
|
import { e2eContainer } from '../../configs/inversify.config';
|
|
17
17
|
import { CLASSES } from '../../configs/inversify.types';
|
|
18
|
+
import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
|
|
18
19
|
|
|
19
|
-
suite(
|
|
20
|
+
suite(`Test defining container overrides via attribute ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
|
|
20
21
|
const pathToSampleFile: string = path.resolve('resources/container-overrides.yaml');
|
|
21
22
|
const workspaceName: string = YAML.parse(fs.readFileSync(pathToSampleFile, 'utf8')).metadata.name;
|
|
22
23
|
const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
|
|
@@ -16,21 +16,23 @@ import { StringUtil } from '../../utils/StringUtil';
|
|
|
16
16
|
import { Logger } from '../../utils/Logger';
|
|
17
17
|
import { e2eContainer } from '../../configs/inversify.config';
|
|
18
18
|
import { CLASSES } from '../../configs/inversify.types';
|
|
19
|
+
import { DevfilesRegistryHelper } from '../../utils/DevfilesRegistryHelper';
|
|
20
|
+
import { MOCHA_CONSTANTS } from '../../constants/MOCHA_CONSTANTS';
|
|
21
|
+
import { API_TEST_CONSTANTS } from '../../constants/API_TEST_CONSTANTS';
|
|
19
22
|
|
|
20
23
|
/**
|
|
21
24
|
* dynamically generating tests
|
|
22
25
|
* info: https://mochajs.org/#delayed-root-suite
|
|
23
26
|
*/
|
|
24
|
-
// todo: skipped while don`t use to avoid sending useless requests
|
|
25
|
-
// eslint-disable-next-line @typescript-eslint/require-await
|
|
26
27
|
void (async function (): Promise<void> {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
const devfileSamples: any = [];
|
|
30
|
-
// devfileSamples = await devfilesRegistryHelper.collectPathsToDevfilesFromRegistry();
|
|
28
|
+
const devfilesRegistryHelper: DevfilesRegistryHelper = e2eContainer.get(CLASSES.DevfilesRegistryHelper);
|
|
31
29
|
|
|
30
|
+
let devfileSamples: any = [];
|
|
31
|
+
if (MOCHA_CONSTANTS.MOCHA_DELAYED_SUITE && API_TEST_CONSTANTS.TS_API_ACCEPTANCE_TEST_REGISTRY_URL()) {
|
|
32
|
+
devfileSamples = await devfilesRegistryHelper.collectPathsToDevfilesFromRegistry(false);
|
|
33
|
+
}
|
|
32
34
|
for (const devfileSample of devfileSamples) {
|
|
33
|
-
suite
|
|
35
|
+
suite(`Devfile acceptance test suite for ${devfileSample.name}`, function (): void {
|
|
34
36
|
this.bail(false);
|
|
35
37
|
this.timeout(1500000); // 25 minutes because build of Quarkus sample takes 20+ minutes
|
|
36
38
|
let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper;
|
|
@@ -105,7 +107,7 @@ void (async function (): Promise<void> {
|
|
|
105
107
|
);
|
|
106
108
|
Logger.info(`Full build command to be executed: ${commandString}`);
|
|
107
109
|
|
|
108
|
-
const output: ShellString = containerTerminal.
|
|
110
|
+
const output: ShellString = containerTerminal.execInContainerCommand(commandString, command.exec.component);
|
|
109
111
|
expect(output.code).eqls(0);
|
|
110
112
|
});
|
|
111
113
|
}
|
|
@@ -31,7 +31,7 @@ suite('Empty workspace API test', function (): void {
|
|
|
31
31
|
|
|
32
32
|
const gitRepository: string = 'https://github.com/crw-qe/web-nodejs-sample';
|
|
33
33
|
|
|
34
|
-
suiteSetup(
|
|
34
|
+
suiteSetup(`Create empty workspace with OC client ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, async function (): Promise<void> {
|
|
35
35
|
const workspaceName: string = 'empty-' + Math.floor(Math.random() * 1000);
|
|
36
36
|
const devfileContent: string = 'schemaVersion: 2.2.0\n' + 'metadata:\n' + ` name: ${workspaceName}\n`;
|
|
37
37
|
|
|
@@ -54,7 +54,7 @@ suite('Empty workspace API test', function (): void {
|
|
|
54
54
|
expect(output.stdout).contains('condition met');
|
|
55
55
|
});
|
|
56
56
|
|
|
57
|
-
suite(
|
|
57
|
+
suite(`Clone public repo without previous setup ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
|
|
58
58
|
test('Check if public repo can be cloned', function (): void {
|
|
59
59
|
containerWorkDir = containerTerminal.pwd().stdout.replace('\n', '');
|
|
60
60
|
const cloneOutput: ShellString = containerTerminal.gitClone(gitRepository);
|