@eclipse-che/che-e2e 7.74.0-dev-1d09cb7 → 7.74.0-dev-41d1364
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 +183 -0
- package/.prettierignore +10 -0
- package/.prettierrc.json +10 -0
- package/README.md +47 -47
- package/configs/inversify.config.ts +13 -9
- package/configs/inversify.types.ts +29 -29
- 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 +54 -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 +14 -8
- package/dist/configs/inversify.config.js.map +1 -1
- package/dist/configs/inversify.types.js +2 -2
- 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/{ChromeDriverConstants.js → CHROME_DRIVER_CONSTANTS.js} +13 -13
- 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 -16
- package/dist/driver/ChromeDriver.js.map +1 -1
- package/dist/index.js +9 -9
- package/dist/index.js.map +1 -1
- package/dist/pageobjects/dashboard/CreateWorkspace.js +11 -11
- package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
- package/dist/pageobjects/dashboard/Dashboard.js +16 -16
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/dashboard/Workspaces.js +28 -28
- package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +36 -25
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
- package/dist/pageobjects/git-providers/OauthPage.js +20 -18
- package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js +9 -9
- 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 +5 -5
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -1
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js +5 -5
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpLoginPage.js +13 -13
- package/dist/pageobjects/login/openshift/OcpLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js +5 -5
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js +6 -6
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js +5 -5
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js +8 -8
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpApplicationPage.js +5 -5
- package/dist/pageobjects/openshift/OcpApplicationPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js +4 -4
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpMainPage.js +6 -6
- package/dist/pageobjects/openshift/OcpMainPage.js.map +1 -1
- package/dist/specs/MochaHooks.js +26 -23
- package/dist/specs/MochaHooks.js.map +1 -1
- package/dist/specs/SmokeTest.spec.js +11 -11
- package/dist/specs/SmokeTest.spec.js.map +1 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js +10 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +26 -15
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -1
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js +17 -11
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
- package/dist/specs/api/PodOverridesAPI.spec.js +12 -3
- package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +5 -5
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/Quarkus.spec.js +7 -7
- package/dist/specs/dashboard-samples/Quarkus.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js +41 -41
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js.map +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +14 -9
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
- package/dist/specs/factory/Factory.spec.js +25 -25
- package/dist/specs/factory/Factory.spec.js.map +1 -1
- package/dist/specs/factory/NoSetupRepoFactory.spec.js +37 -34
- package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js +33 -33
- package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js +12 -3
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js.map +1 -1
- package/dist/tests-library/LoginTests.js +7 -7
- package/dist/tests-library/LoginTests.js.map +1 -1
- package/dist/tests-library/ProjectAndFileTests.js +7 -5
- package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
- package/dist/tests-library/WorkspaceHandlingTests.js +16 -13
- package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
- package/dist/utils/BrowserTabsUtil.js +19 -14
- package/dist/utils/BrowserTabsUtil.js.map +1 -1
- package/dist/utils/CheReporter.js +44 -44
- package/dist/utils/CheReporter.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js +17 -8
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
- package/dist/utils/DevfilesRegistryHelper.js +19 -13
- package/dist/utils/DevfilesRegistryHelper.js.map +1 -1
- package/dist/utils/DriverHelper.js +64 -66
- package/dist/utils/DriverHelper.js.map +1 -1
- package/dist/utils/KubernetesCommandLineToolsExecutor.js +28 -24
- 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 +18 -12
- package/dist/utils/ScreenCatcher.js.map +1 -1
- package/dist/utils/ShellExecutor.js +9 -0
- package/dist/utils/ShellExecutor.js.map +1 -1
- package/dist/utils/StringUtil.js +15 -7
- package/dist/utils/StringUtil.js.map +1 -1
- package/dist/utils/request-handlers/CheApiRequestHandler.js +27 -27
- package/dist/utils/request-handlers/CheApiRequestHandler.js.map +1 -1
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js +10 -6
- 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 +3 -3
- package/dist/utils/workspace/ApiUrlResolver.js.map +1 -1
- package/dist/utils/workspace/ITestWorkspaceUtil.js +2 -2
- package/dist/utils/workspace/TestWorkspaceUtil.js +21 -19
- 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 +44 -50
- package/driver/IDriver.ts +3 -3
- package/index.ts +9 -9
- package/package.json +59 -49
- package/pageobjects/dashboard/CreateWorkspace.ts +64 -55
- package/pageobjects/dashboard/Dashboard.ts +101 -100
- package/pageobjects/dashboard/Workspaces.ts +196 -164
- package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +150 -125
- package/pageobjects/git-providers/OauthPage.ts +177 -166
- package/pageobjects/ide/CheCodeLocatorLoader.ts +49 -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 +61 -54
- package/pageobjects/login/openshift/OcpRedHatLoginPage.ts +29 -24
- package/pageobjects/login/openshift/OcpUserLoginPage.ts +15 -18
- package/pageobjects/login/openshift/RedHatLoginPage.ts +48 -46
- package/pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts +38 -34
- package/pageobjects/openshift/OcpApplicationPage.ts +21 -20
- package/pageobjects/openshift/OcpImportFromGitPage.ts +70 -68
- package/pageobjects/openshift/OcpMainPage.ts +69 -68
- package/specs/MochaHooks.ts +59 -50
- package/specs/SmokeTest.spec.ts +43 -40
- package/specs/api/ContainerOverridesAPI.spec.ts +33 -26
- package/specs/api/DevfileAcceptanceTestAPI.spec.ts +106 -95
- package/specs/api/EmptyWorkspaceAPI.spec.ts +62 -57
- package/specs/api/PodOverridesAPI.spec.ts +42 -33
- package/specs/dashboard-samples/EmptyWorkspace.spec.ts +31 -31
- package/specs/dashboard-samples/Quarkus.spec.ts +34 -34
- package/specs/dashboard-samples/RecommendedExtensions.spec.ts +192 -174
- package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +61 -52
- package/specs/factory/Factory.spec.ts +178 -168
- package/specs/factory/NoSetupRepoFactory.spec.ts +226 -211
- package/specs/factory/RefusedOAuthFactory.spec.ts +218 -204
- package/specs/miscellaneous/PredefinedNamespace.spec.ts +64 -54
- 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 +103 -97
- package/utils/CheReporter.ts +141 -145
- package/utils/DevWorkspaceConfigurationHelper.ts +70 -61
- package/utils/DevfilesRegistryHelper.ts +67 -58
- package/utils/DriverHelper.ts +726 -700
- package/utils/KubernetesCommandLineToolsExecutor.ts +196 -180
- package/utils/Logger.ts +102 -125
- package/utils/ScreenCatcher.ts +57 -46
- package/utils/ShellExecutor.ts +19 -11
- package/utils/StringUtil.ts +40 -32
- 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.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,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
*
|
|
2
|
+
/** *******************************************************************
|
|
3
|
+
* copyright (c) 2021 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
|
|
@@ -20,10 +20,10 @@ const CheCodeLocatorLoader_1 = require("../../pageobjects/ide/CheCodeLocatorLoad
|
|
|
20
20
|
const OauthPage_1 = require("../../pageobjects/git-providers/OauthPage");
|
|
21
21
|
const StringUtil_1 = require("../../utils/StringUtil");
|
|
22
22
|
const Logger_1 = require("../../utils/Logger");
|
|
23
|
-
const
|
|
24
|
-
const
|
|
25
|
-
const
|
|
26
|
-
const
|
|
23
|
+
const TIMEOUT_CONSTANTS_1 = require("../../constants/TIMEOUT_CONSTANTS");
|
|
24
|
+
const OAUTH_CONSTANTS_1 = require("../../constants/OAUTH_CONSTANTS");
|
|
25
|
+
const BASE_TEST_CONSTANTS_1 = require("../../constants/BASE_TEST_CONSTANTS");
|
|
26
|
+
const FACTORY_TEST_CONSTANTS_1 = require("../../constants/FACTORY_TEST_CONSTANTS");
|
|
27
27
|
var WebDriverError = monaco_page_objects_1.error.WebDriverError;
|
|
28
28
|
const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
|
|
29
29
|
const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
|
|
@@ -31,28 +31,27 @@ const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_
|
|
|
31
31
|
const webCheCodeLocators = new CheCodeLocatorLoader_1.CheCodeLocatorLoader().webCheCodeLocators;
|
|
32
32
|
const driverHelper = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.DriverHelper);
|
|
33
33
|
const loginTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.LoginTests);
|
|
34
|
-
suite(`Create a workspace via launching a factory from the ${
|
|
34
|
+
suite(`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository and deny the access`, function () {
|
|
35
35
|
const oauthPage = new OauthPage_1.OauthPage(driverHelper);
|
|
36
36
|
let projectSection;
|
|
37
37
|
let scmProvider;
|
|
38
|
-
let rest;
|
|
39
38
|
let scmContextMenu;
|
|
40
39
|
// test specific data
|
|
41
40
|
const timeToRefresh = 1500;
|
|
42
|
-
const changesToCommit =
|
|
41
|
+
const changesToCommit = new Date().getTime().toString();
|
|
43
42
|
const fileToChange = 'Date.txt';
|
|
44
|
-
const commitChangesButtonLabel = `Commit Changes on "${
|
|
43
|
+
const commitChangesButtonLabel = `Commit Changes on "${FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}"`;
|
|
45
44
|
const refreshButtonLabel = 'Refresh';
|
|
46
45
|
const pushItemLabel = 'Push';
|
|
47
|
-
const label =
|
|
46
|
+
const label = BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
|
|
48
47
|
let testRepoProjectName;
|
|
49
|
-
const isPrivateRepo =
|
|
48
|
+
const isPrivateRepo = FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO ? 'private' : 'public';
|
|
50
49
|
loginTests.loginIntoChe();
|
|
51
50
|
test(`Navigate to the ${isPrivateRepo} repository factory URL`, async function () {
|
|
52
|
-
await browserTabsUtil.navigateTo(
|
|
51
|
+
await browserTabsUtil.navigateTo(FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_URL());
|
|
53
52
|
});
|
|
54
|
-
if (
|
|
55
|
-
test(`Authorize with a ${
|
|
53
|
+
if (OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_GIT_PROVIDER_OAUTH) {
|
|
54
|
+
test(`Authorize with a ${FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} OAuth and deny access`, async function () {
|
|
56
55
|
await oauthPage.login();
|
|
57
56
|
await oauthPage.waitOauthPage();
|
|
58
57
|
await oauthPage.denyAccess();
|
|
@@ -64,14 +63,14 @@ suite(`Create a workspace via launching a factory from the ${FactoryTestConstant
|
|
|
64
63
|
test('The workspace starts with access deny flag in the url', async function () {
|
|
65
64
|
chai_1.expect(await driverHelper.getDriver().getCurrentUrl()).contains('&error_code=access_denied');
|
|
66
65
|
});
|
|
67
|
-
test('Registering the running workspace',
|
|
66
|
+
test('Registering the running workspace', function () {
|
|
68
67
|
MochaHooks_1.registerRunningWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
69
68
|
});
|
|
70
69
|
test('Wait the workspace readiness', async function () {
|
|
71
70
|
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|
|
72
71
|
});
|
|
73
72
|
test('Check if a project folder has been created', async function () {
|
|
74
|
-
testRepoProjectName = StringUtil_1.StringUtil.getProjectNameFromGitUrl(
|
|
73
|
+
testRepoProjectName = StringUtil_1.StringUtil.getProjectNameFromGitUrl(FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL);
|
|
75
74
|
Logger_1.Logger.debug(`new SideBarView().getContent().getSection: get ${testRepoProjectName}`);
|
|
76
75
|
projectSection = await new monaco_page_objects_1.SideBarView().getContent().getSection(testRepoProjectName);
|
|
77
76
|
});
|
|
@@ -85,8 +84,8 @@ suite(`Create a workspace via launching a factory from the ${FactoryTestConstant
|
|
|
85
84
|
}
|
|
86
85
|
// "Welcome Content" dialog can be shown before of after dialog with an error for private repo
|
|
87
86
|
try {
|
|
88
|
-
const buttonYesITrustTheAuthors =
|
|
89
|
-
await driverHelper.waitVisibility(webCheCodeLocators.WelcomeContent.text,
|
|
87
|
+
const buttonYesITrustTheAuthors = 'Yes, I trust the authors';
|
|
88
|
+
await driverHelper.waitVisibility(webCheCodeLocators.WelcomeContent.text, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM);
|
|
90
89
|
const welcomeContentDialog = new monaco_page_objects_1.ModalDialog();
|
|
91
90
|
Logger_1.Logger.debug(`trustedProjectDialog.pushButton: "${buttonYesITrustTheAuthors}"`);
|
|
92
91
|
await welcomeContentDialog.pushButton(buttonYesITrustTheAuthors);
|
|
@@ -94,12 +93,12 @@ suite(`Create a workspace via launching a factory from the ${FactoryTestConstant
|
|
|
94
93
|
}
|
|
95
94
|
catch (e) {
|
|
96
95
|
Logger_1.Logger.info(`"Accept the project as a trusted one" dialog was not shown firstly for "${isPrivateRepo}"`);
|
|
97
|
-
if (!
|
|
96
|
+
if (!FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
|
|
98
97
|
throw new WebDriverError(e);
|
|
99
98
|
}
|
|
100
99
|
}
|
|
101
100
|
});
|
|
102
|
-
if (
|
|
101
|
+
if (FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
|
|
103
102
|
test('Check that project can not be cloned', async function () {
|
|
104
103
|
await driverHelper.waitVisibility(webCheCodeLocators.Dialog.message);
|
|
105
104
|
const workspaceDoesNotExistDialog = new monaco_page_objects_1.ModalDialog();
|
|
@@ -121,22 +120,23 @@ suite(`Create a workspace via launching a factory from the ${FactoryTestConstant
|
|
|
121
120
|
test('Make changes to the file', async function () {
|
|
122
121
|
Logger_1.Logger.debug(`projectSection.openItem: "${fileToChange}"`);
|
|
123
122
|
await projectSection.openItem(fileToChange);
|
|
124
|
-
const editor = await new monaco_page_objects_1.EditorView().openEditor(fileToChange);
|
|
123
|
+
const editor = (await new monaco_page_objects_1.EditorView().openEditor(fileToChange));
|
|
125
124
|
await driverHelper.waitVisibility(webCheCodeLocators.Editor.inputArea);
|
|
126
|
-
Logger_1.Logger.debug(
|
|
125
|
+
Logger_1.Logger.debug('editor.clearText');
|
|
127
126
|
await editor.clearText();
|
|
128
127
|
Logger_1.Logger.debug(`editor.typeTextAt: "${changesToCommit}"`);
|
|
129
128
|
await editor.typeTextAt(1, 1, changesToCommit);
|
|
130
129
|
});
|
|
131
130
|
test('Open a source control manager', async function () {
|
|
132
|
-
const viewSourceControl =
|
|
133
|
-
const sourceControl = await new monaco_page_objects_1.ActivityBar().getViewControl(viewSourceControl);
|
|
131
|
+
const viewSourceControl = 'Source Control';
|
|
132
|
+
const sourceControl = (await new monaco_page_objects_1.ActivityBar().getViewControl(viewSourceControl));
|
|
134
133
|
Logger_1.Logger.debug(`sourceControl.openView: "${viewSourceControl}"`);
|
|
135
134
|
await sourceControl.openView();
|
|
136
135
|
const scmView = new monaco_page_objects_1.NewScmView();
|
|
137
136
|
await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel));
|
|
137
|
+
let rest;
|
|
138
138
|
[scmProvider, ...rest] = await scmView.getProviders();
|
|
139
|
-
Logger_1.Logger.debug(`scmView.getProviders: "${scmProvider}, ${
|
|
139
|
+
Logger_1.Logger.debug(`scmView.getProviders: "${JSON.stringify(scmProvider)}, ${rest}"`);
|
|
140
140
|
});
|
|
141
141
|
test('Check if the changes are displayed in the source control manager', async function () {
|
|
142
142
|
await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
|
|
@@ -151,10 +151,10 @@ suite(`Create a workspace via launching a factory from the ${FactoryTestConstant
|
|
|
151
151
|
});
|
|
152
152
|
test('Stage the changes', async function () {
|
|
153
153
|
await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
|
|
154
|
-
Logger_1.Logger.debug(
|
|
154
|
+
Logger_1.Logger.debug('scmProvider.openMoreActions');
|
|
155
155
|
scmContextMenu = await scmProvider.openMoreActions();
|
|
156
156
|
await driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.contextView);
|
|
157
|
-
Logger_1.Logger.debug(
|
|
157
|
+
Logger_1.Logger.debug('scmContextMenu.select: "Changes" -> "Stage All Changes"');
|
|
158
158
|
await scmContextMenu.select('Changes', 'Stage All Changes');
|
|
159
159
|
});
|
|
160
160
|
test('Commit the changes', async function () {
|
|
@@ -172,9 +172,9 @@ suite(`Create a workspace via launching a factory from the ${FactoryTestConstant
|
|
|
172
172
|
chai_1.expect(changes).eql(0);
|
|
173
173
|
});
|
|
174
174
|
test('Push the changes', async function () {
|
|
175
|
-
await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(`Push 1 commits to origin/${
|
|
175
|
+
await driverHelper.waitVisibility(webCheCodeLocators.ScmView.actionConstructor(`Push 1 commits to origin/${FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}`));
|
|
176
176
|
await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
|
|
177
|
-
Logger_1.Logger.debug(
|
|
177
|
+
Logger_1.Logger.debug('scmProvider.openMoreActions');
|
|
178
178
|
scmContextMenu = await scmProvider.openMoreActions();
|
|
179
179
|
await driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.itemConstructor(pushItemLabel));
|
|
180
180
|
Logger_1.Logger.debug(`scmContextMenu.select: "${pushItemLabel}"`);
|
|
@@ -187,13 +187,13 @@ suite(`Create a workspace via launching a factory from the ${FactoryTestConstant
|
|
|
187
187
|
catch (e) {
|
|
188
188
|
Logger_1.Logger.info(`Workspace did not ask credentials before push - ${e};
|
|
189
189
|
Known issue for github.com - https://issues.redhat.com/browse/CRW-4066, please check if not other git provider. `);
|
|
190
|
-
chai_1.expect(
|
|
190
|
+
chai_1.expect(FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER).eqls(FACTORY_TEST_CONSTANTS_1.GitProviderType.GITHUB);
|
|
191
191
|
}
|
|
192
192
|
const input = new monaco_page_objects_1.InputBox();
|
|
193
|
-
await input.setText(
|
|
193
|
+
await input.setText(OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_GIT_PROVIDER_USERNAME);
|
|
194
194
|
await input.confirm();
|
|
195
195
|
await driverHelper.wait(timeToRefresh);
|
|
196
|
-
await input.setText(
|
|
196
|
+
await input.setText(OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
|
|
197
197
|
await input.confirm();
|
|
198
198
|
await driverHelper.wait(timeToRefresh);
|
|
199
199
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RefusedOAuthFactory.spec.js","sourceRoot":"","sources":["../../../specs/factory/RefusedOAuthFactory.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;AAExE,4BAA0B;AAC1B,qEAA8D;AAC9D,6DAe6B;AAC7B,+BAA8B;AAC9B,8CAAyD;AAEzD,mEAAwD;AACxD,uFAAoF;AACpF,qFAAkF;AAGlF,yEAAsE;AACtE,uDAAoD;AACpD,+CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"RefusedOAuthFactory.spec.js","sourceRoot":"","sources":["../../../specs/factory/RefusedOAuthFactory.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
/** *******************************************************************
|
|
4
|
+
* copyright (c) 2023 Red Hat, Inc.
|
|
5
|
+
*
|
|
6
|
+
* This program and the accompanying materials are made
|
|
7
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
8
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
9
|
+
*
|
|
10
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
11
|
+
**********************************************************************/
|
|
3
12
|
const inversify_config_1 = require("../../configs/inversify.config");
|
|
4
13
|
const chai_1 = require("chai");
|
|
5
14
|
const inversify_types_1 = require("../../configs/inversify.types");
|
|
@@ -17,7 +26,7 @@ async function runShellScript(shellCommandToExecution) {
|
|
|
17
26
|
console.error(stderr);
|
|
18
27
|
return stdout;
|
|
19
28
|
}
|
|
20
|
-
suite(
|
|
29
|
+
suite('Create predefined workspace and check it ', function () {
|
|
21
30
|
let workspaceName = '';
|
|
22
31
|
const setEditRightsForUser = `oc adm policy add-role-to-user edit user -n ${predefinedNamespaceName}`;
|
|
23
32
|
const getDevWorkspaceFromPredefinedNameSpace = `oc get dw -n ${predefinedNamespaceName}`;
|
|
@@ -37,7 +46,7 @@ suite(`Create predefined workspace and check it `, async function () {
|
|
|
37
46
|
suiteSetup(async function () {
|
|
38
47
|
Logger_1.Logger.info('Test prerequisites:');
|
|
39
48
|
Logger_1.Logger.info(' (1) there is OCP user with username and user password that have been set in the TS_SELENIUM_OCP_USERNAME and TS_SELENIUM_OCP_PASSWORD variables');
|
|
40
|
-
Logger_1.Logger.info(' (2)
|
|
49
|
+
Logger_1.Logger.info(' (2) "oc" client installed and logged into test OCP cluster with admin rights.');
|
|
41
50
|
await runShellScript(createPredefinedProjectCommand);
|
|
42
51
|
await runShellScript(setEditRightsForUser);
|
|
43
52
|
});
|
|
@@ -63,7 +72,7 @@ suite(`Create predefined workspace and check it `, async function () {
|
|
|
63
72
|
workspaceName = WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName();
|
|
64
73
|
MochaHooks_1.registerRunningWorkspace(workspaceName);
|
|
65
74
|
const ocDevWorkspaceOutput = await runShellScript(getDevWorkspaceFromPredefinedNameSpace);
|
|
66
|
-
|
|
75
|
+
chai_1.assert.isTrue(ocDevWorkspaceOutput.includes(workspaceName));
|
|
67
76
|
});
|
|
68
77
|
loginTests.logoutFromChe();
|
|
69
78
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PredefinedNamespace.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/PredefinedNamespace.spec.ts"],"names":[],"mappings":";;AAAA,qEAA8D;AAC9D,+BAA8B;AAC9B,mEAAwD;AACxD,uFAAoF;AACpF,+CAA4C;AAE5C,8CAAyD;AAEzD,MAAM,UAAU,GAAe,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,UAAU,CAAC,CAAC;AACpE,MAAM,IAAI,GAAQ,OAAO,CAAC,WAAW,CAAC,CAAC;AACvC,MAAM,IAAI,GAAQ,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,CAAC;AACrE,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;AACxG,MAAM,uBAAuB,GAAW,eAAe,CAAC;AAExD,KAAK,UAAU,cAAc,CAAC,uBAA+B;
|
|
1
|
+
{"version":3,"file":"PredefinedNamespace.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/PredefinedNamespace.spec.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
|
|
@@ -26,7 +26,7 @@ const inversify_types_1 = require("../configs/inversify.types");
|
|
|
26
26
|
const BrowserTabsUtil_1 = require("../utils/BrowserTabsUtil");
|
|
27
27
|
const inversify_1 = require("inversify");
|
|
28
28
|
const Dashboard_1 = require("../pageobjects/dashboard/Dashboard");
|
|
29
|
-
const
|
|
29
|
+
const BASE_TEST_CONSTANTS_1 = require("../constants/BASE_TEST_CONSTANTS");
|
|
30
30
|
let LoginTests = class LoginTests {
|
|
31
31
|
constructor(browserTabsUtil, productLoginPage, ocpLoginPage, dashboard) {
|
|
32
32
|
this.browserTabsUtil = browserTabsUtil;
|
|
@@ -36,8 +36,8 @@ let LoginTests = class LoginTests {
|
|
|
36
36
|
}
|
|
37
37
|
loginIntoChe() {
|
|
38
38
|
test('Login', async () => {
|
|
39
|
-
if (!(await this.browserTabsUtil.getCurrentUrl()).includes(
|
|
40
|
-
await this.browserTabsUtil.navigateTo(
|
|
39
|
+
if (!(await this.browserTabsUtil.getCurrentUrl()).includes(BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL)) {
|
|
40
|
+
await this.browserTabsUtil.navigateTo(BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL);
|
|
41
41
|
}
|
|
42
42
|
await this.productLoginPage.login();
|
|
43
43
|
await this.browserTabsUtil.maximize();
|
|
@@ -46,9 +46,9 @@ let LoginTests = class LoginTests {
|
|
|
46
46
|
}
|
|
47
47
|
loginIntoOcpConsole() {
|
|
48
48
|
test('Login into ocp console', async () => {
|
|
49
|
-
const openshiftConsoleUrl =
|
|
49
|
+
const openshiftConsoleUrl = BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace('devspaces', 'console-openshift-console');
|
|
50
50
|
await this.browserTabsUtil.navigateTo(openshiftConsoleUrl);
|
|
51
|
-
|
|
51
|
+
this.ocpLoginPage.login();
|
|
52
52
|
await this.browserTabsUtil.maximize();
|
|
53
53
|
});
|
|
54
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginTests.js","sourceRoot":"","sources":["../../tests-library/LoginTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,gEAA4D;AAE5D,8DAA2D;AAC3D,yCAA+C;AAC/C,kEAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"LoginTests.js","sourceRoot":"","sources":["../../tests-library/LoginTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,gEAA4D;AAE5D,8DAA2D;AAC3D,yCAA+C;AAC/C,kEAA+D;AAE/D,0EAAuE;AAGvE,IAAa,UAAU,GAAvB,MAAa,UAAU;IACtB,YAEkB,eAAgC,EAEhC,gBAA+B,EACP,YAA2B,EACxB,SAAoB;QAJ/C,oBAAe,GAAf,eAAe,CAAiB;QAEhC,qBAAgB,GAAhB,gBAAgB,CAAe;QACP,iBAAY,GAAZ,YAAY,CAAe;QACxB,cAAS,GAAT,SAAS,CAAW;IAC9D,CAAC;IAEJ,YAAY;QACX,IAAI,CAAC,OAAO,EAAE,KAAK,IAAmB,EAAE;YACvC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAC,yCAAmB,CAAC,oBAAoB,CAAC,EAAE;gBACrG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,yCAAmB,CAAC,oBAAoB,CAAC,CAAC;aAChF;YACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;YACpC,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,IAAI,CAAC,SAAS,CAAC,mCAAmC,EAAE,CAAC;QAC5D,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,mBAAmB;QAClB,IAAI,CAAC,wBAAwB,EAAE,KAAK,IAAmB,EAAE;YACxD,MAAM,mBAAmB,GAAW,yCAAmB,CAAC,oBAAoB,CAAC,OAAO,CAAC,WAAW,EAAE,2BAA2B,CAAC,CAAC;YAC/H,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;YAC3D,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QACvC,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,aAAa;QACZ,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAmB,EAAE;YACxC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QAC/B,CAAC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAnCY,UAAU;IADtB,sBAAU,EAAE;IAGV,WAAA,kBAAM,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAA;IAE/B,WAAA,kBAAM,CAAC,uBAAK,CAAC,QAAQ,CAAC,CAAA;IAEtB,WAAA,kBAAM,CAAC,uBAAK,CAAC,QAAQ,CAAC,CAAA;IACtB,WAAA,kBAAM,CAAC,yBAAO,CAAC,SAAS,CAAC,CAAA;qCAJQ,iCAAe,kBAIM,qBAAS;GAPrD,UAAU,CAmCtB;AAnCY,gCAAU"}
|
|
@@ -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,16 +28,18 @@ const selenium_webdriver_1 = require("selenium-webdriver");
|
|
|
28
28
|
const DriverHelper_1 = require("../utils/DriverHelper");
|
|
29
29
|
const inversify_types_1 = require("../configs/inversify.types");
|
|
30
30
|
const Logger_1 = require("../utils/Logger");
|
|
31
|
-
const
|
|
31
|
+
const TIMEOUT_CONSTANTS_1 = require("../constants/TIMEOUT_CONSTANTS");
|
|
32
32
|
let ProjectAndFileTests = class ProjectAndFileTests {
|
|
33
33
|
constructor(driverHelper) {
|
|
34
34
|
this.driverHelper = driverHelper;
|
|
35
35
|
}
|
|
36
36
|
async waitWorkspaceReadinessForCheCodeEditor() {
|
|
37
|
-
Logger_1.Logger.debug(
|
|
37
|
+
Logger_1.Logger.debug('waiting for editor.');
|
|
38
38
|
try {
|
|
39
39
|
const start = new Date().getTime();
|
|
40
|
-
await this.driverHelper
|
|
40
|
+
await this.driverHelper
|
|
41
|
+
.getDriver()
|
|
42
|
+
.wait(selenium_webdriver_1.until.elementLocated(selenium_webdriver_1.By.className('monaco-workbench')), TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
|
|
41
43
|
const end = new Date().getTime();
|
|
42
44
|
Logger_1.Logger.debug(`editor was opened in ${end - start} seconds.`);
|
|
43
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectAndFileTests.js","sourceRoot":"","sources":["../../tests-library/ProjectAndFileTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAA+C;AAC/C,wDAAqD;AACrD,gEAAqD;AACrD,4CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"ProjectAndFileTests.js","sourceRoot":"","sources":["../../tests-library/ProjectAndFileTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAA+C;AAC/C,wDAAqD;AACrD,gEAAqD;AACrD,4CAAyC;AACzC,sEAAmE;AAGnE,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAC/B,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,sCAAsC;QAC3C,eAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACpC,IAAI;YACH,MAAM,KAAK,GAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YAC3C,MAAM,IAAI,CAAC,YAAY;iBACrB,SAAS,EAAE;iBACX,IAAI,CAAC,0BAAK,CAAC,cAAc,CAAC,uBAAE,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,EAAE,qCAAiB,CAAC,mCAAmC,CAAC,CAAC;YACtH,MAAM,GAAG,GAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACzC,eAAM,CAAC,KAAK,CAAC,wBAAwB,GAAG,GAAG,KAAK,WAAW,CAAC,CAAC;SAC7D;QAAC,OAAO,GAAG,EAAE;YACb,eAAM,CAAC,KAAK,CAAC,2CAA2C,GAAG,EAAE,CAAC,CAAC;YAC/D,MAAM,GAAG,CAAC;SACV;IACF,CAAC;CACD,CAAA;AApBY,mBAAmB;IAD/B,sBAAU,EAAE;IAGV,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GAHhC,mBAAmB,CAoB/B;AApBY,kDAAmB"}
|
|
@@ -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
|
|
@@ -31,7 +31,7 @@ const CreateWorkspace_1 = require("../pageobjects/dashboard/CreateWorkspace");
|
|
|
31
31
|
const BrowserTabsUtil_1 = require("../utils/BrowserTabsUtil");
|
|
32
32
|
const Logger_1 = require("../utils/Logger");
|
|
33
33
|
const ApiUrlResolver_1 = require("../utils/workspace/ApiUrlResolver");
|
|
34
|
-
const
|
|
34
|
+
const TIMEOUT_CONSTANTS_1 = require("../constants/TIMEOUT_CONSTANTS");
|
|
35
35
|
const DriverHelper_1 = require("../utils/DriverHelper");
|
|
36
36
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
37
37
|
let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingTests {
|
|
@@ -54,31 +54,34 @@ let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingT
|
|
|
54
54
|
async createAndOpenWorkspace(stack) {
|
|
55
55
|
await this.dashboard.clickWorkspacesButton();
|
|
56
56
|
await this.dashboard.waitPage();
|
|
57
|
-
Logger_1.Logger.debug(
|
|
57
|
+
Logger_1.Logger.debug('fetching user kubernetes namespace, storing auth token by getting workspaces API URL.');
|
|
58
58
|
await this.apiUrlResolver.getWorkspacesApiUrl();
|
|
59
59
|
await this.dashboard.clickCreateWorkspaceButton();
|
|
60
60
|
await this.createWorkspace.waitPage();
|
|
61
61
|
WorkspaceHandlingTests_1.parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
|
|
62
62
|
await this.createWorkspace.clickOnSampleNoEditorSelection(stack);
|
|
63
|
-
await this.browserTabsUtil.waitAndSwitchToAnotherWindow(WorkspaceHandlingTests_1.parentGUID,
|
|
63
|
+
await this.browserTabsUtil.waitAndSwitchToAnotherWindow(WorkspaceHandlingTests_1.parentGUID, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_IDE_LOAD_TIMEOUT);
|
|
64
64
|
}
|
|
65
65
|
async createAndOpenWorkspaceFromGitRepository(factoryUrl) {
|
|
66
66
|
await this.dashboard.waitPage();
|
|
67
|
-
Logger_1.Logger.debug(
|
|
67
|
+
Logger_1.Logger.debug('fetching user kubernetes namespace, storing auth token by getting workspaces API URL.');
|
|
68
68
|
await this.apiUrlResolver.getWorkspacesApiUrl();
|
|
69
69
|
await this.dashboard.clickCreateWorkspaceButton();
|
|
70
70
|
await this.createWorkspace.waitPage();
|
|
71
71
|
WorkspaceHandlingTests_1.parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
|
|
72
72
|
await this.createWorkspace.importFromGitUsingUI(factoryUrl);
|
|
73
|
-
await this.browserTabsUtil.waitAndSwitchToAnotherWindow(WorkspaceHandlingTests_1.parentGUID,
|
|
73
|
+
await this.browserTabsUtil.waitAndSwitchToAnotherWindow(WorkspaceHandlingTests_1.parentGUID, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_IDE_LOAD_TIMEOUT);
|
|
74
74
|
}
|
|
75
75
|
async obtainWorkspaceNameFromStartingPage() {
|
|
76
|
-
const timeout =
|
|
77
|
-
const polling =
|
|
76
|
+
const timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_IDE_LOAD_TIMEOUT;
|
|
77
|
+
const polling = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING;
|
|
78
78
|
const attempts = Math.ceil(timeout / polling);
|
|
79
79
|
for (let i = 0; i < attempts; i++) {
|
|
80
80
|
try {
|
|
81
|
-
|
|
81
|
+
const startingWorkspaceLineContent = await this.driverHelper
|
|
82
|
+
.getDriver()
|
|
83
|
+
.findElement(WorkspaceHandlingTests_1.WORKSPACE_NAME_LOCATOR)
|
|
84
|
+
.getText();
|
|
82
85
|
Logger_1.Logger.trace(`obtained starting workspace getText():${startingWorkspaceLineContent}`);
|
|
83
86
|
// cutting away leading text
|
|
84
87
|
WorkspaceHandlingTests_1.workspaceName = startingWorkspaceLineContent.substring('Starting workspace '.length).trim();
|
|
@@ -87,12 +90,12 @@ let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingT
|
|
|
87
90
|
}
|
|
88
91
|
catch (err) {
|
|
89
92
|
if (err instanceof selenium_webdriver_1.error.StaleElementReferenceError) {
|
|
90
|
-
Logger_1.Logger.trace(
|
|
93
|
+
Logger_1.Logger.trace('failed to obtain name from workspace start page, element possibly detached from DOM. Retrying.');
|
|
91
94
|
await this.driverHelper.wait(polling);
|
|
92
95
|
continue;
|
|
93
96
|
}
|
|
94
97
|
if (err instanceof selenium_webdriver_1.error.NoSuchElementError) {
|
|
95
|
-
Logger_1.Logger.trace(
|
|
98
|
+
Logger_1.Logger.trace('failed to obtain name from workspace start page, element not visible yet. Retrying.');
|
|
96
99
|
await this.driverHelper.wait(polling);
|
|
97
100
|
continue;
|
|
98
101
|
}
|
|
@@ -120,7 +123,7 @@ let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingT
|
|
|
120
123
|
await this.dashboard.stopAndRemoveWorkspaceByUI(workspaceName);
|
|
121
124
|
}
|
|
122
125
|
};
|
|
123
|
-
WorkspaceHandlingTests.WORKSPACE_NAME_LOCATOR = selenium_webdriver_1.By.xpath(
|
|
126
|
+
WorkspaceHandlingTests.WORKSPACE_NAME_LOCATOR = selenium_webdriver_1.By.xpath('//h1[contains(.,"Starting workspace ")]');
|
|
124
127
|
WorkspaceHandlingTests.workspaceName = 'undefined';
|
|
125
128
|
WorkspaceHandlingTests = WorkspaceHandlingTests_1 = __decorate([
|
|
126
129
|
inversify_1.injectable(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceHandlingTests.js","sourceRoot":"","sources":["../../tests-library/WorkspaceHandlingTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,gEAAqD;AACrD,kEAA+D;AAC/D,8EAA2E;AAC3E,8DAA2D;AAC3D,4CAAyC;AACzC,sEAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"WorkspaceHandlingTests.js","sourceRoot":"","sources":["../../tests-library/WorkspaceHandlingTests.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
|
|
@@ -26,8 +26,8 @@ const inversify_1 = require("inversify");
|
|
|
26
26
|
const inversify_types_1 = require("../configs/inversify.types");
|
|
27
27
|
const DriverHelper_1 = require("./DriverHelper");
|
|
28
28
|
const Logger_1 = require("./Logger");
|
|
29
|
-
const
|
|
30
|
-
const
|
|
29
|
+
const TIMEOUT_CONSTANTS_1 = require("../constants/TIMEOUT_CONSTANTS");
|
|
30
|
+
const CHROME_DRIVER_CONSTANTS_1 = require("../constants/CHROME_DRIVER_CONSTANTS");
|
|
31
31
|
let BrowserTabsUtil = class BrowserTabsUtil {
|
|
32
32
|
constructor(driverHelper) {
|
|
33
33
|
this.driverHelper = driverHelper;
|
|
@@ -48,7 +48,7 @@ let BrowserTabsUtil = class BrowserTabsUtil {
|
|
|
48
48
|
Logger_1.Logger.debug(`${url}`);
|
|
49
49
|
await this.driverHelper.getDriver().navigate().to(url);
|
|
50
50
|
}
|
|
51
|
-
async navigateAndWaitToUrl(url, timeout =
|
|
51
|
+
async navigateAndWaitToUrl(url, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL) {
|
|
52
52
|
Logger_1.Logger.trace(`${url}`);
|
|
53
53
|
await this.navigateTo(url);
|
|
54
54
|
await this.waitURL(url, timeout);
|
|
@@ -75,18 +75,23 @@ let BrowserTabsUtil = class BrowserTabsUtil {
|
|
|
75
75
|
}
|
|
76
76
|
async waitURL(expectedUrl, timeout) {
|
|
77
77
|
Logger_1.Logger.trace(`${expectedUrl}`);
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
78
|
+
try {
|
|
79
|
+
await this.driverHelper.getDriver().wait(async () => {
|
|
80
|
+
const currentUrl = await this.driverHelper.getDriver().getCurrentUrl();
|
|
81
|
+
const urlEquals = currentUrl === expectedUrl;
|
|
82
|
+
if (urlEquals) {
|
|
83
|
+
return true;
|
|
84
|
+
}
|
|
85
|
+
}, timeout);
|
|
86
|
+
}
|
|
87
|
+
catch (e) {
|
|
88
|
+
throw e;
|
|
89
|
+
}
|
|
85
90
|
}
|
|
86
91
|
async maximize() {
|
|
87
92
|
Logger_1.Logger.trace();
|
|
88
|
-
if (
|
|
89
|
-
Logger_1.Logger.debug(
|
|
93
|
+
if (CHROME_DRIVER_CONSTANTS_1.CHROME_DRIVER_CONSTANTS.TS_SELENIUM_LAUNCH_FULLSCREEN) {
|
|
94
|
+
Logger_1.Logger.debug('TS_SELENIUM_LAUNCH_FULLSCREEN is set to true, maximizing window.');
|
|
90
95
|
await this.driverHelper.getDriver().manage().window().maximize();
|
|
91
96
|
}
|
|
92
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrowserTabsUtil.js","sourceRoot":"","sources":["../../utils/BrowserTabsUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,yCAA+C;AAC/C,gEAAqD;AACrD,iDAA8C;AAC9C,qCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"BrowserTabsUtil.js","sourceRoot":"","sources":["../../utils/BrowserTabsUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,yCAA+C;AAC/C,gEAAqD;AACrD,iDAA8C;AAC9C,qCAAkC;AAClC,sEAAmE;AACnE,kFAA+E;AAG/E,IAAa,eAAe,GAA5B,MAAa,eAAe;IAC3B,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,cAAc,CAAC,YAAoB;QACxC,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,OAAO,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,mBAAmB,EAAE,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC3B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,eAAe,EAAE,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW;QAC3B,eAAM,CAAC,KAAK,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC;QAEvB,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,GAAW,EAAE,UAAkB,qCAAiB,CAAC,wBAAwB;QACnG,eAAM,CAAC,KAAK,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC;QAEvB,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,4BAA4B,CAAC,mBAA2B,EAAE,OAAe;QAC9E,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,IAAsB,EAAE;YAClE,MAAM,aAAa,GAAa,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAEjE,OAAO,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;QACjC,CAAC,EAAE,OAAO,CAAC,CAAC;QAEZ,MAAM,aAAa,GAAa,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAEjE,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;YACzC,IAAI,YAAY,KAAK,mBAAmB,EAAE;gBACzC,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;aACxC;SACD;IACF,CAAC;IAED,KAAK,CAAC,WAAW;QAChB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,aAAa;QAClB,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,aAAa,EAAE,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,WAAmB,EAAE,OAAe;QACjD,eAAM,CAAC,KAAK,CAAC,GAAG,WAAW,EAAE,CAAC,CAAC;QAC/B,IAAI;YACH,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,IAAkC,EAAE;gBACjF,MAAM,UAAU,GAAW,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,aAAa,EAAE,CAAC;gBAC/E,MAAM,SAAS,GAAY,UAAU,KAAK,WAAW,CAAC;gBAEtD,IAAI,SAAS,EAAE;oBACd,OAAO,IAAI,CAAC;iBACZ;YACF,CAAC,EAAE,OAAO,CAAC,CAAC;SACZ;QAAC,OAAO,CAAC,EAAE;YACX,MAAM,CAAC,CAAC;SACR;IACF,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,IAAI,iDAAuB,CAAC,6BAA6B,EAAE;YAC1D,eAAM,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAC;YACjF,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC;SACjE;IACF,CAAC;IAED,KAAK,CAAC,yBAAyB;QAC9B,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,cAAc,GAAa,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAClE,MAAM,gBAAgB,GAAW,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACrE,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;QAEnE,KAAK,MAAM,SAAS,IAAI,cAAc,EAAE;YACvC,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YACrC,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC;SAC5C;QACD,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;IAC7C,CAAC;CACD,CAAA;AApGY,eAAe;IAD3B,sBAAU,EAAE;IAGV,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GAHhC,eAAe,CAoG3B;AApGY,0CAAe"}
|