@eclipse-che/che-e2e 7.74.0-dev-1d09cb7 → 7.74.0-dev-aace77a
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/.eslintignore +10 -0
- package/.eslintrc.js +197 -0
- package/.prettierignore +10 -0
- package/.prettierrc.json +10 -0
- package/CODE_STYLE.md +144 -0
- package/README.md +47 -47
- package/configs/inversify.config.ts +39 -14
- package/configs/inversify.types.ts +44 -30
- package/configs/mocharc.ts +21 -24
- package/constants/API_TEST_CONSTANTS.ts +67 -0
- package/constants/BASE_TEST_CONSTANTS.ts +80 -0
- package/constants/CHROME_DRIVER_CONSTANTS.ts +42 -0
- package/constants/FACTORY_TEST_CONSTANTS.ts +61 -0
- package/constants/MONACO_CONSTANTS.ts +25 -0
- package/constants/OAUTH_CONSTANTS.ts +67 -0
- package/constants/PLUGIN_TEST_CONSTANTS.ts +15 -0
- package/constants/REPORTER_CONSTANTS.ts +53 -0
- package/constants/TIMEOUT_CONSTANTS.ts +131 -0
- package/dist/configs/inversify.config.js +36 -9
- package/dist/configs/inversify.config.js.map +1 -1
- package/dist/configs/inversify.types.js +19 -5
- package/dist/configs/inversify.types.js.map +1 -1
- package/dist/configs/mocharc.js +13 -16
- package/dist/configs/mocharc.js.map +1 -1
- package/dist/constants/{APITestConstants.js → API_TEST_CONSTANTS.js} +12 -12
- package/dist/constants/API_TEST_CONSTANTS.js.map +1 -0
- package/dist/constants/{BaseTestConstants.js → BASE_TEST_CONSTANTS.js} +16 -16
- package/dist/constants/BASE_TEST_CONSTANTS.js.map +1 -0
- package/dist/constants/CHROME_DRIVER_CONSTANTS.js +36 -0
- package/dist/constants/CHROME_DRIVER_CONSTANTS.js.map +1 -0
- package/dist/constants/{FactoryTestConstants.js → FACTORY_TEST_CONSTANTS.js} +14 -13
- package/dist/constants/FACTORY_TEST_CONSTANTS.js.map +1 -0
- package/dist/constants/{MonacoConstants.js → MONACO_CONSTANTS.js} +7 -7
- package/dist/constants/MONACO_CONSTANTS.js.map +1 -0
- package/dist/constants/{OAuthConstants.js → OAUTH_CONSTANTS.js} +14 -14
- package/dist/constants/OAUTH_CONSTANTS.js.map +1 -0
- package/dist/constants/{PluginsTestConstants.js → PLUGIN_TEST_CONSTANTS.js} +7 -7
- package/dist/constants/PLUGIN_TEST_CONSTANTS.js.map +1 -0
- package/dist/constants/{ReporterConstants.js → REPORTER_CONSTANTS.js} +12 -12
- package/dist/constants/REPORTER_CONSTANTS.js.map +1 -0
- package/dist/constants/{TimeoutConstants.js → TIMEOUT_CONSTANTS.js} +24 -24
- package/dist/constants/TIMEOUT_CONSTANTS.js.map +1 -0
- package/dist/driver/ChromeDriver.js +12 -22
- package/dist/driver/ChromeDriver.js.map +1 -1
- package/dist/index.js +18 -12
- package/dist/index.js.map +1 -1
- package/dist/pageobjects/dashboard/CreateWorkspace.js +15 -15
- package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
- package/dist/pageobjects/dashboard/Dashboard.js +20 -21
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/dashboard/Workspaces.js +55 -60
- package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +58 -48
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
- package/dist/pageobjects/git-providers/OauthPage.js +22 -20
- package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js +26 -12
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js.map +1 -1
- package/dist/pageobjects/login/interfaces/ICheLoginPage.js +2 -2
- package/dist/pageobjects/login/interfaces/IOcpLoginPage.js +2 -2
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js +14 -14
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -1
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js +7 -7
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpLoginPage.js +24 -28
- package/dist/pageobjects/login/openshift/OcpLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js +13 -16
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js +9 -9
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js +19 -23
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js +20 -19
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpApplicationPage.js +11 -11
- package/dist/pageobjects/openshift/OcpApplicationPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js +24 -24
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpMainPage.js +30 -30
- package/dist/pageobjects/openshift/OcpMainPage.js.map +1 -1
- package/dist/specs/MochaHooks.js +33 -27
- package/dist/specs/MochaHooks.js.map +1 -1
- package/dist/specs/SmokeTest.spec.js +17 -17
- package/dist/specs/SmokeTest.spec.js.map +1 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js +8 -6
- package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +27 -24
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -1
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js +17 -17
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
- package/dist/specs/api/PodOverridesAPI.spec.js +10 -8
- package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +10 -10
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/Quarkus.spec.js +13 -13
- package/dist/specs/dashboard-samples/Quarkus.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js +52 -52
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js.map +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +23 -19
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
- package/dist/specs/factory/Factory.spec.js +38 -41
- package/dist/specs/factory/Factory.spec.js.map +1 -1
- package/dist/specs/factory/NoSetupRepoFactory.spec.js +52 -50
- package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js +49 -51
- package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js +45 -42
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js.map +1 -1
- package/dist/tests-library/LoginTests.js +13 -13
- package/dist/tests-library/LoginTests.js.map +1 -1
- package/dist/tests-library/ProjectAndFileTests.js +9 -7
- package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
- package/dist/tests-library/WorkspaceHandlingTests.js +22 -19
- package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
- package/dist/utils/BrowserTabsUtil.js +21 -21
- package/dist/utils/BrowserTabsUtil.js.map +1 -1
- package/dist/utils/CheReporter.js +91 -65
- package/dist/utils/CheReporter.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js +34 -15
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
- package/dist/utils/DevfilesRegistryHelper.js +34 -18
- package/dist/utils/DevfilesRegistryHelper.js.map +1 -1
- package/dist/utils/DriverHelper.js +73 -68
- package/dist/utils/DriverHelper.js.map +1 -1
- package/dist/utils/IContextParams.js +12 -0
- package/dist/utils/IContextParams.js.map +1 -0
- package/dist/utils/IKubernetesCommandLineToolsExecutor.js +3 -0
- package/dist/utils/IKubernetesCommandLineToolsExecutor.js.map +1 -0
- package/dist/utils/KubernetesCommandLineToolsExecutor.js +146 -107
- package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
- package/dist/utils/Logger.js +18 -19
- package/dist/utils/Logger.js.map +1 -1
- package/dist/utils/ScreenCatcher.js +26 -16
- package/dist/utils/ScreenCatcher.js.map +1 -1
- package/dist/utils/ShellExecutor.js +29 -9
- package/dist/utils/ShellExecutor.js.map +1 -1
- package/dist/utils/StringUtil.js +19 -9
- package/dist/utils/StringUtil.js.map +1 -1
- package/dist/utils/request-handlers/CheApiRequestHandler.js +29 -29
- package/dist/utils/request-handlers/CheApiRequestHandler.js.map +1 -1
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js +12 -8
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
- package/dist/utils/request-handlers/headers/IAuthorizationHeaderHandler.js +2 -2
- package/dist/utils/workspace/ApiUrlResolver.js +5 -5
- package/dist/utils/workspace/ApiUrlResolver.js.map +1 -1
- package/dist/utils/workspace/ITestWorkspaceUtil.js +2 -2
- package/dist/utils/workspace/TestWorkspaceUtil.js +25 -23
- package/dist/utils/workspace/TestWorkspaceUtil.js.map +1 -1
- package/dist/utils/workspace/WorkspaceStatus.js +2 -2
- package/dist/utils/workspace/WorkspaceStatus.js.map +1 -1
- package/driver/ChromeDriver.ts +45 -58
- package/driver/IDriver.ts +3 -3
- package/index.ts +11 -9
- package/package.json +59 -49
- package/pageobjects/dashboard/CreateWorkspace.ts +65 -55
- package/pageobjects/dashboard/Dashboard.ts +100 -100
- package/pageobjects/dashboard/Workspaces.ts +210 -186
- package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +153 -131
- package/pageobjects/git-providers/OauthPage.ts +177 -166
- package/pageobjects/ide/CheCodeLocatorLoader.ts +51 -46
- package/pageobjects/login/interfaces/ICheLoginPage.ts +3 -3
- package/pageobjects/login/interfaces/IOcpLoginPage.ts +3 -3
- package/pageobjects/login/kubernetes/DexLoginPage.ts +31 -30
- package/pageobjects/login/kubernetes/KubernetesLoginPage.ts +15 -14
- package/pageobjects/login/openshift/OcpLoginPage.ts +51 -56
- package/pageobjects/login/openshift/OcpRedHatLoginPage.ts +27 -27
- package/pageobjects/login/openshift/OcpUserLoginPage.ts +15 -18
- package/pageobjects/login/openshift/RedHatLoginPage.ts +49 -46
- package/pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts +43 -34
- package/pageobjects/openshift/OcpApplicationPage.ts +21 -19
- package/pageobjects/openshift/OcpImportFromGitPage.ts +68 -68
- package/pageobjects/openshift/OcpMainPage.ts +69 -69
- package/specs/MochaHooks.ts +59 -52
- package/specs/SmokeTest.spec.ts +47 -45
- package/specs/api/ContainerOverridesAPI.spec.ts +39 -26
- package/specs/api/DevfileAcceptanceTestAPI.spec.ts +110 -97
- package/specs/api/EmptyWorkspaceAPI.spec.ts +67 -58
- package/specs/api/PodOverridesAPI.spec.ts +48 -34
- package/specs/dashboard-samples/EmptyWorkspace.spec.ts +36 -36
- package/specs/dashboard-samples/Quarkus.spec.ts +41 -40
- package/specs/dashboard-samples/RecommendedExtensions.spec.ts +202 -183
- package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +85 -75
- package/specs/factory/Factory.spec.ts +184 -178
- package/specs/factory/NoSetupRepoFactory.spec.ts +233 -219
- package/specs/factory/RefusedOAuthFactory.spec.ts +223 -211
- package/specs/miscellaneous/PredefinedNamespace.spec.ts +70 -64
- package/tests-library/LoginTests.ts +34 -32
- package/tests-library/ProjectAndFileTests.ts +21 -18
- package/tests-library/WorkspaceHandlingTests.ts +98 -89
- package/tsconfig.json +15 -15
- package/utils/BrowserTabsUtil.ts +78 -74
- package/utils/CheReporter.ts +159 -157
- package/utils/DevWorkspaceConfigurationHelper.ts +63 -69
- package/utils/DevfilesRegistryHelper.ts +71 -57
- package/utils/DriverHelper.ts +728 -700
- package/utils/IContextParams.ts +26 -0
- package/utils/IKubernetesCommandLineToolsExecutor.ts +42 -0
- package/utils/KubernetesCommandLineToolsExecutor.ts +231 -183
- package/utils/Logger.ts +102 -125
- package/utils/ScreenCatcher.ts +57 -46
- package/utils/ShellExecutor.ts +23 -12
- package/utils/StringUtil.ts +49 -36
- package/utils/request-handlers/CheApiRequestHandler.ts +91 -88
- package/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.ts +32 -21
- package/utils/request-handlers/headers/IAuthorizationHeaderHandler.ts +3 -3
- package/utils/workspace/ApiUrlResolver.ts +31 -26
- package/utils/workspace/ITestWorkspaceUtil.ts +31 -31
- package/utils/workspace/TestWorkspaceUtil.ts +152 -145
- package/utils/workspace/WorkspaceStatus.ts +5 -5
- package/constants/APITestConstants.ts +0 -57
- package/constants/BaseTestConstants.ts +0 -68
- package/constants/ChromeDriverConstants.ts +0 -46
- package/constants/FactoryTestConstants.ts +0 -51
- package/constants/MonacoConstants.ts +0 -22
- package/constants/OAuthConstants.ts +0 -57
- package/constants/PluginsTestConstants.ts +0 -15
- package/constants/ReporterConstants.ts +0 -45
- package/constants/TimeoutConstants.ts +0 -113
- package/dist/constants/APITestConstants.js.map +0 -1
- package/dist/constants/BaseTestConstants.js.map +0 -1
- package/dist/constants/ChromeDriverConstants.js +0 -44
- package/dist/constants/ChromeDriverConstants.js.map +0 -1
- package/dist/constants/FactoryTestConstants.js.map +0 -1
- package/dist/constants/MonacoConstants.js.map +0 -1
- package/dist/constants/OAuthConstants.js.map +0 -1
- package/dist/constants/PluginsTestConstants.js.map +0 -1
- package/dist/constants/ReporterConstants.js.map +0 -1
- package/dist/constants/TimeoutConstants.js.map +0 -1
- package/tslint.json +0 -126
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -11,168 +15,203 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
11
15
|
}) : function(o, v) {
|
|
12
16
|
o["default"] = v;
|
|
13
17
|
});
|
|
18
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
19
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
20
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
21
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
22
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
23
|
+
};
|
|
14
24
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
25
|
if (mod && mod.__esModule) return mod;
|
|
16
26
|
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
27
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
28
|
__setModuleDefault(result, mod);
|
|
19
29
|
return result;
|
|
20
30
|
};
|
|
31
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
32
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
33
|
+
};
|
|
34
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
35
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
36
|
+
};
|
|
37
|
+
var KubernetesCommandLineToolsExecutor_1;
|
|
21
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.KubernetesCommandLineToolsExecutor = void 0;
|
|
39
|
+
exports.ContainerTerminal = exports.KubernetesCommandLineToolsExecutor = void 0;
|
|
40
|
+
/** *******************************************************************
|
|
41
|
+
* copyright (c) 2023 Red Hat, Inc.
|
|
42
|
+
*
|
|
43
|
+
* This program and the accompanying materials are made
|
|
44
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
45
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
46
|
+
*
|
|
47
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
48
|
+
**********************************************************************/
|
|
23
49
|
const shelljs_1 = require("shelljs");
|
|
24
50
|
const Logger_1 = require("./Logger");
|
|
25
51
|
const ShellExecutor_1 = require("./ShellExecutor");
|
|
26
52
|
const path = __importStar(require("path"));
|
|
27
|
-
const
|
|
28
|
-
const
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
this.
|
|
35
|
-
this.
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
|
|
53
|
+
const API_TEST_CONSTANTS_1 = require("../constants/API_TEST_CONSTANTS");
|
|
54
|
+
const BASE_TEST_CONSTANTS_1 = require("../constants/BASE_TEST_CONSTANTS");
|
|
55
|
+
const OAUTH_CONSTANTS_1 = require("../constants/OAUTH_CONSTANTS");
|
|
56
|
+
const inversify_1 = require("inversify");
|
|
57
|
+
const inversify_types_1 = require("../configs/inversify.types");
|
|
58
|
+
let KubernetesCommandLineToolsExecutor = KubernetesCommandLineToolsExecutor_1 = class KubernetesCommandLineToolsExecutor {
|
|
59
|
+
constructor(shellExecutor) {
|
|
60
|
+
this.shellExecutor = shellExecutor;
|
|
61
|
+
this.kubernetesCommandLineTool = API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL;
|
|
62
|
+
}
|
|
63
|
+
set namespace(value) {
|
|
64
|
+
this._namespace = value;
|
|
65
|
+
}
|
|
66
|
+
set workspaceName(value) {
|
|
67
|
+
this._workspaceName = value;
|
|
68
|
+
}
|
|
69
|
+
get workspaceName() {
|
|
70
|
+
return this._workspaceName;
|
|
71
|
+
}
|
|
72
|
+
get namespace() {
|
|
73
|
+
this._namespace =
|
|
74
|
+
this._namespace !== undefined
|
|
75
|
+
? this._namespace
|
|
76
|
+
: BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.includes('devspaces')
|
|
77
|
+
? OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME + '-devspaces'
|
|
78
|
+
: BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.includes('che')
|
|
79
|
+
? OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME + '-che'
|
|
80
|
+
: 'default';
|
|
81
|
+
return this._namespace;
|
|
42
82
|
}
|
|
43
83
|
// login to Openshift cluster with username and password
|
|
44
|
-
loginToOcp() {
|
|
45
|
-
if (this.
|
|
46
|
-
Logger_1.Logger.debug(`${this.
|
|
84
|
+
loginToOcp(user = OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME, password = OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_PASSWORD) {
|
|
85
|
+
if (this.kubernetesCommandLineTool === API_TEST_CONSTANTS_1.KubernetesCommandLineTool.OC) {
|
|
86
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool} - login to the "OC" client.`);
|
|
47
87
|
const url = this.getServerUrl();
|
|
48
|
-
if (this.isUserLoggedIn()) {
|
|
49
|
-
Logger_1.Logger.debug(`${this.
|
|
88
|
+
if (this.isUserLoggedIn(user)) {
|
|
89
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool} - user already logged`);
|
|
50
90
|
}
|
|
51
91
|
else {
|
|
52
|
-
Logger_1.Logger.debug(`${this.
|
|
53
|
-
shelljs_1.exec(`oc login --server=${url} -u=${
|
|
92
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool} - login ${url}, ${user}`);
|
|
93
|
+
(0, shelljs_1.exec)(`oc login --server=${url} -u=${user} -p=${password} --insecure-skip-tls-verify`);
|
|
54
94
|
}
|
|
55
95
|
}
|
|
56
96
|
else {
|
|
57
|
-
Logger_1.Logger.debug(`${this.
|
|
97
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool} - doesn't support login command`);
|
|
58
98
|
}
|
|
59
99
|
}
|
|
60
100
|
getContainerName() {
|
|
61
|
-
Logger_1.Logger.debug(`${this.
|
|
62
|
-
const output =
|
|
63
|
-
shelljs_1.echo('\n');
|
|
101
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool} - get container name.`);
|
|
102
|
+
const output = this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} get ${KubernetesCommandLineToolsExecutor_1.pod} -o jsonpath='{.spec.containers[*].name}' -n ${this.namespace}`);
|
|
103
|
+
(0, shelljs_1.echo)('\n');
|
|
64
104
|
return output.stderr ? output.stderr : output.stdout;
|
|
65
105
|
}
|
|
66
106
|
getWorkspacePodName() {
|
|
67
|
-
Logger_1.Logger.debug(`${this.
|
|
68
|
-
const output =
|
|
107
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool} - get workspace pod name.`);
|
|
108
|
+
const output = this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} get pod -l controller.devfile.io/devworkspace_name=${this.workspaceName} -n ${this.namespace} -o name`);
|
|
69
109
|
return output.stderr ? output.stderr : output.stdout.replace('\n', '');
|
|
70
110
|
}
|
|
71
111
|
deleteDevWorkspace() {
|
|
72
|
-
Logger_1.Logger.debug(`${this.
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
112
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool} - delete '${this.workspaceName}' workspace`);
|
|
113
|
+
this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
|
|
114
|
+
this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} delete dw ${this.workspaceName} -n ${this.namespace} || true`);
|
|
115
|
+
this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} delete dwt ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_EDITOR}-${this.workspaceName} -n ${this.namespace} || true`);
|
|
76
116
|
}
|
|
77
117
|
applyAndWaitDevWorkspace(yamlConfiguration) {
|
|
78
|
-
|
|
118
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool}`);
|
|
119
|
+
if (this.kubernetesCommandLineTool === API_TEST_CONSTANTS_1.KubernetesCommandLineTool.KUBECTL) {
|
|
79
120
|
this.createNamespace();
|
|
80
121
|
}
|
|
81
122
|
this.applyYamlConfigurationAsStringOutput(yamlConfiguration);
|
|
82
123
|
return this.waitDevWorkspace();
|
|
83
124
|
}
|
|
84
|
-
executeCommand(commandToExecute, container =
|
|
85
|
-
Logger_1.Logger.debug(`${this.
|
|
86
|
-
return
|
|
125
|
+
executeCommand(commandToExecute, container = KubernetesCommandLineToolsExecutor_1.container) {
|
|
126
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool}`);
|
|
127
|
+
return this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} exec -i ${KubernetesCommandLineToolsExecutor_1.pod} -n ${this.namespace} -c ${container} -- sh -c '${commandToExecute}'`);
|
|
87
128
|
}
|
|
88
129
|
applyYamlConfigurationAsStringOutput(yamlConfiguration) {
|
|
89
|
-
Logger_1.Logger.debug(`${this.
|
|
90
|
-
return
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
130
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool}`);
|
|
131
|
+
return this.shellExecutor.executeCommand(`cat <<EOF | ${this.kubernetesCommandLineTool} apply -n ${this.namespace} -f - \n` + yamlConfiguration + '\n' + 'EOF');
|
|
132
|
+
}
|
|
133
|
+
applyWithoutNamespace(yamlConfiguration) {
|
|
134
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool}`);
|
|
135
|
+
return this.shellExecutor.executeCommand(`cat <<EOF | ${this.kubernetesCommandLineTool} apply -f - \n` + yamlConfiguration + '\n' + 'EOF');
|
|
94
136
|
}
|
|
95
137
|
applyYamlConfigurationAsFile(pathToFile) {
|
|
96
|
-
Logger_1.Logger.debug(`${this.
|
|
97
|
-
|
|
138
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool}`);
|
|
139
|
+
this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} apply -n ${this.namespace} -f "${path.resolve(pathToFile)}"`);
|
|
98
140
|
}
|
|
99
141
|
getDevWorkspaceYamlConfiguration() {
|
|
100
|
-
Logger_1.Logger.debug(`${this.
|
|
101
|
-
return
|
|
142
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool}`);
|
|
143
|
+
return this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} get dw ${this.workspaceName} -n ${this.namespace} -o yaml`);
|
|
102
144
|
}
|
|
103
145
|
waitDevWorkspace(timeout = 360) {
|
|
104
|
-
Logger_1.Logger.debug(`${this.
|
|
105
|
-
const output =
|
|
146
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool} - wait till workspace ready.`);
|
|
147
|
+
const output = this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} wait -n ${this.namespace} --for=condition=Ready dw ${this.workspaceName} --timeout=${timeout}s`);
|
|
106
148
|
this.getPodAndContainerNames();
|
|
107
149
|
return output;
|
|
108
150
|
}
|
|
109
151
|
createNamespace() {
|
|
110
|
-
Logger_1.Logger.debug(`${this.
|
|
111
|
-
|
|
152
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool} - create namespace "${this.namespace}".`);
|
|
153
|
+
this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} create namespace ${this.namespace}`);
|
|
112
154
|
}
|
|
113
155
|
createProject(projectName) {
|
|
114
|
-
Logger_1.Logger.debug(`${this.
|
|
115
|
-
|
|
156
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool} - create new project "${projectName}".`);
|
|
157
|
+
this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} new-project ${projectName} -n ${this.namespace}`);
|
|
116
158
|
}
|
|
117
159
|
deleteProject(projectName) {
|
|
118
|
-
Logger_1.Logger.debug(`${this.
|
|
119
|
-
|
|
160
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool} - delete "${projectName}".`);
|
|
161
|
+
this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} delete project ${projectName} -n ${this.namespace}`);
|
|
120
162
|
}
|
|
121
163
|
getPodAndContainerNames() {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
: BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_BASE_URL.includes('devspaces')
|
|
134
|
-
? OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME + '-devspaces'
|
|
135
|
-
: BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_BASE_URL.includes('che')
|
|
136
|
-
? OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME + '-che'
|
|
137
|
-
: 'default';
|
|
138
|
-
return _namespace;
|
|
164
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool}`);
|
|
165
|
+
KubernetesCommandLineToolsExecutor_1.pod = this.getWorkspacePodName();
|
|
166
|
+
KubernetesCommandLineToolsExecutor_1.container = this.getContainerName();
|
|
167
|
+
}
|
|
168
|
+
/**
|
|
169
|
+
* @param userName
|
|
170
|
+
*/
|
|
171
|
+
isUserLoggedIn(userName) {
|
|
172
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool}`);
|
|
173
|
+
const whoamiCommandOutput = this.shellExecutor.executeCommand('oc whoami && oc whoami --show-server=true');
|
|
174
|
+
return whoamiCommandOutput.stdout.includes(userName) && whoamiCommandOutput.stdout.includes(this.getServerUrl());
|
|
139
175
|
}
|
|
140
176
|
getServerUrl() {
|
|
141
|
-
Logger_1.Logger.debug(`${this.
|
|
142
|
-
return
|
|
177
|
+
Logger_1.Logger.debug(`${this.kubernetesCommandLineTool} - get server api url.`);
|
|
178
|
+
return BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace('devspaces.apps', 'api') + ':6443';
|
|
143
179
|
}
|
|
144
|
-
}
|
|
180
|
+
};
|
|
181
|
+
KubernetesCommandLineToolsExecutor = KubernetesCommandLineToolsExecutor_1 = __decorate([
|
|
182
|
+
(0, inversify_1.injectable)(),
|
|
183
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.ShellExecutor)),
|
|
184
|
+
__metadata("design:paramtypes", [ShellExecutor_1.ShellExecutor])
|
|
185
|
+
], KubernetesCommandLineToolsExecutor);
|
|
145
186
|
exports.KubernetesCommandLineToolsExecutor = KubernetesCommandLineToolsExecutor;
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
pwd() {
|
|
155
|
-
return this.executeCommand('pwd');
|
|
156
|
-
}
|
|
157
|
-
cd(path) {
|
|
158
|
-
return this.executeCommand('cd ' + path);
|
|
159
|
-
}
|
|
160
|
-
gitClone(repository) {
|
|
161
|
-
return this.executeCommand('git clone ' + repository);
|
|
162
|
-
}
|
|
163
|
-
removeFolder(path) {
|
|
164
|
-
return this.executeCommand('rm -rf ' + path);
|
|
165
|
-
}
|
|
166
|
-
getEnvValue(envName) {
|
|
167
|
-
envName = envName.replace(/[${}]/g, '');
|
|
168
|
-
const output = this.executeCommand(`env | grep ${envName}`);
|
|
169
|
-
return output.stderr
|
|
170
|
-
? output.stderr
|
|
171
|
-
: output.stdout
|
|
172
|
-
.substring(output.stdout.lastIndexOf('=') + 1)
|
|
173
|
-
.replace('\n', '');
|
|
174
|
-
}
|
|
187
|
+
let ContainerTerminal = class ContainerTerminal extends KubernetesCommandLineToolsExecutor {
|
|
188
|
+
constructor(shellExecutor, cluster) {
|
|
189
|
+
super(shellExecutor);
|
|
190
|
+
this.shellExecutor = shellExecutor;
|
|
191
|
+
this.cluster = cluster;
|
|
192
|
+
}
|
|
193
|
+
ls(path = '') {
|
|
194
|
+
return this.shellExecutor.executeCommand('ls ' + path);
|
|
175
195
|
}
|
|
176
|
-
|
|
177
|
-
|
|
196
|
+
pwd() {
|
|
197
|
+
return this.shellExecutor.executeCommand('pwd');
|
|
198
|
+
}
|
|
199
|
+
cd(path) {
|
|
200
|
+
return this.shellExecutor.executeCommand('cd ' + path);
|
|
201
|
+
}
|
|
202
|
+
gitClone(repository) {
|
|
203
|
+
return this.shellExecutor.executeCommand('git clone ' + repository);
|
|
204
|
+
}
|
|
205
|
+
removeFolder(path) {
|
|
206
|
+
return this.shellExecutor.executeCommand('rm -rf ' + path);
|
|
207
|
+
}
|
|
208
|
+
};
|
|
209
|
+
ContainerTerminal = __decorate([
|
|
210
|
+
(0, inversify_1.injectable)(),
|
|
211
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.ShellExecutor)),
|
|
212
|
+
__param(1, (0, inversify_1.inject)(inversify_types_1.CLASSES.KubernetesCommandLineToolsExecutor)),
|
|
213
|
+
__metadata("design:paramtypes", [ShellExecutor_1.ShellExecutor,
|
|
214
|
+
KubernetesCommandLineToolsExecutor])
|
|
215
|
+
], ContainerTerminal);
|
|
216
|
+
exports.ContainerTerminal = ContainerTerminal;
|
|
178
217
|
//# sourceMappingURL=KubernetesCommandLineToolsExecutor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/Logger.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Logger = void 0;
|
|
4
|
-
|
|
5
|
-
*
|
|
4
|
+
/** *******************************************************************
|
|
5
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
6
6
|
*
|
|
7
7
|
* This program and the accompanying materials are made
|
|
8
8
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -10,10 +10,10 @@ exports.Logger = void 0;
|
|
|
10
10
|
*
|
|
11
11
|
* SPDX-License-Identifier: EPL-2.0
|
|
12
12
|
**********************************************************************/
|
|
13
|
-
const
|
|
13
|
+
const REPORTER_CONSTANTS_1 = require("../constants/REPORTER_CONSTANTS");
|
|
14
14
|
class Logger {
|
|
15
15
|
/**
|
|
16
|
-
*
|
|
16
|
+
* uses for logging of fatal errors.
|
|
17
17
|
* @param text log text
|
|
18
18
|
* @param indentLevel log level
|
|
19
19
|
*/
|
|
@@ -23,12 +23,12 @@ class Logger {
|
|
|
23
23
|
this.logText(indentLevel, logLevelSymbol, `${this.getFullMessage(callerInfo, text)}`);
|
|
24
24
|
}
|
|
25
25
|
/**
|
|
26
|
-
*
|
|
26
|
+
* uses for logging of recoverable errors and general warnings.
|
|
27
27
|
* @param text log text
|
|
28
28
|
* @param indentLevel log level
|
|
29
29
|
*/
|
|
30
30
|
static warn(text = '', indentLevel = 1) {
|
|
31
|
-
if (
|
|
31
|
+
if (REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'ERROR') {
|
|
32
32
|
return;
|
|
33
33
|
}
|
|
34
34
|
const callerInfo = this.getCallerInfo();
|
|
@@ -36,13 +36,12 @@ class Logger {
|
|
|
36
36
|
this.logText(indentLevel, logLevelSymbol, `${this.getFullMessage(callerInfo, text)}`);
|
|
37
37
|
}
|
|
38
38
|
/**
|
|
39
|
-
*
|
|
39
|
+
* uses for logging of the public methods of the pageobjects.
|
|
40
40
|
* @param text log text
|
|
41
41
|
* @param indentLevel log level
|
|
42
42
|
*/
|
|
43
43
|
static info(text = '', indentLevel = 3) {
|
|
44
|
-
if (
|
|
45
|
-
ReporterConstants_1.ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'WARN') {
|
|
44
|
+
if (REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'ERROR' || REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'WARN') {
|
|
46
45
|
return;
|
|
47
46
|
}
|
|
48
47
|
const callerInfo = this.getCallerInfo();
|
|
@@ -50,14 +49,14 @@ class Logger {
|
|
|
50
49
|
this.logText(indentLevel, logLevelSymbol, `${this.getFullMessage(callerInfo, text)}`);
|
|
51
50
|
}
|
|
52
51
|
/**
|
|
53
|
-
*
|
|
52
|
+
* uses for logging of the public methods of the pageobjects.
|
|
54
53
|
* @param text log text
|
|
55
54
|
* @param indentLevel log level
|
|
56
55
|
*/
|
|
57
56
|
static debug(text = '', indentLevel = 5) {
|
|
58
|
-
if (
|
|
59
|
-
|
|
60
|
-
|
|
57
|
+
if (REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'ERROR' ||
|
|
58
|
+
REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'WARN' ||
|
|
59
|
+
REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'INFO') {
|
|
61
60
|
return;
|
|
62
61
|
}
|
|
63
62
|
const callerInfo = this.getCallerInfo();
|
|
@@ -65,16 +64,16 @@ class Logger {
|
|
|
65
64
|
this.logText(indentLevel, logLevelSymbol, `${this.getFullMessage(callerInfo, text)}`);
|
|
66
65
|
}
|
|
67
66
|
/**
|
|
68
|
-
*
|
|
67
|
+
* uses for logging of the public methods of the {@link DriverHelper} or
|
|
69
68
|
* private methods inside of pageobjects.
|
|
70
69
|
* @param text log text
|
|
71
70
|
* @param indentLevel log level
|
|
72
71
|
*/
|
|
73
72
|
static trace(text = '', indentLevel = 6) {
|
|
74
|
-
if (
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
73
|
+
if (REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'ERROR' ||
|
|
74
|
+
REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'WARN' ||
|
|
75
|
+
REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'INFO' ||
|
|
76
|
+
REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'DEBUG') {
|
|
78
77
|
return;
|
|
79
78
|
}
|
|
80
79
|
const callerInfo = this.getCallerInfo();
|
|
@@ -106,7 +105,7 @@ class Logger {
|
|
|
106
105
|
return stack[3].includes('.<anonymous') ? '' : stack[3].replace(/^\s+at\s+(.+?)\s.+/g, '$1');
|
|
107
106
|
}
|
|
108
107
|
static separator(text, caller) {
|
|
109
|
-
return text ? caller ? ' - ' : '' : '';
|
|
108
|
+
return text ? (caller ? ' - ' : '') : '';
|
|
110
109
|
}
|
|
111
110
|
}
|
|
112
111
|
exports.Logger = Logger;
|
package/dist/utils/Logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../utils/Logger.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AACxE,
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../utils/Logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -20,7 +24,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
20
24
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
21
25
|
if (mod && mod.__esModule) return mod;
|
|
22
26
|
var result = {};
|
|
23
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
27
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
24
28
|
__setModuleDefault(result, mod);
|
|
25
29
|
return result;
|
|
26
30
|
};
|
|
@@ -32,8 +36,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
32
36
|
};
|
|
33
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
34
38
|
exports.ScreenCatcher = void 0;
|
|
35
|
-
|
|
36
|
-
*
|
|
39
|
+
/** *******************************************************************
|
|
40
|
+
* copyright (c) 2021-2023 Red Hat, Inc.
|
|
37
41
|
*
|
|
38
42
|
* This program and the accompanying materials are made
|
|
39
43
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -47,24 +51,30 @@ const inversify_types_1 = require("../configs/inversify.types");
|
|
|
47
51
|
const DriverHelper_1 = require("./DriverHelper");
|
|
48
52
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
49
53
|
const StringUtil_1 = require("./StringUtil");
|
|
50
|
-
const
|
|
54
|
+
const REPORTER_CONSTANTS_1 = require("../constants/REPORTER_CONSTANTS");
|
|
51
55
|
let ScreenCatcher = class ScreenCatcher {
|
|
52
56
|
constructor(driverHelper) {
|
|
53
57
|
this.driverHelper = driverHelper;
|
|
54
58
|
}
|
|
55
59
|
async catchMethodScreen(methodName, methodIndex, screenshotIndex) {
|
|
56
|
-
const executionScreenCastDir = `${
|
|
57
|
-
const executionScreenCastErrorsDir = `${
|
|
58
|
-
const formattedMethodIndex = new Intl.NumberFormat('en-us', {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
60
|
+
const executionScreenCastDir = `${REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_REPORT_FOLDER}/executionScreencast`;
|
|
61
|
+
const executionScreenCastErrorsDir = `${REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_REPORT_FOLDER}/executionScreencastErrors`;
|
|
62
|
+
const formattedMethodIndex = new Intl.NumberFormat('en-us', {
|
|
63
|
+
minimumIntegerDigits: 3
|
|
64
|
+
}).format(methodIndex);
|
|
65
|
+
const formattedScreenshotIndex = new Intl.NumberFormat('en-us', { minimumIntegerDigits: 5 })
|
|
66
|
+
.format(screenshotIndex)
|
|
67
|
+
.replace(/,/g, '');
|
|
68
|
+
if (!fs.existsSync(REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_REPORT_FOLDER)) {
|
|
69
|
+
fs.mkdirSync(REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_REPORT_FOLDER);
|
|
62
70
|
}
|
|
63
71
|
if (!fs.existsSync(executionScreenCastDir)) {
|
|
64
72
|
fs.mkdirSync(executionScreenCastDir);
|
|
65
73
|
}
|
|
66
74
|
const date = new Date();
|
|
67
|
-
const timeStr = date.toLocaleTimeString('en-us', { hour12: false }) +
|
|
75
|
+
const timeStr = date.toLocaleTimeString('en-us', { hour12: false }) +
|
|
76
|
+
'.' +
|
|
77
|
+
new Intl.NumberFormat('en-us', { minimumIntegerDigits: 3 }).format(date.getMilliseconds());
|
|
68
78
|
const screenshotPath = `${executionScreenCastDir}/${formattedMethodIndex}-${formattedScreenshotIndex}--(${StringUtil_1.StringUtil.sanitizeTitle(timeStr)})_${StringUtil_1.StringUtil.sanitizeTitle(methodName)}.png`;
|
|
69
79
|
try {
|
|
70
80
|
await this.catchScreen(screenshotPath);
|
|
@@ -76,7 +86,7 @@ let ScreenCatcher = class ScreenCatcher {
|
|
|
76
86
|
let errorLogFilePath = screenshotPath.replace('.png', '.txt');
|
|
77
87
|
errorLogFilePath = errorLogFilePath.replace(executionScreenCastDir, executionScreenCastErrorsDir);
|
|
78
88
|
if (err instanceof selenium_webdriver_1.error.IError) {
|
|
79
|
-
|
|
89
|
+
this.writeErrorLog(errorLogFilePath, err);
|
|
80
90
|
}
|
|
81
91
|
}
|
|
82
92
|
}
|
|
@@ -86,7 +96,7 @@ let ScreenCatcher = class ScreenCatcher {
|
|
|
86
96
|
screenshotStream.write(Buffer.from(screenshot, 'base64'));
|
|
87
97
|
screenshotStream.end();
|
|
88
98
|
}
|
|
89
|
-
|
|
99
|
+
writeErrorLog(errorLogPath, err) {
|
|
90
100
|
console.log(`Failed to save screenshot, additional information in the ${errorLogPath}`);
|
|
91
101
|
if (err.stack) {
|
|
92
102
|
const screenshotStream = fs.createWriteStream(errorLogPath);
|
|
@@ -96,8 +106,8 @@ let ScreenCatcher = class ScreenCatcher {
|
|
|
96
106
|
}
|
|
97
107
|
};
|
|
98
108
|
ScreenCatcher = __decorate([
|
|
99
|
-
inversify_1.injectable(),
|
|
100
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
109
|
+
(0, inversify_1.injectable)(),
|
|
110
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
101
111
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
102
112
|
], ScreenCatcher);
|
|
103
113
|
exports.ScreenCatcher = ScreenCatcher;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScreenCatcher.js","sourceRoot":"","sources":["../../utils/ScreenCatcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ScreenCatcher.js","sourceRoot":"","sources":["../../utils/ScreenCatcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,uCAAyB;AAEzB,yCAA+C;AAC/C,gEAAqD;AACrD,iDAA8C;AAC9C,2DAA2C;AAC3C,6CAA0C;AAC1C,wEAAqE;AAG9D,IAAM,aAAa,GAAnB,MAAM,aAAa;IACzB,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,iBAAiB,CAAC,UAAkB,EAAE,WAAmB,EAAE,eAAuB;QACvF,MAAM,sBAAsB,GAAW,GAAG,uCAAkB,CAAC,yBAAyB,sBAAsB,CAAC;QAC7G,MAAM,4BAA4B,GAAW,GAAG,uCAAkB,CAAC,yBAAyB,4BAA4B,CAAC;QACzH,MAAM,oBAAoB,GAAW,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;YACnE,oBAAoB,EAAE,CAAC;SACvB,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACvB,MAAM,wBAAwB,GAAW,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,oBAAoB,EAAE,CAAC,EAAE,CAAC;aAClG,MAAM,CAAC,eAAe,CAAC;aACvB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAEpB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,uCAAkB,CAAC,yBAAyB,CAAC,EAAE;YACjE,EAAE,CAAC,SAAS,CAAC,uCAAkB,CAAC,yBAAyB,CAAC,CAAC;SAC3D;QAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE;YAC3C,EAAE,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;SACrC;QAED,MAAM,IAAI,GAAS,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,OAAO,GACZ,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YACnD,GAAG;YACH,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,oBAAoB,EAAE,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;QAE5F,MAAM,cAAc,GAAW,GAAG,sBAAsB,IAAI,oBAAoB,IAAI,wBAAwB,MAAM,uBAAU,CAAC,aAAa,CACzI,OAAO,CACP,KAAK,uBAAU,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC;QAEjD,IAAI;YACH,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;SACvC;QAAC,OAAO,GAAG,EAAE;YACb,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,4BAA4B,CAAC,EAAE;gBACjD,EAAE,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;aAC3C;YAED,IAAI,gBAAgB,GAAW,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACtE,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CAAC,sBAAsB,EAAE,4BAA4B,CAAC,CAAC;YAClG,IAAI,GAAG,YAAY,0BAAK,CAAC,MAAM,EAAE;gBAChC,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;aAC1C;SACD;IACF,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,cAAsB;QACvC,MAAM,UAAU,GAAW,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,cAAc,EAAE,CAAC;QAChF,MAAM,gBAAgB,GAAgB,EAAE,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAC3E,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1D,gBAAgB,CAAC,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,aAAa,CAAC,YAAoB,EAAE,GAAiB;QACpD,OAAO,CAAC,GAAG,CAAC,4DAA4D,YAAY,EAAE,CAAC,CAAC;QAExF,IAAI,GAAG,CAAC,KAAK,EAAE;YACd,MAAM,gBAAgB,GAAgB,EAAE,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;YACzE,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;YACvD,gBAAgB,CAAC,GAAG,EAAE,CAAC;SACvB;IACF,CAAC;CACD,CAAA;AAjEY,aAAa;IADzB,IAAA,sBAAU,GAAE;IAGV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GAHhC,aAAa,CAiEzB;AAjEY,sCAAa"}
|