@eclipse-che/che-e2e 7.116.0-next-b9af639 → 7.116.0-next-6acaeda
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.
|
@@ -56,14 +56,16 @@ let CreateWorkspace = CreateWorkspace_1 = class CreateWorkspace {
|
|
|
56
56
|
const sampleLocator = this.getSampleWithSpecificEditorLocator(sampleName);
|
|
57
57
|
await this.driverHelper.waitAndClick(sampleLocator, timeout);
|
|
58
58
|
}
|
|
59
|
-
async importFromGitUsingUI(factoryUrl, branchName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.
|
|
59
|
+
async importFromGitUsingUI(factoryUrl, branchName, timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
60
60
|
Logger_1.Logger.debug(`factoryUrl: "${factoryUrl}"`);
|
|
61
61
|
await this.driverHelper.waitVisibility(CreateWorkspace_1.FACTORY_URL, timeout);
|
|
62
62
|
await this.driverHelper.type(CreateWorkspace_1.FACTORY_URL, selenium_webdriver_1.Key.chord(factoryUrl), timeout);
|
|
63
63
|
if (branchName) {
|
|
64
64
|
await this.driverHelper.waitAndClick(CreateWorkspace_1.GIT_REPO_OPTIONS, timeout);
|
|
65
|
-
await this.driverHelper.
|
|
66
|
-
await this.driverHelper.
|
|
65
|
+
await this.driverHelper.waitAndClick(CreateWorkspace_1.GIT_BRANCH_NAME, timeout);
|
|
66
|
+
await this.driverHelper.waitVisibility(CreateWorkspace_1.GIT_BRANCH_SEARCH_FIELD, timeout);
|
|
67
|
+
await this.driverHelper.type(CreateWorkspace_1.GIT_BRANCH_SEARCH_FIELD, selenium_webdriver_1.Key.chord(branchName), timeout);
|
|
68
|
+
await this.driverHelper.waitAndClick(this.getGitBranchListItemLocator(branchName), timeout);
|
|
67
69
|
}
|
|
68
70
|
await this.driverHelper.waitAndClick(CreateWorkspace_1.CREATE_AND_OPEN_BUTTON, timeout);
|
|
69
71
|
await this.performTrustAuthorPopup();
|
|
@@ -154,10 +156,14 @@ let CreateWorkspace = CreateWorkspace_1 = class CreateWorkspace {
|
|
|
154
156
|
Logger_1.Logger.trace(`sampleName: ${sampleName}, used default editor`);
|
|
155
157
|
return selenium_webdriver_1.By.xpath(`//article[contains(@class, 'sample-card')]//div[text()='${sampleName}']`);
|
|
156
158
|
}
|
|
159
|
+
getGitBranchListItemLocator(branchName) {
|
|
160
|
+
return selenium_webdriver_1.By.css(`li[id="${branchName}"] button.pf-c-select__menu-item`);
|
|
161
|
+
}
|
|
157
162
|
};
|
|
158
163
|
CreateWorkspace.FACTORY_URL = selenium_webdriver_1.By.xpath('//input[@id="git-repo-url"]');
|
|
159
164
|
CreateWorkspace.GIT_REPO_OPTIONS = selenium_webdriver_1.By.xpath('//span[text()="Git Repo Options"]');
|
|
160
|
-
CreateWorkspace.GIT_BRANCH_NAME = selenium_webdriver_1.By.xpath('//
|
|
165
|
+
CreateWorkspace.GIT_BRANCH_NAME = selenium_webdriver_1.By.xpath('//div[text()="Select the branch of the Git Repository"]/preceding-sibling::div');
|
|
166
|
+
CreateWorkspace.GIT_BRANCH_SEARCH_FIELD = selenium_webdriver_1.By.css('input[type="search"]');
|
|
161
167
|
CreateWorkspace.PATH_TO_DEVFILE = selenium_webdriver_1.By.xpath('//input[@aria-label="Path to Devfile"]');
|
|
162
168
|
CreateWorkspace.CREATE_AND_OPEN_BUTTON = selenium_webdriver_1.By.xpath('//button[@id="create-and-open-button"]');
|
|
163
169
|
CreateWorkspace.CREATE_NEW_WORKPACE_CHECKBOX = selenium_webdriver_1.By.xpath('//label[@for="create-new-if-exist-switch"]');
|
|
@@ -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,2DAAyD;AACzD,+CAA4C;AAC5C,yEAAsE;AACtE,6EAA0E;AAC1E,yDAAsD;AAG/C,IAAM,eAAe,uBAArB,MAAM,eAAe;
|
|
1
|
+
{"version":3,"file":"CreateWorkspace.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/CreateWorkspace.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -21,7 +21,10 @@ import { TrustAuthorPopup } from './TrustAuthorPopup';
|
|
|
21
21
|
export class CreateWorkspace {
|
|
22
22
|
private static readonly FACTORY_URL: By = By.xpath('//input[@id="git-repo-url"]');
|
|
23
23
|
private static readonly GIT_REPO_OPTIONS: By = By.xpath('//span[text()="Git Repo Options"]');
|
|
24
|
-
private static readonly GIT_BRANCH_NAME: By = By.xpath(
|
|
24
|
+
private static readonly GIT_BRANCH_NAME: By = By.xpath(
|
|
25
|
+
'//div[text()="Select the branch of the Git Repository"]/preceding-sibling::div'
|
|
26
|
+
);
|
|
27
|
+
private static readonly GIT_BRANCH_SEARCH_FIELD: By = By.css('input[type="search"]');
|
|
25
28
|
private static readonly PATH_TO_DEVFILE: By = By.xpath('//input[@aria-label="Path to Devfile"]');
|
|
26
29
|
private static readonly CREATE_AND_OPEN_BUTTON: By = By.xpath('//button[@id="create-and-open-button"]');
|
|
27
30
|
private static readonly CREATE_NEW_WORKPACE_CHECKBOX: By = By.xpath('//label[@for="create-new-if-exist-switch"]');
|
|
@@ -75,7 +78,7 @@ export class CreateWorkspace {
|
|
|
75
78
|
async importFromGitUsingUI(
|
|
76
79
|
factoryUrl: string,
|
|
77
80
|
branchName?: string,
|
|
78
|
-
timeout: number = TIMEOUT_CONSTANTS.
|
|
81
|
+
timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT
|
|
79
82
|
): Promise<void> {
|
|
80
83
|
Logger.debug(`factoryUrl: "${factoryUrl}"`);
|
|
81
84
|
|
|
@@ -85,8 +88,11 @@ export class CreateWorkspace {
|
|
|
85
88
|
if (branchName) {
|
|
86
89
|
await this.driverHelper.waitAndClick(CreateWorkspace.GIT_REPO_OPTIONS, timeout);
|
|
87
90
|
|
|
88
|
-
await this.driverHelper.
|
|
89
|
-
|
|
91
|
+
await this.driverHelper.waitAndClick(CreateWorkspace.GIT_BRANCH_NAME, timeout);
|
|
92
|
+
|
|
93
|
+
await this.driverHelper.waitVisibility(CreateWorkspace.GIT_BRANCH_SEARCH_FIELD, timeout);
|
|
94
|
+
await this.driverHelper.type(CreateWorkspace.GIT_BRANCH_SEARCH_FIELD, Key.chord(branchName), timeout);
|
|
95
|
+
await this.driverHelper.waitAndClick(this.getGitBranchListItemLocator(branchName), timeout);
|
|
90
96
|
}
|
|
91
97
|
|
|
92
98
|
await this.driverHelper.waitAndClick(CreateWorkspace.CREATE_AND_OPEN_BUTTON, timeout);
|
|
@@ -209,4 +215,8 @@ export class CreateWorkspace {
|
|
|
209
215
|
|
|
210
216
|
return By.xpath(`//article[contains(@class, 'sample-card')]//div[text()='${sampleName}']`);
|
|
211
217
|
}
|
|
218
|
+
|
|
219
|
+
private getGitBranchListItemLocator(branchName: string): By {
|
|
220
|
+
return By.css(`li[id="${branchName}"] button.pf-c-select__menu-item`);
|
|
221
|
+
}
|
|
212
222
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** *******************************************************************
|
|
2
|
-
* copyright (c)
|
|
2
|
+
* copyright (c) 2026 Red Hat, Inc.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made
|
|
5
5
|
* available under the terms of the Eclipse Public License 2.0
|