@eclipse-che/che-e2e 7.110.0-next-5d75852 → 7.110.0-next-73eeef8
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/constants/FACTORY_TEST_CONSTANTS.ts +12 -0
- package/dist/constants/FACTORY_TEST_CONSTANTS.js +8 -0
- package/dist/constants/FACTORY_TEST_CONSTANTS.js.map +1 -1
- package/dist/pageobjects/dashboard/CreateWorkspace.js +25 -0
- package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
- package/dist/specs/factory/SshUrlNoOauthPatFactory.spec.js +2 -2
- package/dist/specs/factory/SshUrlNoOauthPatFactory.spec.js.map +1 -1
- package/dist/tests-library/WorkspaceHandlingTests.js +4 -2
- package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
- package/package.json +1 -1
- package/pageobjects/dashboard/CreateWorkspace.ts +37 -1
- package/specs/factory/SshUrlNoOauthPatFactory.spec.ts +2 -2
- package/tests-library/WorkspaceHandlingTests.ts +8 -2
|
@@ -25,6 +25,8 @@ export const FACTORY_TEST_CONSTANTS: {
|
|
|
25
25
|
TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO: boolean;
|
|
26
26
|
TS_SELENIUM_FACTORY_GIT_PROVIDER: string;
|
|
27
27
|
TS_SELENIUM_FACTORY_GIT_REPO_BRANCH: string;
|
|
28
|
+
TS_SELENIUM_SSH_PRIVATE_KEY_PATH: string;
|
|
29
|
+
TS_SELENIUM_SSH_PUBLIC_KEY_PATH: string;
|
|
28
30
|
TS_SELENIUM_FACTORY_URL(): string;
|
|
29
31
|
} = {
|
|
30
32
|
/**
|
|
@@ -57,6 +59,16 @@ export const FACTORY_TEST_CONSTANTS: {
|
|
|
57
59
|
*/
|
|
58
60
|
TS_SELENIUM_FACTORY_GIT_REPO_BRANCH: process.env.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH || 'master',
|
|
59
61
|
|
|
62
|
+
/**
|
|
63
|
+
* path to SSH private key file
|
|
64
|
+
*/
|
|
65
|
+
TS_SELENIUM_SSH_PRIVATE_KEY_PATH: process.env.TS_SELENIUM_SSH_PRIVATE_KEY_PATH || 'resources/factory/pr-k.txt',
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* path to SSH public key file
|
|
69
|
+
*/
|
|
70
|
+
TS_SELENIUM_SSH_PUBLIC_KEY_PATH: process.env.TS_SELENIUM_SSH_PUBLIC_KEY_PATH || 'resources/factory/pub-k.txt',
|
|
71
|
+
|
|
60
72
|
/**
|
|
61
73
|
* full factory URL
|
|
62
74
|
*/
|
|
@@ -45,6 +45,14 @@ exports.FACTORY_TEST_CONSTANTS = {
|
|
|
45
45
|
* git repository main branch name (main or master)
|
|
46
46
|
*/
|
|
47
47
|
TS_SELENIUM_FACTORY_GIT_REPO_BRANCH: process.env.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH || 'master',
|
|
48
|
+
/**
|
|
49
|
+
* path to SSH private key file
|
|
50
|
+
*/
|
|
51
|
+
TS_SELENIUM_SSH_PRIVATE_KEY_PATH: process.env.TS_SELENIUM_SSH_PRIVATE_KEY_PATH || 'resources/factory/pr-k.txt',
|
|
52
|
+
/**
|
|
53
|
+
* path to SSH public key file
|
|
54
|
+
*/
|
|
55
|
+
TS_SELENIUM_SSH_PUBLIC_KEY_PATH: process.env.TS_SELENIUM_SSH_PUBLIC_KEY_PATH || 'resources/factory/pub-k.txt',
|
|
48
56
|
/**
|
|
49
57
|
* full factory URL
|
|
50
58
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FACTORY_TEST_CONSTANTS.js","sourceRoot":"","sources":["../../constants/FACTORY_TEST_CONSTANTS.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AACxE,+DAA4D;AAE5D,IAAY,eAOX;AAPD,WAAY,eAAe;IAC1B,oCAAiB,CAAA;IACjB,oCAAiB,CAAA;IACjB,sEAAmD,CAAA;IACnD,sEAAmD,CAAA;IACnD,2DAAwC,CAAA;IACxC,gDAA6B,CAAA;AAC9B,CAAC,EAPW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAO1B;AAEY,QAAA,sBAAsB,
|
|
1
|
+
{"version":3,"file":"FACTORY_TEST_CONSTANTS.js","sourceRoot":"","sources":["../../constants/FACTORY_TEST_CONSTANTS.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AACxE,+DAA4D;AAE5D,IAAY,eAOX;AAPD,WAAY,eAAe;IAC1B,oCAAiB,CAAA;IACjB,oCAAiB,CAAA;IACjB,sEAAmD,CAAA;IACnD,sEAAmD,CAAA;IACnD,2DAAwC,CAAA;IACxC,gDAA6B,CAAA;AAC9B,CAAC,EAPW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAO1B;AAEY,QAAA,sBAAsB,GAU/B;IACH;;OAEG;IACH,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,eAAe,CAAC,MAAM;IAExG;;OAEG;IACH,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,EAAE;IAEpF;;OAEG;IACH,uCAAuC,EAAE,OAAO,CAAC,GAAG,CAAC,uCAAuC,IAAI,EAAE;IAElG;;OAEG;IACH,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE;IAEpE;;OAEG;IACH,uCAAuC,EAAE,OAAO,CAAC,GAAG,CAAC,uCAAuC,KAAK,MAAM;IAEvG;;OAEG;IACH,mCAAmC,EAAE,OAAO,CAAC,GAAG,CAAC,mCAAmC,IAAI,QAAQ;IAEhG;;OAEG;IACH,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,4BAA4B;IAE9G;;OAEG;IACH,+BAA+B,EAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,IAAI,6BAA6B;IAE7G;;OAEG;IACH,uBAAuB;QACtB,OAAO,CACN,OAAO,CAAC,GAAG,CAAC,uBAAuB;YACnC,yCAAmB,CAAC,oBAAoB,GAAG,eAAe,GAAG,IAAI,CAAC,gCAAgC,CAClG,CAAC;IACH,CAAC;CACD,CAAC"}
|
|
@@ -82,6 +82,29 @@ let CreateWorkspace = CreateWorkspace_1 = class CreateWorkspace {
|
|
|
82
82
|
Logger_1.Logger.info('"Trust author" popup was not shown');
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
|
+
async isCreateNewWorkspaceCheckboxChecked(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL) {
|
|
86
|
+
Logger_1.Logger.debug();
|
|
87
|
+
const element = await this.driverHelper.waitPresence(CreateWorkspace_1.CREATE_NEW_WORKPACE_CHECKBOX_VALUE, timeout);
|
|
88
|
+
return await element.isSelected();
|
|
89
|
+
}
|
|
90
|
+
async clickOnCreateNewWorkspaceCheckbox(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL) {
|
|
91
|
+
Logger_1.Logger.debug();
|
|
92
|
+
await this.driverHelper.waitAndClick(CreateWorkspace_1.CREATE_NEW_WORKPACE_CHECKBOX, timeout);
|
|
93
|
+
}
|
|
94
|
+
async setCreateNewWorkspaceCheckbox(checked = true, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL) {
|
|
95
|
+
Logger_1.Logger.debug(`checked: ${checked}`);
|
|
96
|
+
// check current state
|
|
97
|
+
const isCurrentlyChecked = await this.isCreateNewWorkspaceCheckboxChecked(timeout);
|
|
98
|
+
// if already in desired state, do nothing
|
|
99
|
+
if (isCurrentlyChecked === checked) {
|
|
100
|
+
Logger_1.Logger.debug(`Checkbox is already ${checked ? 'set' : 'unset'}, no action needed`);
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
103
|
+
// click to change state
|
|
104
|
+
Logger_1.Logger.debug(`Checkbox is ${isCurrentlyChecked ? 'set' : 'unset'}, ${checked ? 'setting' : 'unsetting'} it now`);
|
|
105
|
+
await this.driverHelper.waitAndClick(CreateWorkspace_1.CREATE_NEW_WORKPACE_CHECKBOX, timeout);
|
|
106
|
+
await this.driverHelper.wait(1000);
|
|
107
|
+
}
|
|
85
108
|
getEditorsDropdownListLocator(sampleName) {
|
|
86
109
|
return selenium_webdriver_1.By.xpath(`//div[text()=\'${sampleName}\']//parent::article//button`);
|
|
87
110
|
}
|
|
@@ -111,6 +134,8 @@ CreateWorkspace.GIT_REPO_OPTIONS = selenium_webdriver_1.By.xpath('//span[text()=
|
|
|
111
134
|
CreateWorkspace.GIT_BRANCH_NAME = selenium_webdriver_1.By.xpath('//input[@aria-label="Git Branch"]');
|
|
112
135
|
CreateWorkspace.PATH_TO_DEVFILE = selenium_webdriver_1.By.xpath('//input[@aria-label="Path to Devfile"]');
|
|
113
136
|
CreateWorkspace.CREATE_AND_OPEN_BUTTON = selenium_webdriver_1.By.xpath('//button[@id="create-and-open-button"]');
|
|
137
|
+
CreateWorkspace.CREATE_NEW_WORKPACE_CHECKBOX = selenium_webdriver_1.By.xpath('//label[@for="create-new-if-exist-switch"]');
|
|
138
|
+
CreateWorkspace.CREATE_NEW_WORKPACE_CHECKBOX_VALUE = selenium_webdriver_1.By.xpath('//input[@id="create-new-if-exist-switch"]');
|
|
114
139
|
CreateWorkspace = CreateWorkspace_1 = __decorate([
|
|
115
140
|
(0, inversify_1.injectable)(),
|
|
116
141
|
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateWorkspace.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/CreateWorkspace.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;AAExE,yCAA+C;AAC/C,mEAAwD;AACxD,2DAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"CreateWorkspace.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/CreateWorkspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,8 +28,8 @@ suite(`The SshUrlNoOauthPatFactory userstory ${BASE_TEST_CONSTANTS_1.BASE_TEST_C
|
|
|
28
28
|
const testWorkspaceUtil = inversify_config_1.e2eContainer.get(inversify_types_1.TYPES.WorkspaceUtil);
|
|
29
29
|
const factoryUrl = FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL ||
|
|
30
30
|
'ssh://git@bitbucket-ssh.apps.ds-airgap2-v15.crw-qe.com/~admin/private-bb-repo.git';
|
|
31
|
-
const privateSshKeyPath =
|
|
32
|
-
const publicSshKeyPath =
|
|
31
|
+
const privateSshKeyPath = FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_SSH_PRIVATE_KEY_PATH;
|
|
32
|
+
const publicSshKeyPath = FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_SSH_PUBLIC_KEY_PATH;
|
|
33
33
|
let projectSection;
|
|
34
34
|
async function deleteSshKeys() {
|
|
35
35
|
Logger_1.Logger.debug('Deleting SSH keys if they are present');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SshUrlNoOauthPatFactory.spec.js","sourceRoot":"","sources":["../../../specs/factory/SshUrlNoOauthPatFactory.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;AAIxE,mEAA+D;AAC/D,qEAA8D;AAC9D,uFAAoF;AACpF,8CAAyD;AAEzD,uDAAoD;AACpD,mFAAgF;AAEhF,+BAA8B;AAC9B,6EAA0E;AAI1E,+CAA4C;AAE5C,KAAK,CAAC,yCAAyC,yCAAmB,CAAC,gBAAgB,EAAE,EAAE;IACtF,MAAM,mBAAmB,GAAwB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,mBAAmB,CAAC,CAAC;IAC/F,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;IACxG,MAAM,UAAU,GAAe,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,UAAU,CAAC,CAAC;IACpE,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;IACnF,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;IACnF,MAAM,SAAS,GAAc,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,SAAS,CAAC,CAAC;IACjE,MAAM,iBAAiB,GAAuB,+BAAY,CAAC,GAAG,CAAC,uBAAK,CAAC,aAAa,CAAC,CAAC;IACpF,MAAM,UAAU,GACf,+CAAsB,CAAC,gCAAgC;QACvD,mFAAmF,CAAC;IACrF,MAAM,iBAAiB,GAAW,
|
|
1
|
+
{"version":3,"file":"SshUrlNoOauthPatFactory.spec.js","sourceRoot":"","sources":["../../../specs/factory/SshUrlNoOauthPatFactory.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,23 +48,25 @@ let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingT
|
|
|
48
48
|
static clearWorkspaceName() {
|
|
49
49
|
WorkspaceHandlingTests_1.workspaceName = 'undefined';
|
|
50
50
|
}
|
|
51
|
-
async createAndOpenWorkspace(stack) {
|
|
51
|
+
async createAndOpenWorkspace(stack, createNewWorkspace = true) {
|
|
52
52
|
await this.dashboard.clickWorkspacesButton();
|
|
53
53
|
await this.dashboard.waitPage();
|
|
54
54
|
Logger_1.Logger.debug('fetching user kubernetes namespace, storing auth token by getting workspaces API URL.');
|
|
55
55
|
await this.apiUrlResolver.getWorkspacesApiUrl();
|
|
56
56
|
await this.dashboard.clickCreateWorkspaceButton();
|
|
57
57
|
await this.createWorkspace.waitPage();
|
|
58
|
+
await this.createWorkspace.setCreateNewWorkspaceCheckbox(createNewWorkspace);
|
|
58
59
|
WorkspaceHandlingTests_1.parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
|
|
59
60
|
await this.createWorkspace.clickOnSampleNoEditorSelection(stack);
|
|
60
61
|
await this.browserTabsUtil.waitAndSwitchToAnotherWindow(WorkspaceHandlingTests_1.parentGUID, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_IDE_LOAD_TIMEOUT);
|
|
61
62
|
}
|
|
62
|
-
async createAndOpenWorkspaceFromGitRepository(factoryUrl, branchName) {
|
|
63
|
+
async createAndOpenWorkspaceFromGitRepository(factoryUrl, branchName, createNewWorkspace = true) {
|
|
63
64
|
await this.dashboard.waitPage();
|
|
64
65
|
Logger_1.Logger.debug('fetching user kubernetes namespace, storing auth token by getting workspaces API URL.');
|
|
65
66
|
await this.apiUrlResolver.getWorkspacesApiUrl();
|
|
66
67
|
await this.dashboard.clickCreateWorkspaceButton();
|
|
67
68
|
await this.createWorkspace.waitPage();
|
|
69
|
+
await this.createWorkspace.setCreateNewWorkspaceCheckbox(createNewWorkspace);
|
|
68
70
|
WorkspaceHandlingTests_1.parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
|
|
69
71
|
await this.createWorkspace.importFromGitUsingUI(factoryUrl, branchName);
|
|
70
72
|
await this.browserTabsUtil.waitAndSwitchToAnotherWindow(WorkspaceHandlingTests_1.parentGUID, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_IDE_LOAD_TIMEOUT);
|
|
@@ -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,sEAAmE;AACnE,wDAAqD;AACrD,2DAA+C;AAGxC,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAQlC,YAC6C,SAAoB,EAE/C,eAAgC,EAEhC,eAAgC,EAEhC,cAA8B,EAE9B,YAA0B;QARC,cAAS,GAAT,SAAS,CAAW;QAE/C,oBAAe,GAAf,eAAe,CAAiB;QAEhC,oBAAe,GAAf,eAAe,CAAiB;QAEhC,mBAAc,GAAd,cAAc,CAAgB;QAE9B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,MAAM,CAAC,gBAAgB;QACtB,OAAO,wBAAsB,CAAC,aAAa,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,kBAAkB;QACxB,wBAAsB,CAAC,aAAa,GAAG,WAAW,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,KAAa;
|
|
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,sEAAmE;AACnE,wDAAqD;AACrD,2DAA+C;AAGxC,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAQlC,YAC6C,SAAoB,EAE/C,eAAgC,EAEhC,eAAgC,EAEhC,cAA8B,EAE9B,YAA0B;QARC,cAAS,GAAT,SAAS,CAAW;QAE/C,oBAAe,GAAf,eAAe,CAAiB;QAEhC,oBAAe,GAAf,eAAe,CAAiB;QAEhC,mBAAc,GAAd,cAAc,CAAgB;QAE9B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,MAAM,CAAC,gBAAgB;QACtB,OAAO,wBAAsB,CAAC,aAAa,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,kBAAkB;QACxB,wBAAsB,CAAC,aAAa,GAAG,WAAW,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,KAAa,EAAE,qBAA8B,IAAI;QAC7E,MAAM,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAChC,eAAM,CAAC,KAAK,CAAC,uFAAuF,CAAC,CAAC;QACtG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC;QAChD,MAAM,IAAI,CAAC,SAAS,CAAC,0BAA0B,EAAE,CAAC;QAClD,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,IAAI,CAAC,eAAe,CAAC,6BAA6B,CAAC,kBAAkB,CAAC,CAAC;QAC7E,wBAAsB,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,EAAE,CAAC;QACxF,MAAM,IAAI,CAAC,eAAe,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,IAAI,CAAC,eAAe,CAAC,4BAA4B,CAAC,wBAAsB,CAAC,UAAU,EAAE,qCAAiB,CAAC,mBAAmB,CAAC,CAAC;IACnI,CAAC;IAED,KAAK,CAAC,uCAAuC,CAC5C,UAAkB,EAClB,UAAmB,EACnB,qBAA8B,IAAI;QAElC,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAChC,eAAM,CAAC,KAAK,CAAC,uFAAuF,CAAC,CAAC;QACtG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC;QAChD,MAAM,IAAI,CAAC,SAAS,CAAC,0BAA0B,EAAE,CAAC;QAClD,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,IAAI,CAAC,eAAe,CAAC,6BAA6B,CAAC,kBAAkB,CAAC,CAAC;QAC7E,wBAAsB,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,EAAE,CAAC;QACxF,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACxE,MAAM,IAAI,CAAC,eAAe,CAAC,4BAA4B,CAAC,wBAAsB,CAAC,UAAU,EAAE,qCAAiB,CAAC,mBAAmB,CAAC,CAAC;IACnI,CAAC;IAED,KAAK,CAAC,8CAA8C,CAAC,KAAa;QACjE,eAAM,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;QACvE,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,SAAS,CAAC,+BAA+B,EAAE,CAAC;QACvD,MAAM,IAAI,CAAC,SAAS,CAAC,+BAA+B,EAAE,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,mCAAmC;QACxC,MAAM,OAAO,GAAW,qCAAiB,CAAC,mCAAmC,CAAC;QAC9E,MAAM,OAAO,GAAW,qCAAiB,CAAC,2BAA2B,CAAC;QACtE,MAAM,QAAQ,GAAW,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;QAEtD,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;YAC1C,IAAI;gBACH,MAAM,4BAA4B,GAAW,MAAM,IAAI,CAAC,YAAY;qBAClE,SAAS,EAAE;qBACX,WAAW,CAAC,wBAAsB,CAAC,cAAc,CAAC;qBAClD,OAAO,EAAE,CAAC;gBACZ,eAAM,CAAC,KAAK,CAAC,yCAAyC,4BAA4B,EAAE,CAAC,CAAC;gBACtF,4BAA4B;gBAC5B,wBAAsB,CAAC,aAAa,GAAG,4BAA4B,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;gBACnH,eAAM,CAAC,KAAK,CAAC,yCAAyC,wBAAsB,CAAC,aAAa,EAAE,CAAC,CAAC;gBAC9F,MAAM;aACN;YAAC,OAAO,GAAG,EAAE;gBACb,IAAI,GAAG,YAAY,0BAAK,CAAC,0BAA0B,EAAE;oBACpD,eAAM,CAAC,KAAK,CAAC,gGAAgG,CAAC,CAAC;oBAC/G,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACtC,SAAS;iBACT;gBACD,IAAI,GAAG,YAAY,0BAAK,CAAC,kBAAkB,EAAE;oBAC5C,eAAM,CAAC,KAAK,CAAC,qFAAqF,CAAC,CAAC;oBACpG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACtC,SAAS;iBACT;gBACD,eAAM,CAAC,KAAK,CAAC,4DAA4D,GAAG,EAAE,CAAC,CAAC;gBAChF,MAAM,GAAG,CAAC;aACV;SACD;QACD,IAAI,wBAAsB,CAAC,aAAa,KAAK,EAAE,IAAI,wBAAsB,CAAC,aAAa,KAAK,WAAW,EAAE;YACxG,eAAM,CAAC,IAAI,CAAC,uDAAuD,wBAAsB,CAAC,aAAa,EAAE,CAAC,CAAC;YAC3G,OAAO;SACP;QACD,eAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAChD,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACnC,MAAM,IAAI,0BAAK,CAAC,oBAAoB,CAAC,6FAA6F,CAAC,CAAC;IACrI,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,aAAqB;QACxC,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,aAAqB;QAC1C,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,aAAa,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,aAAqB;QACjD,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,aAAa,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,qBAAqB;QAC1B,MAAM,MAAM,GAAW,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACvD,MAAM,UAAU,GAAW,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC/D,MAAM,gBAAgB,GAAW,MAAM,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAE3E,eAAM,CAAC,IAAI,CAAC,0BAA0B,GAAG,MAAM,CAAC,CAAC;QACjD,eAAM,CAAC,IAAI,CAAC,kCAAkC,GAAG,UAAU,CAAC,CAAC;QAC7D,eAAM,CAAC,IAAI,CAAC,wCAAwC,GAAG,gBAAgB,CAAC,CAAC;IAC1E,CAAC;IAEO,KAAK,CAAC,4BAA4B;QACzC,IAAI;YACH,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,wBAAsB,CAAC,2BAA2B,CAAC,CAAC,OAAO,EAAE,CAAC;SACrH;QAAC,OAAO,GAAG,EAAE;YACb,OAAO,WAAW,CAAC;SACnB;IACF,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC/B,IAAI;YACH,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,wBAAsB,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,CAAC;SAC1G;QAAC,OAAO,GAAG,EAAE;YACb,OAAO,WAAW,CAAC;SACnB;IACF,CAAC;IAEO,KAAK,CAAC,sBAAsB;QACnC,IAAI;YACH,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,wBAAsB,CAAC,qBAAqB,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;SAC/H;QAAC,OAAO,GAAG,EAAE;YACb,OAAO,WAAW,CAAC;SACnB;IACF,CAAC;;AAtJc,qCAAc,GAAO,uBAAE,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;AACzE,uCAAgB,GAAO,uBAAE,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;AAC1E,4CAAqB,GAAO,uBAAE,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;AACzE,kDAA2B,GAAO,uBAAE,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;AACxF,oCAAa,GAAW,WAAW,CAAC;AALvC,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAUV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,SAAS,CAAC,CAAA;IACzB,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,eAAe,CAAC,CAAA;IAE/B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,eAAe,CAAC,CAAA;IAE/B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,cAAc,CAAC,CAAA;IAE9B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAP0B,qBAAS;QAE9B,iCAAe;QAEf,iCAAe;QAEhB,+BAAc;QAEhB,2BAAY;GAjBhC,sBAAsB,CAwJlC;AAxJY,wDAAsB"}
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
import { inject, injectable } from 'inversify';
|
|
12
12
|
import { CLASSES } from '../../configs/inversify.types';
|
|
13
13
|
import { DriverHelper } from '../../utils/DriverHelper';
|
|
14
|
-
import { By, Key } from 'selenium-webdriver';
|
|
14
|
+
import { By, Key, WebElement } from 'selenium-webdriver';
|
|
15
15
|
import { Logger } from '../../utils/Logger';
|
|
16
16
|
import { TIMEOUT_CONSTANTS } from '../../constants/TIMEOUT_CONSTANTS';
|
|
17
17
|
import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
|
|
@@ -24,6 +24,8 @@ export class CreateWorkspace {
|
|
|
24
24
|
private static readonly GIT_BRANCH_NAME: By = By.xpath('//input[@aria-label="Git Branch"]');
|
|
25
25
|
private static readonly PATH_TO_DEVFILE: By = By.xpath('//input[@aria-label="Path to Devfile"]');
|
|
26
26
|
private static readonly CREATE_AND_OPEN_BUTTON: By = By.xpath('//button[@id="create-and-open-button"]');
|
|
27
|
+
private static readonly CREATE_NEW_WORKPACE_CHECKBOX: By = By.xpath('//label[@for="create-new-if-exist-switch"]');
|
|
28
|
+
private static readonly CREATE_NEW_WORKPACE_CHECKBOX_VALUE: By = By.xpath('//input[@id="create-new-if-exist-switch"]');
|
|
27
29
|
|
|
28
30
|
constructor(
|
|
29
31
|
@inject(CLASSES.DriverHelper)
|
|
@@ -109,6 +111,40 @@ export class CreateWorkspace {
|
|
|
109
111
|
}
|
|
110
112
|
}
|
|
111
113
|
|
|
114
|
+
async isCreateNewWorkspaceCheckboxChecked(timeout: number = TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL): Promise<boolean> {
|
|
115
|
+
Logger.debug();
|
|
116
|
+
|
|
117
|
+
const element: WebElement = await this.driverHelper.waitPresence(CreateWorkspace.CREATE_NEW_WORKPACE_CHECKBOX_VALUE, timeout);
|
|
118
|
+
return await element.isSelected();
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
async clickOnCreateNewWorkspaceCheckbox(timeout: number = TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL): Promise<void> {
|
|
122
|
+
Logger.debug();
|
|
123
|
+
|
|
124
|
+
await this.driverHelper.waitAndClick(CreateWorkspace.CREATE_NEW_WORKPACE_CHECKBOX, timeout);
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
async setCreateNewWorkspaceCheckbox(
|
|
128
|
+
checked: boolean = true,
|
|
129
|
+
timeout: number = TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL
|
|
130
|
+
): Promise<void> {
|
|
131
|
+
Logger.debug(`checked: ${checked}`);
|
|
132
|
+
|
|
133
|
+
// check current state
|
|
134
|
+
const isCurrentlyChecked: boolean = await this.isCreateNewWorkspaceCheckboxChecked(timeout);
|
|
135
|
+
|
|
136
|
+
// if already in desired state, do nothing
|
|
137
|
+
if (isCurrentlyChecked === checked) {
|
|
138
|
+
Logger.debug(`Checkbox is already ${checked ? 'set' : 'unset'}, no action needed`);
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
// click to change state
|
|
143
|
+
Logger.debug(`Checkbox is ${isCurrentlyChecked ? 'set' : 'unset'}, ${checked ? 'setting' : 'unsetting'} it now`);
|
|
144
|
+
await this.driverHelper.waitAndClick(CreateWorkspace.CREATE_NEW_WORKPACE_CHECKBOX, timeout);
|
|
145
|
+
await this.driverHelper.wait(1000);
|
|
146
|
+
}
|
|
147
|
+
|
|
112
148
|
private getEditorsDropdownListLocator(sampleName: string): By {
|
|
113
149
|
return By.xpath(`//div[text()=\'${sampleName}\']//parent::article//button`);
|
|
114
150
|
}
|
|
@@ -36,8 +36,8 @@ suite(`The SshUrlNoOauthPatFactory userstory ${BASE_TEST_CONSTANTS.TEST_ENVIRONM
|
|
|
36
36
|
const factoryUrl: string =
|
|
37
37
|
FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL ||
|
|
38
38
|
'ssh://git@bitbucket-ssh.apps.ds-airgap2-v15.crw-qe.com/~admin/private-bb-repo.git';
|
|
39
|
-
const privateSshKeyPath: string =
|
|
40
|
-
const publicSshKeyPath: string =
|
|
39
|
+
const privateSshKeyPath: string = FACTORY_TEST_CONSTANTS.TS_SELENIUM_SSH_PRIVATE_KEY_PATH;
|
|
40
|
+
const publicSshKeyPath: string = FACTORY_TEST_CONSTANTS.TS_SELENIUM_SSH_PUBLIC_KEY_PATH;
|
|
41
41
|
let projectSection: ViewSection;
|
|
42
42
|
|
|
43
43
|
async function deleteSshKeys(): Promise<void> {
|
|
@@ -49,24 +49,30 @@ export class WorkspaceHandlingTests {
|
|
|
49
49
|
WorkspaceHandlingTests.workspaceName = 'undefined';
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
-
async createAndOpenWorkspace(stack: string): Promise<void> {
|
|
52
|
+
async createAndOpenWorkspace(stack: string, createNewWorkspace: boolean = true): Promise<void> {
|
|
53
53
|
await this.dashboard.clickWorkspacesButton();
|
|
54
54
|
await this.dashboard.waitPage();
|
|
55
55
|
Logger.debug('fetching user kubernetes namespace, storing auth token by getting workspaces API URL.');
|
|
56
56
|
await this.apiUrlResolver.getWorkspacesApiUrl();
|
|
57
57
|
await this.dashboard.clickCreateWorkspaceButton();
|
|
58
58
|
await this.createWorkspace.waitPage();
|
|
59
|
+
await this.createWorkspace.setCreateNewWorkspaceCheckbox(createNewWorkspace);
|
|
59
60
|
WorkspaceHandlingTests.parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
|
|
60
61
|
await this.createWorkspace.clickOnSampleNoEditorSelection(stack);
|
|
61
62
|
await this.browserTabsUtil.waitAndSwitchToAnotherWindow(WorkspaceHandlingTests.parentGUID, TIMEOUT_CONSTANTS.TS_IDE_LOAD_TIMEOUT);
|
|
62
63
|
}
|
|
63
64
|
|
|
64
|
-
async createAndOpenWorkspaceFromGitRepository(
|
|
65
|
+
async createAndOpenWorkspaceFromGitRepository(
|
|
66
|
+
factoryUrl: string,
|
|
67
|
+
branchName?: string,
|
|
68
|
+
createNewWorkspace: boolean = true
|
|
69
|
+
): Promise<void> {
|
|
65
70
|
await this.dashboard.waitPage();
|
|
66
71
|
Logger.debug('fetching user kubernetes namespace, storing auth token by getting workspaces API URL.');
|
|
67
72
|
await this.apiUrlResolver.getWorkspacesApiUrl();
|
|
68
73
|
await this.dashboard.clickCreateWorkspaceButton();
|
|
69
74
|
await this.createWorkspace.waitPage();
|
|
75
|
+
await this.createWorkspace.setCreateNewWorkspaceCheckbox(createNewWorkspace);
|
|
70
76
|
WorkspaceHandlingTests.parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
|
|
71
77
|
await this.createWorkspace.importFromGitUsingUI(factoryUrl, branchName);
|
|
72
78
|
await this.browserTabsUtil.waitAndSwitchToAnotherWindow(WorkspaceHandlingTests.parentGUID, TIMEOUT_CONSTANTS.TS_IDE_LOAD_TIMEOUT);
|