@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
|
@@ -14,8 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
var Dashboard_1;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.Dashboard = void 0;
|
|
17
|
-
|
|
18
|
-
*
|
|
17
|
+
/** *******************************************************************
|
|
18
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
19
19
|
*
|
|
20
20
|
* This program and the accompanying materials are made
|
|
21
21
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -28,10 +28,10 @@ require("reflect-metadata");
|
|
|
28
28
|
const inversify_types_1 = require("../../configs/inversify.types");
|
|
29
29
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
30
30
|
const DriverHelper_1 = require("../../utils/DriverHelper");
|
|
31
|
-
const
|
|
31
|
+
const TIMEOUT_CONSTANTS_1 = require("../../constants/TIMEOUT_CONSTANTS");
|
|
32
32
|
const Workspaces_1 = require("./Workspaces");
|
|
33
33
|
const Logger_1 = require("../../utils/Logger");
|
|
34
|
-
const
|
|
34
|
+
const BASE_TEST_CONSTANTS_1 = require("../../constants/BASE_TEST_CONSTANTS");
|
|
35
35
|
let Dashboard = Dashboard_1 = class Dashboard {
|
|
36
36
|
constructor(driverHelper, workspaces) {
|
|
37
37
|
this.driverHelper = driverHelper;
|
|
@@ -58,41 +58,40 @@ let Dashboard = Dashboard_1 = class Dashboard {
|
|
|
58
58
|
async stopAndRemoveWorkspaceByUI(workspaceName) {
|
|
59
59
|
Logger_1.Logger.debug(`"${workspaceName}"`);
|
|
60
60
|
await this.stopWorkspaceByUI(workspaceName);
|
|
61
|
-
await this.
|
|
62
|
-
await this.workspaces.waitWorkspaceListItemAbsence(workspaceName);
|
|
61
|
+
await this.deleteStoppedWorkspaceByUI(workspaceName);
|
|
63
62
|
}
|
|
64
63
|
async openDashboard() {
|
|
65
64
|
Logger_1.Logger.debug();
|
|
66
|
-
await this.driverHelper.
|
|
65
|
+
await this.driverHelper.navigateToUrl(BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL);
|
|
67
66
|
await this.waitPage();
|
|
68
67
|
}
|
|
69
|
-
async waitPage(timeout =
|
|
68
|
+
async waitPage(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT) {
|
|
70
69
|
Logger_1.Logger.debug();
|
|
71
70
|
await this.driverHelper.waitVisibility(Dashboard_1.WORKSPACES_BUTTON, timeout);
|
|
72
71
|
await this.driverHelper.waitVisibility(Dashboard_1.CREATE_WORKSPACE_BUTTON, timeout);
|
|
73
72
|
}
|
|
74
|
-
async clickWorkspacesButton(timeout =
|
|
73
|
+
async clickWorkspacesButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
75
74
|
Logger_1.Logger.debug();
|
|
76
75
|
await this.driverHelper.waitAndClick(Dashboard_1.WORKSPACES_BUTTON, timeout);
|
|
77
76
|
}
|
|
78
|
-
async clickCreateWorkspaceButton(timeout =
|
|
77
|
+
async clickCreateWorkspaceButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
79
78
|
Logger_1.Logger.debug();
|
|
80
79
|
await this.driverHelper.waitAndClick(Dashboard_1.CREATE_WORKSPACE_BUTTON, timeout);
|
|
81
80
|
}
|
|
82
|
-
async getLoaderAlert(timeout =
|
|
81
|
+
async getLoaderAlert(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_WAIT_LOADER_PRESENCE_TIMEOUT) {
|
|
83
82
|
Logger_1.Logger.debug();
|
|
84
83
|
return await this.driverHelper.waitAndGetText(Dashboard_1.LOADER_ALERT, timeout);
|
|
85
84
|
}
|
|
86
|
-
async waitLoader(timeout =
|
|
85
|
+
async waitLoader(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_WAIT_LOADER_PRESENCE_TIMEOUT) {
|
|
87
86
|
Logger_1.Logger.debug();
|
|
88
87
|
await this.driverHelper.waitAllPresence(Dashboard_1.LOADER_PAGE_STEP_TITLES, timeout);
|
|
89
88
|
}
|
|
90
|
-
async waitStartingPageLoaderDisappearance(timeout =
|
|
89
|
+
async waitStartingPageLoaderDisappearance(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
91
90
|
Logger_1.Logger.debug();
|
|
92
91
|
await this.driverHelper.waitDisappearance(Dashboard_1.STARTING_PAGE_LOADER, timeout);
|
|
93
|
-
await this.driverHelper.wait(
|
|
92
|
+
await this.driverHelper.wait(TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
|
|
94
93
|
}
|
|
95
|
-
async logout(timeout =
|
|
94
|
+
async logout(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
96
95
|
Logger_1.Logger.debug();
|
|
97
96
|
await this.openDashboard();
|
|
98
97
|
await this.driverHelper.waitAndClick(Dashboard_1.USER_SETTINGS_DROPDOWN, timeout);
|
|
@@ -100,17 +99,17 @@ let Dashboard = Dashboard_1 = class Dashboard {
|
|
|
100
99
|
await this.driverHelper.waitDisappearance(Dashboard_1.USER_SETTINGS_DROPDOWN, timeout);
|
|
101
100
|
}
|
|
102
101
|
};
|
|
103
|
-
Dashboard.WORKSPACES_BUTTON = selenium_webdriver_1.By.xpath(
|
|
104
|
-
Dashboard.CREATE_WORKSPACE_BUTTON = selenium_webdriver_1.By.xpath(
|
|
102
|
+
Dashboard.WORKSPACES_BUTTON = selenium_webdriver_1.By.xpath('//div[@id="page-sidebar"]//a[contains(text(), "Workspaces (")]');
|
|
103
|
+
Dashboard.CREATE_WORKSPACE_BUTTON = selenium_webdriver_1.By.xpath('//div[@id="page-sidebar"]//a[text()="Create Workspace"]');
|
|
105
104
|
Dashboard.LOADER_PAGE_STEP_TITLES = selenium_webdriver_1.By.xpath('//*[@data-testid="step-title"]');
|
|
106
105
|
Dashboard.STARTING_PAGE_LOADER = selenium_webdriver_1.By.css('.main-page-loader');
|
|
107
106
|
Dashboard.LOADER_ALERT = selenium_webdriver_1.By.xpath('//*[@data-testid="loader-alert"]');
|
|
108
107
|
Dashboard.LOGOUT_BUTTON = selenium_webdriver_1.By.xpath('//button[text()="Logout"]');
|
|
109
|
-
Dashboard.USER_SETTINGS_DROPDOWN = selenium_webdriver_1.By.xpath('//header//button/span[text()
|
|
108
|
+
Dashboard.USER_SETTINGS_DROPDOWN = selenium_webdriver_1.By.xpath('//header//button/span[text()!=""]//parent::button');
|
|
110
109
|
Dashboard = Dashboard_1 = __decorate([
|
|
111
|
-
inversify_1.injectable(),
|
|
112
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
113
|
-
__param(1, inversify_1.inject(inversify_types_1.CLASSES.Workspaces)),
|
|
110
|
+
(0, inversify_1.injectable)(),
|
|
111
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
112
|
+
__param(1, (0, inversify_1.inject)(inversify_types_1.CLASSES.Workspaces)),
|
|
114
113
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper,
|
|
115
114
|
Workspaces_1.Workspaces])
|
|
116
115
|
], Dashboard);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Dashboard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,4BAA0B;AAC1B,mEAAwD;AACxD,2DAAwC;AACxC,2DAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Dashboard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
*
|
|
2
|
+
/** *******************************************************************
|
|
3
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
4
4
|
*
|
|
5
5
|
* This program and the accompanying materials are made
|
|
6
6
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -28,7 +28,7 @@ const DriverHelper_1 = require("../../utils/DriverHelper");
|
|
|
28
28
|
const inversify_types_1 = require("../../configs/inversify.types");
|
|
29
29
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
30
30
|
const Logger_1 = require("../../utils/Logger");
|
|
31
|
-
const
|
|
31
|
+
const TIMEOUT_CONSTANTS_1 = require("../../constants/TIMEOUT_CONSTANTS");
|
|
32
32
|
var WorkspaceStatusUI;
|
|
33
33
|
(function (WorkspaceStatusUI) {
|
|
34
34
|
WorkspaceStatusUI["Running"] = "green";
|
|
@@ -38,47 +38,43 @@ let Workspaces = Workspaces_1 = class Workspaces {
|
|
|
38
38
|
constructor(driverHelper) {
|
|
39
39
|
this.driverHelper = driverHelper;
|
|
40
40
|
}
|
|
41
|
-
async waitPage(timeout =
|
|
41
|
+
async waitPage(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT) {
|
|
42
42
|
Logger_1.Logger.debug();
|
|
43
|
-
await this.driverHelper.waitVisibility(
|
|
43
|
+
await this.driverHelper.waitVisibility(Workspaces_1.ADD_WORKSPACE_BUTTON, timeout);
|
|
44
44
|
}
|
|
45
|
-
async clickAddWorkspaceButton(timeout =
|
|
45
|
+
async clickAddWorkspaceButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
46
46
|
Logger_1.Logger.debug();
|
|
47
|
-
await this.driverHelper.waitAndClick(
|
|
47
|
+
await this.driverHelper.waitAndClick(Workspaces_1.ADD_WORKSPACE_BUTTON, timeout);
|
|
48
48
|
}
|
|
49
|
-
async clickOpenButton(workspaceName, timeout =
|
|
49
|
+
async clickOpenButton(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT) {
|
|
50
50
|
Logger_1.Logger.debug();
|
|
51
51
|
await this.driverHelper.waitAndClick(this.getOpenButtonLocator(workspaceName), timeout);
|
|
52
52
|
}
|
|
53
|
-
async waitWorkspaceListItem(workspaceName, timeout =
|
|
53
|
+
async waitWorkspaceListItem(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
54
54
|
Logger_1.Logger.debug(`"${workspaceName}"`);
|
|
55
|
-
|
|
56
|
-
await this.driverHelper.waitVisibility(workspaceListItemLocator, timeout);
|
|
55
|
+
await this.driverHelper.waitVisibility(this.getWorkspaceListItemLocator(workspaceName), timeout);
|
|
57
56
|
}
|
|
58
|
-
async waitWorkspaceWithRunningStatus(workspaceName, timeout =
|
|
57
|
+
async waitWorkspaceWithRunningStatus(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
59
58
|
Logger_1.Logger.debug(`"${workspaceName}"`);
|
|
60
|
-
|
|
61
|
-
await this.driverHelper.waitVisibility(runningStatusLocator, timeout);
|
|
59
|
+
await this.driverHelper.waitVisibility(this.getWorkspaceStatusLocator(workspaceName, WorkspaceStatusUI.Running), timeout);
|
|
62
60
|
}
|
|
63
|
-
async waitWorkspaceWithStoppedStatus(workspaceName, timeout =
|
|
61
|
+
async waitWorkspaceWithStoppedStatus(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
64
62
|
Logger_1.Logger.debug(`"${workspaceName}"`);
|
|
65
|
-
|
|
66
|
-
await this.driverHelper.waitVisibility(stoppedStatusLocator, timeout);
|
|
63
|
+
await this.driverHelper.waitVisibility(this.getWorkspaceStatusLocator(workspaceName, WorkspaceStatusUI.Stopped), timeout);
|
|
67
64
|
}
|
|
68
|
-
async clickWorkspaceListItem(workspaceName, timeout =
|
|
65
|
+
async clickWorkspaceListItem(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
69
66
|
Logger_1.Logger.debug(`"${workspaceName}"`);
|
|
70
|
-
|
|
71
|
-
await this.driverHelper.waitAndClick(workspaceListItemLocator, timeout);
|
|
67
|
+
await this.driverHelper.waitAndClick(this.getWorkspaceListItemLocator(workspaceName), timeout);
|
|
72
68
|
}
|
|
73
69
|
async clickActionsButton(workspaceName) {
|
|
74
70
|
Logger_1.Logger.debug(`of the '${workspaceName}' list item`);
|
|
75
71
|
await this.driverHelper.waitAndClick(this.getActionsLocator(workspaceName));
|
|
76
72
|
}
|
|
77
|
-
async waitActionsPopup(workspaceName, timeout =
|
|
73
|
+
async waitActionsPopup(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
78
74
|
Logger_1.Logger.debug(`of the '${workspaceName}' list item`);
|
|
79
75
|
await this.driverHelper.waitVisibility(this.getExpandedActionsLocator(workspaceName), timeout);
|
|
80
76
|
}
|
|
81
|
-
async openActionsPopup(workspaceName, timeout =
|
|
77
|
+
async openActionsPopup(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
82
78
|
Logger_1.Logger.debug(`for the '${workspaceName}' list item`);
|
|
83
79
|
await this.clickActionsButton(workspaceName);
|
|
84
80
|
await this.waitActionsPopup(workspaceName, timeout);
|
|
@@ -99,23 +95,20 @@ let Workspaces = Workspaces_1 = class Workspaces {
|
|
|
99
95
|
await this.driverHelper.waitAndClick(this.getActionsPopupButtonLocator(workspaceName, 'Stop Workspace'));
|
|
100
96
|
}
|
|
101
97
|
}
|
|
102
|
-
async waitDeleteWorkspaceConfirmationWindow(timeout =
|
|
98
|
+
async waitDeleteWorkspaceConfirmationWindow(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
103
99
|
Logger_1.Logger.debug();
|
|
104
|
-
|
|
105
|
-
await this.driverHelper.waitVisibility(confirmationWindowLocator, timeout);
|
|
100
|
+
await this.driverHelper.waitVisibility(Workspaces_1.CONFIRMATION_WINDOW, timeout);
|
|
106
101
|
}
|
|
107
|
-
async clickToDeleteConfirmationCheckbox(timeout =
|
|
108
|
-
Logger_1.Logger.debug(
|
|
109
|
-
|
|
110
|
-
await this.driverHelper.waitAndClick(deleteConfirmationCheckboxLocator, timeout);
|
|
102
|
+
async clickToDeleteConfirmationCheckbox(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
103
|
+
Logger_1.Logger.debug();
|
|
104
|
+
await this.driverHelper.waitAndClick(Workspaces_1.DELETE_CONFIRMATION_CHECKBOX, timeout);
|
|
111
105
|
}
|
|
112
|
-
async waitAndClickEnabledConfirmationWindowDeleteButton(timeout =
|
|
113
|
-
Logger_1.Logger.debug(
|
|
114
|
-
|
|
115
|
-
await this.driverHelper.waitAndClick(enabledConfirmationWindowDeleteButton, timeout);
|
|
106
|
+
async waitAndClickEnabledConfirmationWindowDeleteButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
107
|
+
Logger_1.Logger.debug();
|
|
108
|
+
await this.driverHelper.waitAndClick(Workspaces_1.DELETE_WORKSPACE_BUTTON_ENABLED, timeout);
|
|
116
109
|
}
|
|
117
|
-
async deleteWorkspaceByActionsButton(workspaceName, timeout =
|
|
118
|
-
Logger_1.Logger.debug(
|
|
110
|
+
async deleteWorkspaceByActionsButton(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
111
|
+
Logger_1.Logger.debug();
|
|
119
112
|
await this.waitWorkspaceListItem(workspaceName, timeout);
|
|
120
113
|
await this.openActionsPopup(workspaceName, timeout);
|
|
121
114
|
await this.clickActionsDeleteButton(workspaceName);
|
|
@@ -123,60 +116,62 @@ let Workspaces = Workspaces_1 = class Workspaces {
|
|
|
123
116
|
await this.clickToDeleteConfirmationCheckbox(timeout);
|
|
124
117
|
await this.waitAndClickEnabledConfirmationWindowDeleteButton(timeout);
|
|
125
118
|
}
|
|
126
|
-
async stopWorkspaceByActionsButton(workspaceName, timeout =
|
|
127
|
-
Logger_1.Logger.debug(
|
|
119
|
+
async stopWorkspaceByActionsButton(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
120
|
+
Logger_1.Logger.debug();
|
|
128
121
|
await this.waitWorkspaceListItem(workspaceName, timeout);
|
|
129
122
|
await this.openActionsPopup(workspaceName, timeout);
|
|
130
123
|
await this.clickActionsStopWorkspaceButton(workspaceName);
|
|
131
124
|
}
|
|
132
|
-
async waitWorkspaceListItemAbsence(workspaceName, timeout =
|
|
133
|
-
Logger_1.Logger.debug(`
|
|
134
|
-
const polling =
|
|
125
|
+
async waitWorkspaceListItemAbsence(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DASHBOARD_WORKSPACE_STOP_TIMEOUT) {
|
|
126
|
+
Logger_1.Logger.debug(`"${workspaceName}"`);
|
|
127
|
+
const polling = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING;
|
|
135
128
|
const attempts = Math.ceil(timeout / polling);
|
|
136
|
-
|
|
137
|
-
await this.driverHelper.waitDisappearance(workspaceListItemLocator, attempts, polling);
|
|
129
|
+
await this.driverHelper.waitDisappearance(this.getWorkspaceListItemLocator(workspaceName), attempts, polling);
|
|
138
130
|
}
|
|
139
|
-
async getAllCreatedWorkspacesNames(timeout =
|
|
140
|
-
Logger_1.Logger.debug(
|
|
131
|
+
async getAllCreatedWorkspacesNames(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
132
|
+
Logger_1.Logger.debug();
|
|
141
133
|
const workspaceNames = [];
|
|
142
134
|
try {
|
|
143
|
-
const workspaceItems = await this.driverHelper.waitAllPresence(
|
|
144
|
-
for (
|
|
145
|
-
Logger_1.Logger.debug(`
|
|
135
|
+
const workspaceItems = await this.driverHelper.waitAllPresence(Workspaces_1.WORKSPACE_ITEM_TABLE_NAME_SECTION, timeout);
|
|
136
|
+
for (const item of workspaceItems) {
|
|
137
|
+
Logger_1.Logger.debug(`try to get ${workspaceItems.indexOf(item)} items name`);
|
|
146
138
|
workspaceNames.push(await item.getText());
|
|
147
|
-
Logger_1.Logger.debug(`
|
|
139
|
+
Logger_1.Logger.debug(`workspace name is "${workspaceNames[workspaceNames.length - 1]}"`);
|
|
148
140
|
}
|
|
149
141
|
}
|
|
150
142
|
catch (e) {
|
|
151
|
-
Logger_1.Logger.debug(
|
|
143
|
+
Logger_1.Logger.debug(`${e}`);
|
|
152
144
|
}
|
|
153
|
-
Logger_1.Logger.debug(
|
|
145
|
+
Logger_1.Logger.debug(`${workspaceNames.length} workspaces have been created in DevSpaces`);
|
|
154
146
|
return workspaceNames;
|
|
155
147
|
}
|
|
156
148
|
getWorkspaceListItemLocator(workspaceName) {
|
|
157
|
-
return `//tr[td
|
|
149
|
+
return selenium_webdriver_1.By.xpath(`//tr[td//a[text()='${workspaceName}']]`);
|
|
158
150
|
}
|
|
159
151
|
getWorkspaceStatusLocator(workspaceName, workspaceStatus) {
|
|
160
|
-
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//span[@data-testid='workspace-status-indicator']//*[local-name()='svg' and @fill='${workspaceStatus}']`);
|
|
152
|
+
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName).value}//span[@data-testid='workspace-status-indicator']//*[local-name()='svg' and @fill='${workspaceStatus}']`);
|
|
161
153
|
}
|
|
162
154
|
getActionsLocator(workspaceName) {
|
|
163
|
-
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}/td/div/button[@aria-label='Actions']`);
|
|
155
|
+
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName).value}/td/div/button[@aria-label='Actions']`);
|
|
164
156
|
}
|
|
165
157
|
getExpandedActionsLocator(workspaceName) {
|
|
166
|
-
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//button[@aria-label='Actions' and @aria-expanded='true']`);
|
|
158
|
+
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName).value}//button[@aria-label='Actions' and @aria-expanded='true']`);
|
|
167
159
|
}
|
|
168
160
|
getActionsPopupButtonLocator(workspaceName, buttonText) {
|
|
169
|
-
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//li
|
|
161
|
+
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName).value}//li//button[text()='${buttonText}']`);
|
|
170
162
|
}
|
|
171
163
|
getOpenButtonLocator(workspaceName) {
|
|
172
|
-
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//td[@data-key=5]//a[text()='Open']`);
|
|
164
|
+
return selenium_webdriver_1.By.xpath(`${this.getWorkspaceListItemLocator(workspaceName).value}//td[@data-key=5]//a[text()='Open']`);
|
|
173
165
|
}
|
|
174
166
|
};
|
|
175
|
-
Workspaces.
|
|
176
|
-
Workspaces.
|
|
167
|
+
Workspaces.ADD_WORKSPACE_BUTTON = selenium_webdriver_1.By.xpath('//button[text()="Add Workspace"]');
|
|
168
|
+
Workspaces.WORKSPACE_ITEM_TABLE_NAME_SECTION = selenium_webdriver_1.By.xpath('//td[@data-label="Name"]/span/a');
|
|
169
|
+
Workspaces.DELETE_WORKSPACE_BUTTON_ENABLED = selenium_webdriver_1.By.xpath('//button[@data-testid="delete-workspace-button" and not(@disabled)]');
|
|
170
|
+
Workspaces.DELETE_CONFIRMATION_CHECKBOX = selenium_webdriver_1.By.xpath('//input[@data-testid="confirmation-checkbox"]');
|
|
171
|
+
Workspaces.CONFIRMATION_WINDOW = selenium_webdriver_1.By.xpath('//div[@aria-label="Delete workspaces confirmation window"]');
|
|
177
172
|
Workspaces = Workspaces_1 = __decorate([
|
|
178
|
-
inversify_1.injectable(),
|
|
179
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
173
|
+
(0, inversify_1.injectable)(),
|
|
174
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
180
175
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
181
176
|
], Workspaces);
|
|
182
177
|
exports.Workspaces = Workspaces;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Workspaces.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Workspaces.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;AAExE,yCAA+C;AAC/C,2DAAwD;AACxD,mEAAwD;AACxD,2DAAoD;AACpD,+CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"Workspaces.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Workspaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,8 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
var WorkspaceDetails_1;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.WorkspaceDetails = void 0;
|
|
17
|
-
|
|
18
|
-
*
|
|
17
|
+
/** *******************************************************************
|
|
18
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
19
19
|
*
|
|
20
20
|
* This program and the accompanying materials are made
|
|
21
21
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -30,7 +30,7 @@ require("reflect-metadata");
|
|
|
30
30
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
31
31
|
const WorkspaceStatus_1 = require("../../../utils/workspace/WorkspaceStatus");
|
|
32
32
|
const Logger_1 = require("../../../utils/Logger");
|
|
33
|
-
const
|
|
33
|
+
const TIMEOUT_CONSTANTS_1 = require("../../../constants/TIMEOUT_CONSTANTS");
|
|
34
34
|
const ProjectAndFileTests_1 = require("../../../tests-library/ProjectAndFileTests");
|
|
35
35
|
let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
36
36
|
constructor(driverHelper, testWorkspaceUtil, testProjectAndFileCheCode) {
|
|
@@ -38,9 +38,9 @@ let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
|
38
38
|
this.testWorkspaceUtil = testWorkspaceUtil;
|
|
39
39
|
this.testProjectAndFileCheCode = testProjectAndFileCheCode;
|
|
40
40
|
}
|
|
41
|
-
async waitLoaderDisappearance(attempts =
|
|
41
|
+
async waitLoaderDisappearance(attempts = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_ATTEMPTS, polling = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING) {
|
|
42
42
|
Logger_1.Logger.debug();
|
|
43
|
-
await this.driverHelper.waitDisappearance(
|
|
43
|
+
await this.driverHelper.waitDisappearance(WorkspaceDetails_1.WORKSPACE_DETAILS_LOADER, attempts, polling);
|
|
44
44
|
}
|
|
45
45
|
async saveChanges() {
|
|
46
46
|
Logger_1.Logger.debug();
|
|
@@ -48,7 +48,7 @@ let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
|
48
48
|
await this.clickOnSaveButton();
|
|
49
49
|
await this.waitSaveButtonDisappearance();
|
|
50
50
|
}
|
|
51
|
-
async waitPage(workspaceName, timeout =
|
|
51
|
+
async waitPage(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT) {
|
|
52
52
|
Logger_1.Logger.debug(`workspace: "${workspaceName}"`);
|
|
53
53
|
await this.waitWorkspaceTitle(workspaceName, timeout);
|
|
54
54
|
await this.waitOpenButton(timeout);
|
|
@@ -56,83 +56,93 @@ let WorkspaceDetails = WorkspaceDetails_1 = class WorkspaceDetails {
|
|
|
56
56
|
await this.waitTabsPresence(timeout);
|
|
57
57
|
await this.waitLoaderDisappearance(timeout);
|
|
58
58
|
}
|
|
59
|
-
async waitWorkspaceTitle(workspaceName, timeout =
|
|
59
|
+
async waitWorkspaceTitle(workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
60
60
|
Logger_1.Logger.debug(`title: "${workspaceName}"`);
|
|
61
|
-
const workspaceTitleLocator =
|
|
61
|
+
const workspaceTitleLocator = this.getWorkspaceTitleLocator(workspaceName);
|
|
62
62
|
await this.driverHelper.waitVisibility(workspaceTitleLocator, timeout);
|
|
63
63
|
}
|
|
64
|
-
async waitRunButton(timeout =
|
|
64
|
+
async waitRunButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
65
65
|
Logger_1.Logger.debug();
|
|
66
|
-
await this.driverHelper.waitVisibility(
|
|
66
|
+
await this.driverHelper.waitVisibility(WorkspaceDetails_1.RUN_BUTTON, timeout);
|
|
67
67
|
}
|
|
68
|
-
async clickOnRunButton(timeout =
|
|
68
|
+
async clickOnRunButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
69
69
|
Logger_1.Logger.debug();
|
|
70
|
-
await this.driverHelper.waitAndClick(
|
|
70
|
+
await this.driverHelper.waitAndClick(WorkspaceDetails_1.RUN_BUTTON, timeout);
|
|
71
71
|
}
|
|
72
|
-
async waitOpenButton(timeout =
|
|
72
|
+
async waitOpenButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
73
73
|
Logger_1.Logger.debug();
|
|
74
|
-
await this.driverHelper.waitVisibility(
|
|
74
|
+
await this.driverHelper.waitVisibility(WorkspaceDetails_1.OPEN_BUTTON, timeout);
|
|
75
75
|
}
|
|
76
|
-
async openWorkspace(namespace, workspaceName, timeout =
|
|
76
|
+
async openWorkspace(namespace, workspaceName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT) {
|
|
77
77
|
Logger_1.Logger.debug(`"${namespace}/${workspaceName}"`);
|
|
78
78
|
await this.clickOnOpenButton(timeout);
|
|
79
79
|
await this.testProjectAndFileCheCode.waitWorkspaceReadinessForCheCodeEditor();
|
|
80
|
-
|
|
80
|
+
this.testWorkspaceUtil.waitWorkspaceStatus(namespace, workspaceName, WorkspaceStatus_1.WorkspaceStatus.STARTING);
|
|
81
81
|
}
|
|
82
|
-
async waitTabsPresence(timeout =
|
|
82
|
+
async waitTabsPresence(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
83
83
|
Logger_1.Logger.debug('WorkspaceDetails.waitTabsPresence');
|
|
84
|
-
const workspaceDetailsTabs = [
|
|
85
|
-
'
|
|
84
|
+
const workspaceDetailsTabs = [
|
|
85
|
+
'Overview',
|
|
86
|
+
'Projects',
|
|
87
|
+
'Containers',
|
|
88
|
+
'Servers',
|
|
89
|
+
'Env Variables',
|
|
90
|
+
'Volumes',
|
|
91
|
+
'Config',
|
|
92
|
+
'SSH',
|
|
93
|
+
'Plugins',
|
|
94
|
+
'Editors'
|
|
95
|
+
];
|
|
86
96
|
for (const tabTitle of workspaceDetailsTabs) {
|
|
87
|
-
const workspaceDetailsTabLocator =
|
|
97
|
+
const workspaceDetailsTabLocator = this.getTabLocator(tabTitle);
|
|
88
98
|
await this.driverHelper.waitVisibility(workspaceDetailsTabLocator, timeout);
|
|
89
99
|
}
|
|
90
100
|
}
|
|
91
|
-
async selectTab(tabTitle, timeout =
|
|
101
|
+
async selectTab(tabTitle, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
92
102
|
Logger_1.Logger.debug(`WorkspaceDetails.selectTab ${tabTitle}`);
|
|
93
103
|
await this.clickOnTab(tabTitle, timeout);
|
|
94
104
|
await this.waitTabSelected(tabTitle, timeout);
|
|
95
105
|
}
|
|
96
|
-
|
|
97
|
-
return `che-row-toolbar[che-title='${workspaceName}']
|
|
106
|
+
getWorkspaceTitleLocator(workspaceName) {
|
|
107
|
+
return selenium_webdriver_1.By.css(`che-row-toolbar[che-title='${workspaceName}']`);
|
|
98
108
|
}
|
|
99
|
-
|
|
100
|
-
return `//md-tabs-canvas//md-tab-item//span[text()='${tabTitle}']
|
|
109
|
+
getTabLocator(tabTitle) {
|
|
110
|
+
return selenium_webdriver_1.By.xpath(`//md-tabs-canvas//md-tab-item//span[text()='${tabTitle}']`);
|
|
101
111
|
}
|
|
102
|
-
|
|
103
|
-
return `//md-tabs-canvas[@role='tablist']//md-tab-item[@aria-selected='true']//span[text()='${tabTitle}']
|
|
112
|
+
getSelectedTabLocator(tabTitle) {
|
|
113
|
+
return selenium_webdriver_1.By.xpath(`//md-tabs-canvas[@role='tablist']//md-tab-item[@aria-selected='true']//span[text()='${tabTitle}']`);
|
|
104
114
|
}
|
|
105
|
-
async waitSaveButton(timeout =
|
|
106
|
-
await this.driverHelper.waitVisibility(
|
|
115
|
+
async waitSaveButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
116
|
+
await this.driverHelper.waitVisibility(WorkspaceDetails_1.ENABLED_SAVE_BUTTON, timeout);
|
|
107
117
|
}
|
|
108
|
-
async waitSaveButtonDisappearance(attempts =
|
|
109
|
-
await this.driverHelper.waitDisappearance(
|
|
118
|
+
async waitSaveButtonDisappearance(attempts = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_ATTEMPTS, polling = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING) {
|
|
119
|
+
await this.driverHelper.waitDisappearance(WorkspaceDetails_1.SAVE_BUTTON, attempts, polling);
|
|
110
120
|
}
|
|
111
|
-
async clickOnSaveButton(timeout =
|
|
112
|
-
await this.driverHelper.waitAndClick(
|
|
121
|
+
async clickOnSaveButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
122
|
+
await this.driverHelper.waitAndClick(WorkspaceDetails_1.ENABLED_SAVE_BUTTON, timeout);
|
|
113
123
|
}
|
|
114
|
-
async clickOnOpenButton(timeout =
|
|
115
|
-
await this.driverHelper.waitAndClick(
|
|
124
|
+
async clickOnOpenButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
125
|
+
await this.driverHelper.waitAndClick(WorkspaceDetails_1.OPEN_BUTTON, timeout);
|
|
116
126
|
}
|
|
117
|
-
async clickOnTab(tabTitle, timeout =
|
|
118
|
-
const workspaceDetailsTabLocator =
|
|
127
|
+
async clickOnTab(tabTitle, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
128
|
+
const workspaceDetailsTabLocator = this.getTabLocator(tabTitle);
|
|
119
129
|
await this.driverHelper.waitAndClick(workspaceDetailsTabLocator, timeout);
|
|
120
130
|
}
|
|
121
|
-
async waitTabSelected(tabTitle, timeout =
|
|
122
|
-
const selectedTabLocator =
|
|
131
|
+
async waitTabSelected(tabTitle, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
132
|
+
const selectedTabLocator = this.getSelectedTabLocator(tabTitle);
|
|
123
133
|
await this.driverHelper.waitVisibility(selectedTabLocator, timeout);
|
|
124
134
|
}
|
|
125
135
|
};
|
|
126
|
-
WorkspaceDetails.
|
|
127
|
-
WorkspaceDetails.
|
|
128
|
-
WorkspaceDetails.
|
|
129
|
-
WorkspaceDetails.
|
|
130
|
-
WorkspaceDetails.
|
|
136
|
+
WorkspaceDetails.RUN_BUTTON = selenium_webdriver_1.By.css('#run-workspace-button[che-button-title="Run"]');
|
|
137
|
+
WorkspaceDetails.OPEN_BUTTON = selenium_webdriver_1.By.css('#open-in-ide-button[che-button-title="Open"]');
|
|
138
|
+
WorkspaceDetails.SAVE_BUTTON = selenium_webdriver_1.By.css('button[name="save-button"]');
|
|
139
|
+
WorkspaceDetails.ENABLED_SAVE_BUTTON = selenium_webdriver_1.By.css('button[name="save-button"][aria-disabled="false"]');
|
|
140
|
+
WorkspaceDetails.WORKSPACE_DETAILS_LOADER = selenium_webdriver_1.By.css('workspace-details-overview md-progress-linear');
|
|
131
141
|
WorkspaceDetails = WorkspaceDetails_1 = __decorate([
|
|
132
|
-
inversify_1.injectable(),
|
|
133
|
-
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
134
|
-
__param(1, inversify_1.inject(inversify_types_1.TYPES.WorkspaceUtil)),
|
|
135
|
-
__param(2, inversify_1.inject(inversify_types_1.CLASSES.ProjectAndFileTests)),
|
|
142
|
+
(0, inversify_1.injectable)(),
|
|
143
|
+
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
144
|
+
__param(1, (0, inversify_1.inject)(inversify_types_1.TYPES.WorkspaceUtil)),
|
|
145
|
+
__param(2, (0, inversify_1.inject)(inversify_types_1.CLASSES.ProjectAndFileTests)),
|
|
136
146
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper, Object, ProjectAndFileTests_1.ProjectAndFileTests])
|
|
137
147
|
], WorkspaceDetails);
|
|
138
148
|
exports.WorkspaceDetails = WorkspaceDetails;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceDetails.js","sourceRoot":"","sources":["../../../../pageobjects/dashboard/workspace-details/WorkspaceDetails.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,8DAA2D;AAC3D,yCAA+C;AAC/C,sEAAkE;AAClE,4BAA0B;AAC1B,2DAAwC;AACxC,8EAA2E;AAC3E,kDAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"WorkspaceDetails.js","sourceRoot":"","sources":["../../../../pageobjects/dashboard/workspace-details/WorkspaceDetails.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,8DAA2D;AAC3D,yCAA+C;AAC/C,sEAAkE;AAClE,4BAA0B;AAC1B,2DAAwC;AACxC,8EAA2E;AAC3E,kDAA+C;AAC/C,4EAAyE;AAEzE,oFAAiF;AAG1E,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAO5B,YAEkB,YAA0B,EAE1B,iBAAqC,EAErC,yBAA8C;QAJ9C,iBAAY,GAAZ,YAAY,CAAc;QAE1B,sBAAiB,GAAjB,iBAAiB,CAAoB;QAErC,8BAAyB,GAAzB,yBAAyB,CAAqB;IAC7D,CAAC;IAEJ,KAAK,CAAC,uBAAuB,CAC5B,WAAmB,qCAAiB,CAAC,4BAA4B,EACjE,UAAkB,qCAAiB,CAAC,2BAA2B;QAE/D,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,kBAAgB,CAAC,wBAAwB,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACzG,CAAC;IAED,KAAK,CAAC,WAAW;QAChB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,aAAqB,EAAE,UAAkB,qCAAiB,CAAC,6BAA6B;QACtG,eAAM,CAAC,KAAK,CAAC,eAAe,aAAa,GAAG,CAAC,CAAC;QAE9C,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,aAAqB,EAAE,UAAkB,qCAAiB,CAAC,gCAAgC;QACnH,eAAM,CAAC,KAAK,CAAC,WAAW,aAAa,GAAG,CAAC,CAAC;QAE1C,MAAM,qBAAqB,GAAO,IAAI,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;QAE/E,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAkB,qCAAiB,CAAC,gCAAgC;QACvF,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,kBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,UAAkB,qCAAiB,CAAC,+BAA+B;QACzF,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,kBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,UAAkB,qCAAiB,CAAC,gCAAgC;QACxF,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,kBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK,CAAC,aAAa,CAClB,SAAiB,EACjB,aAAqB,EACrB,UAAkB,qCAAiB,CAAC,6BAA6B;QAEjE,eAAM,CAAC,KAAK,CAAC,IAAI,SAAS,IAAI,aAAa,GAAG,CAAC,CAAC;QAEhD,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,IAAI,CAAC,yBAAyB,CAAC,sCAAsC,EAAE,CAAC;QAC9E,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,SAAS,EAAE,aAAa,EAAE,iCAAe,CAAC,QAAQ,CAAC,CAAC;IAChG,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,UAAkB,qCAAiB,CAAC,gCAAgC;QAC1F,eAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAElD,MAAM,oBAAoB,GAAkB;YAC3C,UAAU;YACV,UAAU;YACV,YAAY;YACZ,SAAS;YACT,eAAe;YACf,SAAS;YACT,QAAQ;YACR,KAAK;YACL,SAAS;YACT,SAAS;SACT,CAAC;QAEF,KAAK,MAAM,QAAQ,IAAI,oBAAoB,EAAE;YAC5C,MAAM,0BAA0B,GAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAEpE,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC;SAC5E;IACF,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,QAAgB,EAAE,UAAkB,qCAAiB,CAAC,gCAAgC;QACrG,eAAM,CAAC,KAAK,CAAC,8BAA8B,QAAQ,EAAE,CAAC,CAAC;QAEvD,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAEO,wBAAwB,CAAC,aAAqB;QACrD,OAAO,uBAAE,CAAC,GAAG,CAAC,8BAA8B,aAAa,IAAI,CAAC,CAAC;IAChE,CAAC;IAEO,aAAa,CAAC,QAAgB;QACrC,OAAO,uBAAE,CAAC,KAAK,CAAC,+CAA+C,QAAQ,IAAI,CAAC,CAAC;IAC9E,CAAC;IAEO,qBAAqB,CAAC,QAAgB;QAC7C,OAAO,uBAAE,CAAC,KAAK,CAAC,uFAAuF,QAAQ,IAAI,CAAC,CAAC;IACtH,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,UAAkB,qCAAiB,CAAC,gCAAgC;QAChG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,kBAAgB,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IACvF,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACxC,WAAmB,qCAAiB,CAAC,4BAA4B,EACjE,UAAkB,qCAAiB,CAAC,2BAA2B;QAE/D,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,kBAAgB,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5F,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,UAAkB,qCAAiB,CAAC,+BAA+B;QAClG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,kBAAgB,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IACrF,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,UAAkB,qCAAiB,CAAC,+BAA+B;QAClG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,kBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC7E,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,QAAgB,EAAE,UAAkB,qCAAiB,CAAC,+BAA+B;QAC7G,MAAM,0BAA0B,GAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACpE,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC;IAC3E,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,QAAgB,EAAE,UAAkB,qCAAiB,CAAC,gCAAgC;QACnH,MAAM,kBAAkB,GAAO,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACpE,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC;;AArJuB,2BAAU,GAAO,uBAAE,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;AACzE,4BAAW,GAAO,uBAAE,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;AACzE,4BAAW,GAAO,uBAAE,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;AACvD,oCAAmB,GAAO,uBAAE,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;AACtF,yCAAwB,GAAO,uBAAE,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;AALnG,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;IASV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;IAE5B,WAAA,IAAA,kBAAM,EAAC,uBAAK,CAAC,aAAa,CAAC,CAAA;IAE3B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,mBAAmB,CAAC,CAAA;qCAHL,2BAAY,UAIC,yCAAmB;GAbpD,gBAAgB,CAuJ5B;AAvJY,4CAAgB"}
|