@eclipse-che/che-e2e 7.67.0 → 7.67.1-dev-e49f025
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/README.md +13 -4
- package/build/dockerfiles/Dockerfile +1 -1
- package/configs/inversify.config.ts +20 -17
- package/configs/inversify.types.ts +3 -3
- package/configs/mocharc.ts +14 -4
- package/configs/sh-scripts/generateIndex.sh +2 -3
- package/constants/APITestConstants.ts +56 -0
- package/constants/BaseTestConstants.ts +65 -0
- package/constants/ChromeDriverConstants.ts +46 -0
- package/constants/FactoryTestConstants.ts +45 -0
- package/constants/MonacoConstants.ts +22 -0
- package/constants/OAuthConstants.ts +56 -0
- package/constants/PluginsTestConstants.ts +15 -0
- package/constants/ReporterConstants.ts +45 -0
- package/constants/TimeoutConstants.ts +28 -146
- package/dist/configs/inversify.config.js +17 -13
- package/dist/configs/inversify.config.js.map +1 -1
- package/dist/configs/inversify.types.js +3 -2
- package/dist/configs/inversify.types.js.map +1 -1
- package/dist/configs/mocharc.js +13 -4
- package/dist/configs/mocharc.js.map +1 -1
- package/dist/constants/APITestConstants.js +54 -0
- package/dist/constants/APITestConstants.js.map +1 -0
- package/dist/constants/BaseTestConstants.js +61 -0
- package/dist/constants/BaseTestConstants.js.map +1 -0
- package/dist/constants/ChromeDriverConstants.js +44 -0
- package/dist/constants/ChromeDriverConstants.js.map +1 -0
- package/dist/constants/FactoryTestConstants.js +44 -0
- package/dist/constants/FactoryTestConstants.js.map +1 -0
- package/dist/constants/MonacoConstants.js +25 -0
- package/dist/constants/MonacoConstants.js.map +1 -0
- package/dist/constants/OAuthConstants.js +52 -0
- package/dist/constants/OAuthConstants.js.map +1 -0
- package/dist/constants/PluginsTestConstants.js +19 -0
- package/dist/constants/PluginsTestConstants.js.map +1 -0
- package/dist/constants/ReporterConstants.js +43 -0
- package/dist/constants/ReporterConstants.js.map +1 -0
- package/dist/constants/TimeoutConstants.js +22 -113
- package/dist/constants/TimeoutConstants.js.map +1 -1
- package/dist/driver/ChromeDriver.js +7 -7
- package/dist/driver/ChromeDriver.js.map +1 -1
- package/dist/index.js +22 -12
- package/dist/index.js.map +1 -1
- package/dist/pageobjects/dashboard/CreateWorkspace.js +2 -2
- package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
- package/dist/pageobjects/dashboard/Dashboard.js +7 -6
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/dashboard/Workspaces.js +3 -4
- package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +2 -3
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
- package/dist/pageobjects/git-providers/OauthPage.js +12 -19
- package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js +2 -2
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js.map +1 -1
- package/dist/pageobjects/login/interfaces/ICheLoginPage.js.map +1 -0
- package/dist/pageobjects/login/interfaces/IOcpLoginPage.js.map +1 -0
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js +68 -0
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -0
- package/dist/pageobjects/{openshift/CheLoginPage.js → login/kubernetes/KubernetesLoginPage.js} +21 -26
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js.map +1 -0
- package/dist/pageobjects/{openshift → login/openshift}/OcpLoginPage.js +7 -7
- package/dist/pageobjects/login/openshift/OcpLoginPage.js.map +1 -0
- package/dist/pageobjects/login/{OcpRedHatLoginPage.js → openshift/OcpRedHatLoginPage.js} +5 -5
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -0
- package/dist/pageobjects/login/{OcpUserLoginPage.js → openshift/OcpUserLoginPage.js} +7 -7
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js.map +1 -0
- package/dist/pageobjects/login/{RedHatLoginPage.js → openshift/RedHatLoginPage.js} +6 -6
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -0
- package/dist/pageobjects/login/{RegularUserOcpCheLoginPage.js → openshift/RegularUserOcpCheLoginPage.js} +8 -8
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js.map +1 -0
- package/dist/specs/MochaHooks.js +18 -11
- package/dist/specs/MochaHooks.js.map +1 -1
- package/dist/specs/SmokeTest.spec.js +5 -2
- package/dist/specs/SmokeTest.spec.js.map +1 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js +5 -4
- package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +93 -0
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -0
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js +62 -0
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -0
- package/dist/specs/api/PodOverridesAPI.spec.js +5 -4
- package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +7 -2
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/RecomendedExtentions.spec.js +7 -6
- package/dist/specs/dashboard-samples/RecomendedExtentions.spec.js.map +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +4 -4
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
- package/dist/specs/factory/Factory.spec.js +20 -18
- package/dist/specs/factory/Factory.spec.js.map +1 -1
- package/dist/specs/factory/NoSetupRepoFactory.spec.js +28 -28
- package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js +28 -26
- package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
- package/dist/tests-library/LoginTests.js +4 -4
- package/dist/tests-library/LoginTests.js.map +1 -1
- package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
- package/dist/tests-library/WorkspaceHandlingTests.js +1 -2
- package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
- package/dist/utils/BrowserTabsUtil.js +2 -2
- package/dist/utils/BrowserTabsUtil.js.map +1 -1
- package/dist/utils/CheReporter.js +33 -36
- package/dist/utils/CheReporter.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js +72 -0
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -0
- package/dist/utils/DevfilesRegistryHelper.js +82 -0
- package/dist/utils/DevfilesRegistryHelper.js.map +1 -0
- package/dist/utils/DriverHelper.js +20 -17
- package/dist/utils/DriverHelper.js.map +1 -1
- package/dist/utils/KubernetesCommandLineToolsExecutor.js +42 -29
- package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
- package/dist/utils/Logger.js +11 -11
- package/dist/utils/Logger.js.map +1 -1
- package/dist/utils/ScreenCatcher.js +9 -12
- package/dist/utils/ScreenCatcher.js.map +1 -1
- package/dist/utils/ShellExecutor.js +5 -2
- package/dist/utils/ShellExecutor.js.map +1 -1
- package/dist/utils/{vsc/GitUtil.js → StringUtil.js} +26 -8
- package/dist/utils/StringUtil.js.map +1 -0
- package/dist/utils/request-handlers/CheApiRequestHandler.js +2 -2
- package/dist/utils/request-handlers/CheApiRequestHandler.js.map +1 -1
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js +4 -2
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
- package/dist/utils/workspace/ApiUrlResolver.js.map +1 -1
- package/dist/utils/workspace/TestWorkspaceUtil.js +9 -7
- package/dist/utils/workspace/TestWorkspaceUtil.js.map +1 -1
- package/driver/ChromeDriver.ts +7 -7
- package/index.ts +22 -12
- package/package.json +4 -2
- package/pageobjects/dashboard/CreateWorkspace.ts +2 -2
- package/pageobjects/dashboard/Dashboard.ts +7 -6
- package/pageobjects/dashboard/Workspaces.ts +3 -4
- package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +2 -3
- package/pageobjects/git-providers/OauthPage.ts +8 -16
- package/pageobjects/ide/CheCodeLocatorLoader.ts +2 -2
- package/pageobjects/login/kubernetes/DexLoginPage.ts +58 -0
- package/pageobjects/login/kubernetes/KubernetesLoginPage.ts +33 -0
- package/pageobjects/{openshift → login/openshift}/OcpLoginPage.ts +7 -7
- package/pageobjects/login/{OcpRedHatLoginPage.ts → openshift/OcpRedHatLoginPage.ts} +6 -6
- package/pageobjects/login/{OcpUserLoginPage.ts → openshift/OcpUserLoginPage.ts} +8 -8
- package/pageobjects/login/{RedHatLoginPage.ts → openshift/RedHatLoginPage.ts} +6 -6
- package/pageobjects/login/{RegularUserOcpCheLoginPage.ts → openshift/RegularUserOcpCheLoginPage.ts} +9 -9
- package/specs/MochaHooks.ts +18 -12
- package/specs/SmokeTest.spec.ts +5 -2
- package/specs/api/ContainerOverridesAPI.spec.ts +5 -4
- package/specs/api/DevfileAcceptanceTestAPI.spec.ts +106 -0
- package/specs/api/EmptyWorkspaceAPI.spec.ts +74 -0
- package/specs/api/PodOverridesAPI.spec.ts +5 -4
- package/specs/dashboard-samples/EmptyWorkspace.spec.ts +10 -2
- package/specs/dashboard-samples/RecomendedExtentions.spec.ts +8 -7
- package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +4 -4
- package/specs/factory/Factory.spec.ts +21 -19
- package/specs/factory/NoSetupRepoFactory.spec.ts +29 -30
- package/specs/factory/RefusedOAuthFactory.spec.ts +29 -28
- package/tests-library/LoginTests.ts +9 -9
- package/tests-library/ProjectAndFileTests.ts +1 -1
- package/tests-library/WorkspaceHandlingTests.ts +11 -12
- package/utils/BrowserTabsUtil.ts +2 -2
- package/utils/CheReporter.ts +35 -42
- package/utils/DevWorkspaceConfigurationHelper.ts +83 -0
- package/utils/DevfilesRegistryHelper.ts +77 -0
- package/utils/DriverHelper.ts +54 -50
- package/utils/KubernetesCommandLineToolsExecutor.ts +43 -28
- package/utils/Logger.ts +16 -17
- package/utils/ScreenCatcher.ts +8 -9
- package/utils/ShellExecutor.ts +6 -2
- package/utils/StringUtil.ts +46 -0
- package/utils/request-handlers/CheApiRequestHandler.ts +4 -4
- package/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.ts +4 -2
- package/utils/workspace/ApiUrlResolver.ts +2 -2
- package/utils/workspace/TestWorkspaceUtil.ts +16 -14
- package/constants/TestConstants.ts +0 -247
- package/dist/constants/TestConstants.js +0 -198
- package/dist/constants/TestConstants.js.map +0 -1
- package/dist/pageobjects/login/ICheLoginPage.js.map +0 -1
- package/dist/pageobjects/login/IOcpLoginPage.js.map +0 -1
- package/dist/pageobjects/login/OcpRedHatLoginPage.js.map +0 -1
- package/dist/pageobjects/login/OcpUserLoginPage.js.map +0 -1
- package/dist/pageobjects/login/RedHatLoginPage.js.map +0 -1
- package/dist/pageobjects/login/RegularUserOcpCheLoginPage.js.map +0 -1
- package/dist/pageobjects/openshift/CheLoginPage.js.map +0 -1
- package/dist/pageobjects/openshift/OcpLoginPage.js.map +0 -1
- package/dist/specs/api/CloneGitRepoAPI.spec.js +0 -60
- package/dist/specs/api/CloneGitRepoAPI.spec.js.map +0 -1
- package/dist/utils/Sanitizer.js +0 -29
- package/dist/utils/Sanitizer.js.map +0 -1
- package/dist/utils/vsc/GitUtil.js.map +0 -1
- package/pageobjects/openshift/CheLoginPage.ts +0 -42
- package/specs/api/CloneGitRepoAPI.spec.ts +0 -72
- package/utils/Sanitizer.ts +0 -19
- package/utils/vsc/GitUtil.ts +0 -25
- /package/dist/pageobjects/login/{ICheLoginPage.js → interfaces/ICheLoginPage.js} +0 -0
- /package/dist/pageobjects/login/{IOcpLoginPage.js → interfaces/IOcpLoginPage.js} +0 -0
- /package/pageobjects/login/{ICheLoginPage.ts → interfaces/ICheLoginPage.ts} +0 -0
- /package/pageobjects/login/{IOcpLoginPage.ts → interfaces/IOcpLoginPage.ts} +0 -0
|
@@ -21,14 +21,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
21
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
22
|
exports.KubernetesCommandLineToolsExecutor = void 0;
|
|
23
23
|
const shelljs_1 = require("shelljs");
|
|
24
|
-
const TestConstants_1 = require("../constants/TestConstants");
|
|
25
24
|
const Logger_1 = require("./Logger");
|
|
26
25
|
const ShellExecutor_1 = require("./ShellExecutor");
|
|
27
26
|
const path = __importStar(require("path"));
|
|
27
|
+
const APITestConstants_1 = require("../constants/APITestConstants");
|
|
28
|
+
const BaseTestConstants_1 = require("../constants/BaseTestConstants");
|
|
29
|
+
const OAuthConstants_1 = require("../constants/OAuthConstants");
|
|
28
30
|
class KubernetesCommandLineToolsExecutor extends ShellExecutor_1.ShellExecutor {
|
|
29
31
|
constructor(_workspaceName, _namespace) {
|
|
30
32
|
super();
|
|
31
|
-
this.KUBERNETES_COMMAND_LINE_TOOL =
|
|
33
|
+
this.KUBERNETES_COMMAND_LINE_TOOL = APITestConstants_1.APITestConstants.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL;
|
|
32
34
|
this.workspaceName = _workspaceName;
|
|
33
35
|
this.namespace = this.setNamespace(_namespace);
|
|
34
36
|
}
|
|
@@ -40,15 +42,15 @@ class KubernetesCommandLineToolsExecutor extends ShellExecutor_1.ShellExecutor {
|
|
|
40
42
|
}
|
|
41
43
|
// login to Openshift cluster with username and password
|
|
42
44
|
loginToOcp() {
|
|
43
|
-
if (this.KUBERNETES_COMMAND_LINE_TOOL ===
|
|
45
|
+
if (this.KUBERNETES_COMMAND_LINE_TOOL === APITestConstants_1.KubernetesCommandLineTool.OC) {
|
|
44
46
|
Logger_1.Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login to the "OC" client.`);
|
|
45
47
|
const url = this.getServerUrl();
|
|
46
48
|
if (this.isUserLoggedIn()) {
|
|
47
49
|
Logger_1.Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: User already logged`);
|
|
48
50
|
}
|
|
49
51
|
else {
|
|
50
|
-
Logger_1.Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login ${url}, ${
|
|
51
|
-
shelljs_1.exec(`oc login --server=${url} -u=${
|
|
52
|
+
Logger_1.Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login ${url}, ${APITestConstants_1.APITestConstants.TS_SELENIUM_OCP_USERNAME}`);
|
|
53
|
+
shelljs_1.exec(`oc login --server=${url} -u=${APITestConstants_1.APITestConstants.TS_SELENIUM_OCP_USERNAME} -p=${APITestConstants_1.APITestConstants.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`);
|
|
52
54
|
}
|
|
53
55
|
}
|
|
54
56
|
else {
|
|
@@ -57,82 +59,85 @@ class KubernetesCommandLineToolsExecutor extends ShellExecutor_1.ShellExecutor {
|
|
|
57
59
|
}
|
|
58
60
|
getContainerName() {
|
|
59
61
|
Logger_1.Logger.debug(`${this.getLoggingName(this.getContainerName.name)}: Get container name.`);
|
|
60
|
-
const output =
|
|
62
|
+
const output = ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} get ${(KubernetesCommandLineToolsExecutor.pod)} -o jsonpath='{.spec.containers[*].name}' -n ${this.namespace}`);
|
|
61
63
|
shelljs_1.echo('\n');
|
|
62
64
|
return output.stderr ? output.stderr : output.stdout;
|
|
63
65
|
}
|
|
64
66
|
getWorkspacePodName() {
|
|
65
67
|
Logger_1.Logger.debug(`${this.getLoggingName(this.getWorkspacePodName.name)}: Get workspace pod name.`);
|
|
66
|
-
const output =
|
|
68
|
+
const output = ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} get pod -l controller.devfile.io/devworkspace_name=${this.workspaceName} -n ${this.namespace} -o name`);
|
|
67
69
|
return output.stderr ? output.stderr : output.stdout.replace('\n', '');
|
|
68
70
|
}
|
|
69
71
|
deleteDevWorkspace() {
|
|
70
72
|
Logger_1.Logger.debug(`${this.getLoggingName(this.deleteDevWorkspace.name)}: Delete '${this.workspaceName}' workspace`);
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
73
|
+
ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
|
|
74
|
+
ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dw ${this.workspaceName} -n ${this.namespace} || true`);
|
|
75
|
+
ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dwt ${APITestConstants_1.APITestConstants.TS_SELENIUM_EDITOR}-${this.workspaceName} -n ${this.namespace} || true`);
|
|
74
76
|
}
|
|
75
77
|
applyAndWaitDevWorkspace(yamlConfiguration) {
|
|
76
|
-
if (this.KUBERNETES_COMMAND_LINE_TOOL ===
|
|
78
|
+
if (this.KUBERNETES_COMMAND_LINE_TOOL === APITestConstants_1.KubernetesCommandLineTool.KUBECTL) {
|
|
77
79
|
this.createNamespace();
|
|
78
80
|
}
|
|
79
81
|
this.applyYamlConfigurationAsStringOutput(yamlConfiguration);
|
|
80
|
-
|
|
81
|
-
KubernetesCommandLineToolsExecutor.pod = this.getWorkspacePodName();
|
|
82
|
-
KubernetesCommandLineToolsExecutor.container = this.getContainerName();
|
|
83
|
-
return output;
|
|
82
|
+
return this.waitDevWorkspace();
|
|
84
83
|
}
|
|
85
|
-
executeCommand(commandToExecute) {
|
|
84
|
+
executeCommand(commandToExecute, container = KubernetesCommandLineToolsExecutor.container) {
|
|
86
85
|
Logger_1.Logger.debug(`${this.getLoggingName(this.executeCommand.name)}:`);
|
|
87
|
-
return
|
|
86
|
+
return ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} exec -i ${KubernetesCommandLineToolsExecutor.pod} -n ${this.namespace} -c ${container} -- sh -c '${commandToExecute}'`);
|
|
88
87
|
}
|
|
89
88
|
applyYamlConfigurationAsStringOutput(yamlConfiguration) {
|
|
90
89
|
Logger_1.Logger.debug(`${this.getLoggingName(this.applyYamlConfigurationAsStringOutput.name)}:`);
|
|
91
|
-
|
|
90
|
+
return ShellExecutor_1.ShellExecutor.execWithLog(`cat <<EOF | ${this.KUBERNETES_COMMAND_LINE_TOOL} apply -n ${this.namespace} -f - \n` +
|
|
92
91
|
yamlConfiguration + '\n' +
|
|
93
92
|
'EOF');
|
|
94
93
|
}
|
|
95
94
|
applyYamlConfigurationAsFile(pathToFile) {
|
|
96
95
|
Logger_1.Logger.debug(`${this.getLoggingName(this.applyYamlConfigurationAsFile.name)}:`);
|
|
97
|
-
|
|
96
|
+
ShellExecutor_1.ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} apply -n ${this.namespace} -f "${path.resolve(pathToFile)}"`);
|
|
98
97
|
}
|
|
99
98
|
getDevWorkspaceYamlConfiguration() {
|
|
100
99
|
Logger_1.Logger.debug(`${this.getLoggingName(this.getDevWorkspaceYamlConfiguration.name)}:`);
|
|
101
|
-
return
|
|
100
|
+
return ShellExecutor_1.ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} get dw ${this.workspaceName} -n ${this.namespace} -o yaml`);
|
|
102
101
|
}
|
|
103
102
|
waitDevWorkspace(timeout = 360) {
|
|
104
103
|
Logger_1.Logger.debug(`${this.getLoggingName(this.waitDevWorkspace.name)}: Wait till workspace ready.`);
|
|
105
|
-
|
|
104
|
+
const output = ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} wait -n ${this.namespace} --for=condition=Ready dw ${this.workspaceName} --timeout=${timeout}s`);
|
|
105
|
+
this.getPodAndContainerNames();
|
|
106
|
+
return output;
|
|
106
107
|
}
|
|
107
108
|
createNamespace() {
|
|
108
109
|
Logger_1.Logger.debug(`${this.getLoggingName(this.createNamespace.name)}: Create namespace "${this.namespace}".`);
|
|
109
|
-
|
|
110
|
+
ShellExecutor_1.ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} create namespace ${this.namespace}`);
|
|
110
111
|
}
|
|
111
112
|
createProject(projectName) {
|
|
112
113
|
Logger_1.Logger.debug(`${this.getLoggingName(this.createProject.name)}: Create new project "${projectName}".`);
|
|
113
|
-
|
|
114
|
+
ShellExecutor_1.ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} new-project ${projectName} -n ${this.namespace}`);
|
|
114
115
|
}
|
|
115
116
|
deleteProject(projectName) {
|
|
116
117
|
Logger_1.Logger.debug(`${this.getLoggingName(this.deleteProject.name)}: Delete "${projectName}".`);
|
|
117
|
-
|
|
118
|
+
ShellExecutor_1.ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} delete project ${projectName} -n ${this.namespace}`);
|
|
119
|
+
}
|
|
120
|
+
getPodAndContainerNames() {
|
|
121
|
+
KubernetesCommandLineToolsExecutor.pod = this.getWorkspacePodName();
|
|
122
|
+
KubernetesCommandLineToolsExecutor.container = this.getContainerName();
|
|
118
123
|
}
|
|
119
124
|
isUserLoggedIn() {
|
|
120
|
-
const whoamiCommandOutput =
|
|
121
|
-
return whoamiCommandOutput.stdout.includes(
|
|
125
|
+
const whoamiCommandOutput = ShellExecutor_1.ShellExecutor.execWithLog('oc whoami && oc whoami --show-server=true');
|
|
126
|
+
return whoamiCommandOutput.stdout.includes(OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME) && whoamiCommandOutput.stdout.includes(this.getServerUrl());
|
|
122
127
|
}
|
|
123
128
|
getLoggingName(methodName) {
|
|
124
129
|
return `${this.constructor.name}.${methodName} - ${(this.KUBERNETES_COMMAND_LINE_TOOL)}`;
|
|
125
130
|
}
|
|
126
131
|
setNamespace(_namespace) {
|
|
127
132
|
_namespace = _namespace !== undefined ? _namespace
|
|
128
|
-
:
|
|
129
|
-
:
|
|
133
|
+
: BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_BASE_URL.includes('devspaces') ? OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME + '-devspaces'
|
|
134
|
+
: BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_BASE_URL.includes('che') ? OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME + '-che'
|
|
130
135
|
: 'default';
|
|
131
136
|
return _namespace;
|
|
132
137
|
}
|
|
133
138
|
getServerUrl() {
|
|
134
139
|
Logger_1.Logger.debug(`${this.getLoggingName(this.getServerUrl.name)}: Get server api url.`);
|
|
135
|
-
return
|
|
140
|
+
return BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_BASE_URL.replace('devspaces.apps', 'api') + ':6443';
|
|
136
141
|
}
|
|
137
142
|
}
|
|
138
143
|
exports.KubernetesCommandLineToolsExecutor = KubernetesCommandLineToolsExecutor;
|
|
@@ -156,6 +161,14 @@ exports.KubernetesCommandLineToolsExecutor = KubernetesCommandLineToolsExecutor;
|
|
|
156
161
|
removeFolder(path) {
|
|
157
162
|
return this.executeCommand('rm -rf ' + path);
|
|
158
163
|
}
|
|
164
|
+
getEnvValue(envName) {
|
|
165
|
+
envName = envName.replace(/[${}]/g, '');
|
|
166
|
+
const output = this.executeCommand(`env | grep ${envName}`);
|
|
167
|
+
return output.stderr ? output.stderr :
|
|
168
|
+
output.stdout
|
|
169
|
+
.substring(output.stdout.lastIndexOf('=') + 1)
|
|
170
|
+
.replace('\n', '');
|
|
171
|
+
}
|
|
159
172
|
}
|
|
160
173
|
KubernetesCommandLineToolsExecutor.ContainerTerminal = ContainerTerminal;
|
|
161
174
|
})(KubernetesCommandLineToolsExecutor = exports.KubernetesCommandLineToolsExecutor || (exports.KubernetesCommandLineToolsExecutor = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/Logger.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Logger = void 0;
|
|
4
|
-
const TestConstants_1 = require("../constants/TestConstants");
|
|
5
4
|
/*********************************************************************
|
|
6
5
|
* Copyright (c) 2019-2023 Red Hat, Inc.
|
|
7
6
|
*
|
|
@@ -11,6 +10,7 @@ const TestConstants_1 = require("../constants/TestConstants");
|
|
|
11
10
|
*
|
|
12
11
|
* SPDX-License-Identifier: EPL-2.0
|
|
13
12
|
**********************************************************************/
|
|
13
|
+
const ReporterConstants_1 = require("../constants/ReporterConstants");
|
|
14
14
|
class Logger {
|
|
15
15
|
/**
|
|
16
16
|
* Uses for logging of fatal errors.
|
|
@@ -26,7 +26,7 @@ class Logger {
|
|
|
26
26
|
* @param indentLevel log level
|
|
27
27
|
*/
|
|
28
28
|
static warn(text, indentLevel = 1) {
|
|
29
|
-
if (
|
|
29
|
+
if (ReporterConstants_1.ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'ERROR') {
|
|
30
30
|
return;
|
|
31
31
|
}
|
|
32
32
|
this.logText(indentLevel, `[WARN] ${text}`);
|
|
@@ -37,8 +37,8 @@ class Logger {
|
|
|
37
37
|
* @param indentLevel log level
|
|
38
38
|
*/
|
|
39
39
|
static info(text, indentLevel = 3) {
|
|
40
|
-
if (
|
|
41
|
-
|
|
40
|
+
if (ReporterConstants_1.ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'ERROR' ||
|
|
41
|
+
ReporterConstants_1.ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'WARN') {
|
|
42
42
|
return;
|
|
43
43
|
}
|
|
44
44
|
this.logText(indentLevel, `• ${text}`);
|
|
@@ -49,9 +49,9 @@ class Logger {
|
|
|
49
49
|
* @param indentLevel log level
|
|
50
50
|
*/
|
|
51
51
|
static debug(text, indentLevel = 5) {
|
|
52
|
-
if (
|
|
53
|
-
|
|
54
|
-
|
|
52
|
+
if (ReporterConstants_1.ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'ERROR' ||
|
|
53
|
+
ReporterConstants_1.ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'WARN' ||
|
|
54
|
+
ReporterConstants_1.ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'INFO') {
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
57
|
this.logText(indentLevel, `▼ ${text}`);
|
|
@@ -63,10 +63,10 @@ class Logger {
|
|
|
63
63
|
* @param indentLevel log level
|
|
64
64
|
*/
|
|
65
65
|
static trace(text, indentLevel = 6) {
|
|
66
|
-
if (
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
66
|
+
if (ReporterConstants_1.ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'ERROR' ||
|
|
67
|
+
ReporterConstants_1.ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'WARN' ||
|
|
68
|
+
ReporterConstants_1.ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'INFO' ||
|
|
69
|
+
ReporterConstants_1.ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'DEBUG') {
|
|
70
70
|
return;
|
|
71
71
|
}
|
|
72
72
|
this.logText(indentLevel, `‣ ${text}`);
|
package/dist/utils/Logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../utils/Logger.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../utils/Logger.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AACxE,sEAAmE;AAEnE,MAAsB,MAAM;IAExB;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,IAAY,EAAE,cAAsB,CAAC;QAC9C,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,IAAY,EAAE,cAAsB,CAAC;QAC7C,IAAI,qCAAiB,CAAC,qBAAqB,KAAK,OAAO,EAAE;YACrD,OAAO;SACV;QACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,IAAY,EAAE,cAAsB,CAAC;QAC7C,IAAI,qCAAiB,CAAC,qBAAqB,KAAK,OAAO;YACnD,qCAAiB,CAAC,qBAAqB,KAAK,MAAM,EAAE;YACpD,OAAO;SACV;QACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,IAAY,EAAE,cAAsB,CAAC;QAC9C,IAAI,qCAAiB,CAAC,qBAAqB,KAAK,OAAO;YACnD,qCAAiB,CAAC,qBAAqB,KAAK,MAAM;YAClD,qCAAiB,CAAC,qBAAqB,KAAK,MAAM,EAAE;YACpD,OAAO;SACV;QACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,KAAK,CAAC,IAAY,EAAE,cAAsB,CAAC;QAC9C,IAAI,qCAAiB,CAAC,qBAAqB,KAAK,OAAO;YACnD,qCAAiB,CAAC,qBAAqB,KAAK,MAAM;YAClD,qCAAiB,CAAC,qBAAqB,KAAK,MAAM;YAClD,qCAAiB,CAAC,qBAAqB,KAAK,OAAO,EAAE;YACrD,OAAO;SACV;QACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;IAEO,MAAM,CAAC,OAAO,CAAC,uBAA+B,EAAE,IAAY;QAChE,8BAA8B;QAC9B,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,uBAAuB,EAAE,CAAC,EAAE,EAAE;YACtD,OAAO,CAAC,KAAK,EAAE,CAAC;SACnB;QACD,yBAAyB;QACzB,sDAAsD;QACtD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClB,4BAA4B;QAC5B,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,uBAAuB,EAAE,CAAC,EAAE,EAAE;YACtD,OAAO,CAAC,QAAQ,EAAE,CAAC;SACtB;IACL,CAAC;CACJ;AA/ED,wBA+EC"}
|
|
@@ -45,28 +45,27 @@ const fs = __importStar(require("fs"));
|
|
|
45
45
|
const inversify_1 = require("inversify");
|
|
46
46
|
const inversify_types_1 = require("../configs/inversify.types");
|
|
47
47
|
const DriverHelper_1 = require("./DriverHelper");
|
|
48
|
-
const Sanitizer_1 = require("./Sanitizer");
|
|
49
48
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
50
|
-
const
|
|
49
|
+
const StringUtil_1 = require("./StringUtil");
|
|
50
|
+
const ReporterConstants_1 = require("../constants/ReporterConstants");
|
|
51
51
|
let ScreenCatcher = class ScreenCatcher {
|
|
52
|
-
constructor(driverHelper
|
|
52
|
+
constructor(driverHelper) {
|
|
53
53
|
this.driverHelper = driverHelper;
|
|
54
|
-
this.sanitizer = sanitizer;
|
|
55
54
|
}
|
|
56
55
|
async catchMethodScreen(methodName, methodIndex, screenshotIndex) {
|
|
57
|
-
const executionScreenCastDir = `${
|
|
58
|
-
const executionScreenCastErrorsDir = `${
|
|
56
|
+
const executionScreenCastDir = `${ReporterConstants_1.ReporterConstants.TS_SELENIUM_REPORT_FOLDER}/executionScreencast`;
|
|
57
|
+
const executionScreenCastErrorsDir = `${ReporterConstants_1.ReporterConstants.TS_SELENIUM_REPORT_FOLDER}/executionScreencastErrors`;
|
|
59
58
|
const formattedMethodIndex = new Intl.NumberFormat('en-us', { minimumIntegerDigits: 3 }).format(methodIndex);
|
|
60
59
|
const formattedScreenshotIndex = new Intl.NumberFormat('en-us', { minimumIntegerDigits: 5 }).format(screenshotIndex).replace(/,/g, '');
|
|
61
|
-
if (!fs.existsSync(
|
|
62
|
-
fs.mkdirSync(
|
|
60
|
+
if (!fs.existsSync(ReporterConstants_1.ReporterConstants.TS_SELENIUM_REPORT_FOLDER)) {
|
|
61
|
+
fs.mkdirSync(ReporterConstants_1.ReporterConstants.TS_SELENIUM_REPORT_FOLDER);
|
|
63
62
|
}
|
|
64
63
|
if (!fs.existsSync(executionScreenCastDir)) {
|
|
65
64
|
fs.mkdirSync(executionScreenCastDir);
|
|
66
65
|
}
|
|
67
66
|
const date = new Date();
|
|
68
67
|
const timeStr = date.toLocaleTimeString('en-us', { hour12: false }) + '.' + new Intl.NumberFormat('en-us', { minimumIntegerDigits: 3 }).format(date.getMilliseconds());
|
|
69
|
-
const screenshotPath = `${executionScreenCastDir}/${formattedMethodIndex}-${formattedScreenshotIndex}--(${
|
|
68
|
+
const screenshotPath = `${executionScreenCastDir}/${formattedMethodIndex}-${formattedScreenshotIndex}--(${StringUtil_1.StringUtil.sanitizeTitle(timeStr)})_${StringUtil_1.StringUtil.sanitizeTitle(methodName)}.png`;
|
|
70
69
|
try {
|
|
71
70
|
await this.catchScreen(screenshotPath);
|
|
72
71
|
}
|
|
@@ -99,9 +98,7 @@ let ScreenCatcher = class ScreenCatcher {
|
|
|
99
98
|
ScreenCatcher = __decorate([
|
|
100
99
|
inversify_1.injectable(),
|
|
101
100
|
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
102
|
-
|
|
103
|
-
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper,
|
|
104
|
-
Sanitizer_1.Sanitizer])
|
|
101
|
+
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
105
102
|
], ScreenCatcher);
|
|
106
103
|
exports.ScreenCatcher = ScreenCatcher;
|
|
107
104
|
//# sourceMappingURL=ScreenCatcher.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScreenCatcher.js","sourceRoot":"","sources":["../../utils/ScreenCatcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,uCAAyB;AACzB,yCAA+C;AAC/C,gEAAqD;AACrD,iDAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"ScreenCatcher.js","sourceRoot":"","sources":["../../utils/ScreenCatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ShellExecutor = void 0;
|
|
4
4
|
const shelljs_1 = require("shelljs");
|
|
5
5
|
class ShellExecutor {
|
|
6
|
-
wait(seconds) {
|
|
6
|
+
static wait(seconds) {
|
|
7
7
|
this.execWithLog(`sleep ${seconds}s`);
|
|
8
8
|
}
|
|
9
|
-
|
|
9
|
+
static curl(link) {
|
|
10
|
+
return this.execWithLog(`curl -k ${link}`);
|
|
11
|
+
}
|
|
12
|
+
static execWithLog(command) {
|
|
10
13
|
shelljs_1.echo(command);
|
|
11
14
|
return shelljs_1.exec(command);
|
|
12
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShellExecutor.js","sourceRoot":"","sources":["../../utils/ShellExecutor.ts"],"names":[],"mappings":";;;AAAA,qCAAkD;AAElD,MAAa,aAAa;IAEtB,IAAI,CAAC,OAAe;
|
|
1
|
+
{"version":3,"file":"ShellExecutor.js","sourceRoot":"","sources":["../../utils/ShellExecutor.ts"],"names":[],"mappings":";;;AAAA,qCAAkD;AAElD,MAAa,aAAa;IAEtB,MAAM,CAAC,IAAI,CAAC,OAAe;QACvB,IAAI,CAAC,WAAW,CAAC,SAAS,OAAO,GAAG,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,IAAY;QACpB,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;IAES,MAAM,CAAC,WAAW,CAAC,OAAe;QACxC,cAAI,CAAC,OAAO,CAAC,CAAC;QACd,OAAO,cAAI,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;CACJ;AAdD,sCAcC"}
|
|
@@ -15,22 +15,40 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
15
15
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.
|
|
18
|
+
exports.StringUtil = void 0;
|
|
19
19
|
const inversify_1 = require("inversify");
|
|
20
|
-
|
|
20
|
+
const Logger_1 = require("./Logger");
|
|
21
|
+
let StringUtil = class StringUtil {
|
|
21
22
|
/**
|
|
22
23
|
* Method extracts a test repo name from git clone https url;
|
|
23
|
-
* it splits the url into string[] by "/" or ".", deletes empty elements and elements that contains just "git" word, than returns the last one;
|
|
24
|
+
* it splits the url into string[] by "/" or ".", deletes empty elements and elements that contains just "git", "main" or "tree" word, than returns the last one;
|
|
24
25
|
* please, avoid to call the test repo as just "git" or to use dots in the name, like: github.com/user/git.git, github.com/user/name.with.dots.
|
|
25
26
|
* @param url git https url (which using for "git clone")
|
|
26
27
|
* @return project name
|
|
27
28
|
*/
|
|
28
29
|
static getProjectNameFromGitUrl(url) {
|
|
29
|
-
|
|
30
|
+
Logger_1.Logger.debug(`${this.constructor.name}.${this.getProjectNameFromGitUrl.name} - ${url}`);
|
|
31
|
+
if (url.includes('/tree/')) {
|
|
32
|
+
url = url.split('/').slice(0, -2).join('/');
|
|
33
|
+
}
|
|
34
|
+
const projectName = url.split(/[\/.]/).filter((e) => !['git', ''].includes(e)).reverse()[0];
|
|
35
|
+
Logger_1.Logger.debug(`${this.constructor.name}.${this.getProjectNameFromGitUrl.name} - ${projectName}`);
|
|
36
|
+
return projectName;
|
|
37
|
+
}
|
|
38
|
+
static sanitizeTitle(arg) {
|
|
39
|
+
return arg.replace(/\//g, '+').replace(/,/g, '.').replace(/:/g, '-').replace(/['"]/g, '').replace(/[^a-z0-9+\-.()\[\]_]/gi, '_');
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* Replaces ${ENV}, $ENV to "$ENV"
|
|
43
|
+
* @param command string command with environmental variables in unsupported format
|
|
44
|
+
* @return updated command with environmental variables in supported format
|
|
45
|
+
*/
|
|
46
|
+
static updateCommandEnvsToShStyle(command) {
|
|
47
|
+
return command.replace(/[{}]/g, '').replace(/(?<!")\${?[a-zA-Z0-9_+\-\s]+\b}?/gm, `"\$&"`);
|
|
30
48
|
}
|
|
31
49
|
};
|
|
32
|
-
|
|
50
|
+
StringUtil = __decorate([
|
|
33
51
|
inversify_1.injectable()
|
|
34
|
-
],
|
|
35
|
-
exports.
|
|
36
|
-
//# sourceMappingURL=
|
|
52
|
+
], StringUtil);
|
|
53
|
+
exports.StringUtil = StringUtil;
|
|
54
|
+
//# sourceMappingURL=StringUtil.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StringUtil.js","sourceRoot":"","sources":["../../utils/StringUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;AAExE,yCAAuC;AACvC,qCAAkC;AAGlC,IAAa,UAAU,GAAvB,MAAa,UAAU;IACnB;;;;;;OAMG;IACH,MAAM,CAAC,wBAAwB,CAAC,GAAW;QACvC,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,wBAAwB,CAAC,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC;QACxF,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACxB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC/C;QACD,MAAM,WAAW,GAAW,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5G,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,wBAAwB,CAAC,IAAI,MAAM,WAAW,EAAE,CAAC,CAAC;QAChG,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,GAAW;QAC5B,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;IACrI,CAAC;IAED;;;;OAIG;IAEH,MAAM,CAAC,0BAA0B,CAAC,OAAe;QAC7C,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,oCAAoC,EAAE,OAAO,CAAC,CAAC;IAC/F,CAAC;CACJ,CAAA;AA/BY,UAAU;IADtB,sBAAU,EAAE;GACA,UAAU,CA+BtB;AA/BY,gCAAU"}
|
|
@@ -26,10 +26,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
27
|
exports.CheApiRequestHandler = void 0;
|
|
28
28
|
const axios_1 = __importDefault(require("axios"));
|
|
29
|
-
const TestConstants_1 = require("../../constants/TestConstants");
|
|
30
29
|
const inversify_types_1 = require("../../configs/inversify.types");
|
|
31
30
|
const inversify_1 = require("inversify");
|
|
32
31
|
const Logger_1 = require("../Logger");
|
|
32
|
+
const BaseTestConstants_1 = require("../../constants/BaseTestConstants");
|
|
33
33
|
let CheApiRequestHandler = class CheApiRequestHandler {
|
|
34
34
|
constructor(headerHandler) {
|
|
35
35
|
this.headerHandler = headerHandler;
|
|
@@ -114,7 +114,7 @@ let CheApiRequestHandler = class CheApiRequestHandler {
|
|
|
114
114
|
return await axios_1.default.patch(this.assembleUrl(relativeUrl), patchParams, await this.headerHandler.get());
|
|
115
115
|
}
|
|
116
116
|
assembleUrl(relativeUrl) {
|
|
117
|
-
return `${
|
|
117
|
+
return `${BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_BASE_URL}/${relativeUrl}`;
|
|
118
118
|
}
|
|
119
119
|
};
|
|
120
120
|
CheApiRequestHandler = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheApiRequestHandler.js","sourceRoot":"","sources":["../../../utils/request-handlers/CheApiRequestHandler.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;;;AAExE,kDAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"CheApiRequestHandler.js","sourceRoot":"","sources":["../../../utils/request-handlers/CheApiRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,14 +17,16 @@ const inversify_1 = require("inversify");
|
|
|
17
17
|
const DriverHelper_1 = require("../../DriverHelper");
|
|
18
18
|
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
19
19
|
const Logger_1 = require("../../Logger");
|
|
20
|
+
const BaseTestConstants_1 = require("../../../constants/BaseTestConstants");
|
|
20
21
|
let CheMultiuserAuthorizationHeaderHandler = class CheMultiuserAuthorizationHeaderHandler {
|
|
21
22
|
constructor(driverHelper) {
|
|
22
23
|
this.driverHelper = driverHelper;
|
|
23
24
|
this.authorizationToken = '';
|
|
25
|
+
this.cookiesType = BaseTestConstants_1.BaseTestConstants.TS_PLATFORM === BaseTestConstants_1.Platform.OPENSHIFT ? '_oauth_proxy' : '_oauth2_proxy';
|
|
24
26
|
}
|
|
25
27
|
async get() {
|
|
26
28
|
try {
|
|
27
|
-
let token = await this.driverHelper.getDriver().manage().getCookie(
|
|
29
|
+
let token = await this.driverHelper.getDriver().manage().getCookie(this.cookiesType);
|
|
28
30
|
if (this.authorizationToken !== token.value) {
|
|
29
31
|
this.authorizationToken = token.value;
|
|
30
32
|
}
|
|
@@ -37,7 +39,7 @@ let CheMultiuserAuthorizationHeaderHandler = class CheMultiuserAuthorizationHead
|
|
|
37
39
|
throw new Error(`Could not obtain _oauth_proxy cookie from chromedriver, browser session may have been killed. No stored token present!`);
|
|
38
40
|
}
|
|
39
41
|
}
|
|
40
|
-
return { headers: { 'cookie':
|
|
42
|
+
return { headers: { 'cookie': `${this.cookiesType}=${this.authorizationToken}` } };
|
|
41
43
|
}
|
|
42
44
|
};
|
|
43
45
|
CheMultiuserAuthorizationHeaderHandler = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAWA,yCAA+C;AAC/C,qDAAkD;AAClD,sEAA2D;AAC3D,yCAAsC;
|
|
1
|
+
{"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAWA,yCAA+C;AAC/C,qDAAkD;AAClD,sEAA2D;AAC3D,yCAAsC;AAEtC,4EAAmF;AAGnF,IAAa,sCAAsC,GAAnD,MAAa,sCAAsC;IAI/C,YAA2D,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QAH7E,uBAAkB,GAAW,EAAE,CAAC;QACvB,gBAAW,GAAW,qCAAiB,CAAC,WAAW,KAAK,4BAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC;IAEtC,CAAC;IAE1F,KAAK,CAAC,GAAG;QACL,IAAI;YACA,IAAI,KAAK,GAAqB,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACvG,IAAI,IAAI,CAAC,kBAAkB,KAAK,KAAK,CAAC,KAAK,EAAE;gBACzC,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC,KAAK,CAAC;aACzC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACpC,eAAM,CAAC,IAAI,CAAC,mHAAmH,CAAC,CAAC;aACpI;iBAAM;gBACH,MAAM,IAAI,KAAK,CAAC,wHAAwH,CAAC,CAAC;aAC7I;SACJ;QAED,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,kBAAkB,EAAE,EAAE,EAAE,CAAC;IACvF,CAAC;CACJ,CAAA;AAtBY,sCAAsC;IADlD,sBAAU,EAAE;IAKI,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAAgC,2BAAY;GAJ5E,sCAAsC,CAsBlD;AAtBY,wFAAsC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiUrlResolver.js","sourceRoot":"","sources":["../../../utils/workspace/ApiUrlResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,mEAAwD;AACxD,sCAAmC;AACnC,mFAAgF;AAIhF,IAAa,cAAc,sBAA3B,MAAa,cAAc;IAMvB,YAAmE,qBAA2C;QAA3C,0BAAqB,GAArB,qBAAqB,CAAsB;QAFtG,kBAAa,GAAW,EAAE,CAAC;IAE8E,CAAC;
|
|
1
|
+
{"version":3,"file":"ApiUrlResolver.js","sourceRoot":"","sources":["../../../utils/workspace/ApiUrlResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,mEAAwD;AACxD,sCAAmC;AACnC,mFAAgF;AAIhF,IAAa,cAAc,sBAA3B,MAAa,cAAc;IAMvB,YAAmE,qBAA2C;QAA3C,0BAAqB,GAArB,qBAAqB,CAAsB;QAFtG,kBAAa,GAAW,EAAE,CAAC;IAE8E,CAAC;IAElH,KAAK,CAAC,kBAAkB,CAAC,aAAqB;QAC1C,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,IAAI,aAAa,EAAE,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,MAAM,SAAS,GAAW,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3D,OAAO,GAAG,gBAAc,CAAC,iBAAiB,IAAI,SAAS,gBAAgB,CAAC;IAC5E,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC7B,eAAM,CAAC,KAAK,CAAC,sCAAsC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACzE,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,eAAM,CAAC,KAAK,CAAC,sFAAsF,CAAC,CAAC;YACrG,MAAM,kBAAkB,GAAkB,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,gBAAc,CAAC,kBAAkB,CAAC,CAAC;YAClH,IAAI,kBAAkB,CAAC,MAAM,KAAK,GAAG,EAAE;gBACnC,MAAM,IAAI,KAAK,CAAC,wDAAwD,kBAAkB,CAAC,MAAM,UAAU,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC;aACzI;YACD,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACrD,eAAM,CAAC,KAAK,CAAC,uDAAuD,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;SAC7F;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;CACJ,CAAA;AA7B2B,gCAAiB,GAAW,yBAAyB,CAAC;AACtD,iCAAkB,GAAW,0BAA0B,CAAC;AAFvE,cAAc;IAD1B,sBAAU,EAAE;IAOI,WAAA,kBAAM,CAAC,yBAAO,CAAC,oBAAoB,CAAC,CAAA;qCAAyC,2CAAoB;GANrG,cAAc,CA8B1B;AA9BY,wCAAc"}
|
|
@@ -26,7 +26,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
27
|
exports.TestWorkspaceUtil = void 0;
|
|
28
28
|
require("reflect-metadata");
|
|
29
|
-
const TestConstants_1 = require("../../constants/TestConstants");
|
|
30
29
|
const inversify_1 = require("inversify");
|
|
31
30
|
const DriverHelper_1 = require("../DriverHelper");
|
|
32
31
|
const WorkspaceStatus_1 = require("./WorkspaceStatus");
|
|
@@ -36,13 +35,14 @@ const inversify_types_1 = require("../../configs/inversify.types");
|
|
|
36
35
|
const Logger_1 = require("../Logger");
|
|
37
36
|
const axios_1 = __importDefault(require("axios"));
|
|
38
37
|
const ApiUrlResolver_1 = require("./ApiUrlResolver");
|
|
38
|
+
const TimeoutConstants_1 = require("../../constants/TimeoutConstants");
|
|
39
39
|
let TestWorkspaceUtil = class TestWorkspaceUtil {
|
|
40
40
|
constructor(driverHelper, processRequestHandler, apiUrlResolver) {
|
|
41
41
|
this.driverHelper = driverHelper;
|
|
42
42
|
this.processRequestHandler = processRequestHandler;
|
|
43
43
|
this.apiUrlResolver = apiUrlResolver;
|
|
44
|
-
this.
|
|
45
|
-
this.
|
|
44
|
+
this.polling = TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_DEFAULT_POLLING;
|
|
45
|
+
this.attempts = TimeoutConstants_1.TimeoutConstants.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT / this.polling;
|
|
46
46
|
}
|
|
47
47
|
async waitWorkspaceStatus(workspaceName, expectedWorkspaceStatus) {
|
|
48
48
|
Logger_1.Logger.debug('TestWorkspaceUtil.waitWorkspaceStatus');
|
|
@@ -66,25 +66,26 @@ let TestWorkspaceUtil = class TestWorkspaceUtil {
|
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
async stopWorkspaceByName(workspaceName) {
|
|
69
|
-
Logger_1.Logger.debug(
|
|
69
|
+
Logger_1.Logger.debug(`TestWorkspaceUtil.stopWorkspaceByName: ${workspaceName}`);
|
|
70
70
|
const stopWorkspaceApiUrl = await this.apiUrlResolver.getWorkspaceApiUrl(workspaceName);
|
|
71
71
|
let stopWorkspaceResponse;
|
|
72
72
|
try {
|
|
73
73
|
stopWorkspaceResponse = await this.processRequestHandler.patch(stopWorkspaceApiUrl, [{ 'op': 'replace', 'path': '/spec/started', 'value': false }]);
|
|
74
74
|
}
|
|
75
75
|
catch (err) {
|
|
76
|
-
|
|
76
|
+
Logger_1.Logger.error(`Stop workspace call failed. URL used: ${stopWorkspaceApiUrl}`);
|
|
77
77
|
throw err;
|
|
78
78
|
}
|
|
79
79
|
if (stopWorkspaceResponse.status !== 200) {
|
|
80
80
|
throw new Error(`Cannot stop workspace. Code: ${stopWorkspaceResponse.status} Data: ${stopWorkspaceResponse.data}`);
|
|
81
81
|
}
|
|
82
82
|
await this.waitWorkspaceStatus(workspaceName, WorkspaceStatus_1.WorkspaceStatus.STOPPED);
|
|
83
|
+
Logger_1.Logger.debug(`TestWorkspaceUtil.stopWorkspaceByName: ${workspaceName} stopped successfully`);
|
|
83
84
|
}
|
|
84
85
|
// delete a workspace without stopping phase (similar with force deleting)
|
|
85
86
|
async deleteWorkspaceByName(workspaceName) {
|
|
86
87
|
var _a, _b;
|
|
87
|
-
Logger_1.Logger.debug(`TestWorkspaceUtil.deleteWorkspaceByName ${workspaceName}`);
|
|
88
|
+
Logger_1.Logger.debug(`TestWorkspaceUtil.deleteWorkspaceByName: ${workspaceName}`);
|
|
88
89
|
const deleteWorkspaceApiUrl = await this.apiUrlResolver.getWorkspaceApiUrl(workspaceName);
|
|
89
90
|
let deleteWorkspaceResponse;
|
|
90
91
|
let deleteWorkspaceStatus = false;
|
|
@@ -109,13 +110,14 @@ let TestWorkspaceUtil = class TestWorkspaceUtil {
|
|
|
109
110
|
catch (error) {
|
|
110
111
|
if (axios_1.default.isAxiosError(error) && ((_b = error.response) === null || _b === void 0 ? void 0 : _b.status) === 404) {
|
|
111
112
|
deleteWorkspaceStatus = true;
|
|
113
|
+
Logger_1.Logger.debug(`TestWorkspaceUtil.stopWorkspaceByName: ${workspaceName} deleted successfully`);
|
|
112
114
|
break;
|
|
113
115
|
}
|
|
114
116
|
}
|
|
115
117
|
}
|
|
116
118
|
if (!deleteWorkspaceStatus) {
|
|
117
119
|
let waitTime = this.attempts * this.polling;
|
|
118
|
-
throw new selenium_webdriver_1.error.TimeoutError(`The workspace was not
|
|
120
|
+
throw new selenium_webdriver_1.error.TimeoutError(`The workspace was not deleted in ${waitTime} ms.`);
|
|
119
121
|
}
|
|
120
122
|
}
|
|
121
123
|
// stop workspace before deleting with checking stopping phase
|