@eclipse-che/che-e2e 7.60.2-dev-11f7295 → 7.60.2-dev-4bd978f
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/dist/pageobjects/dashboard/Dashboard.js +8 -3
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/dashboard/Workspaces.js +18 -0
- package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
- package/dist/pageobjects/openshift/OcpLoginPage.js +1 -1
- package/dist/pageobjects/openshift/OcpLoginPage.js.map +1 -1
- package/package.json +1 -1
- package/pageobjects/dashboard/Dashboard.ts +11 -4
- package/pageobjects/dashboard/Workspaces.ts +23 -3
- package/pageobjects/openshift/OcpLoginPage.ts +1 -1
|
@@ -79,13 +79,17 @@ let Dashboard = Dashboard_1 = class Dashboard {
|
|
|
79
79
|
Logger_1.Logger.debug('Dashboard.clickCreateWorkspaceButton');
|
|
80
80
|
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.xpath(Dashboard_1.CREATE_WORKSPACE_BUTTON_XPATH), timeout);
|
|
81
81
|
}
|
|
82
|
+
async getLoaderAlert(timeout = TimeoutConstants_1.TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT) {
|
|
83
|
+
Logger_1.Logger.debug('Dashboard.getLoaderAlert');
|
|
84
|
+
return await this.driverHelper.waitAndGetText(selenium_webdriver_1.By.xpath(Dashboard_1.LOADER_ALERT_XPATH), timeout);
|
|
85
|
+
}
|
|
82
86
|
async waitLoader(timeout = TimeoutConstants_1.TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT) {
|
|
83
87
|
Logger_1.Logger.debug('Dashboard.waitLoader');
|
|
84
|
-
await this.driverHelper.
|
|
88
|
+
await this.driverHelper.waitAllPresence(selenium_webdriver_1.By.xpath(Dashboard_1.LOADER_PAGE_STEP_TITLES_XPATH), timeout);
|
|
85
89
|
}
|
|
86
90
|
async waitLoaderDisappearance(timeout = TimeoutConstants_1.TimeoutConstants.TS_WAIT_LOADER_ABSENCE_TIMEOUT) {
|
|
87
91
|
Logger_1.Logger.debug('Dashboard.waitLoaderDisappearance');
|
|
88
|
-
await this.driverHelper.waitDisappearance(selenium_webdriver_1.By.
|
|
92
|
+
await this.driverHelper.waitDisappearance(selenium_webdriver_1.By.xpath(Dashboard_1.LOADER_PAGE_STEP_TITLES_XPATH), timeout);
|
|
89
93
|
}
|
|
90
94
|
async waitDisappearanceNavigationMenu(timeout = TimeoutConstants_1.TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
91
95
|
Logger_1.Logger.debug('Dashboard.waitDisappearanceNavigationMenu');
|
|
@@ -102,8 +106,9 @@ let Dashboard = Dashboard_1 = class Dashboard {
|
|
|
102
106
|
};
|
|
103
107
|
Dashboard.WORKSPACES_BUTTON_XPATH = `//div[@id='page-sidebar']//a[contains(text(), 'Workspaces (')]`;
|
|
104
108
|
Dashboard.CREATE_WORKSPACE_BUTTON_XPATH = `//div[@id='page-sidebar']//a[text()='Create Workspace']`;
|
|
105
|
-
Dashboard.
|
|
109
|
+
Dashboard.LOADER_PAGE_STEP_TITLES_XPATH = '//*[@data-testid="step-title"]';
|
|
106
110
|
Dashboard.WORKSPACE_STARTING_PAGE_CSS = '.ide-loader-page';
|
|
111
|
+
Dashboard.LOADER_ALERT_XPATH = '//*[@data-testid="loader-alert"]';
|
|
107
112
|
Dashboard = Dashboard_1 = __decorate([
|
|
108
113
|
inversify_1.injectable(),
|
|
109
114
|
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
@@ -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,2DAAgD;AAChD,2DAAwC;AACxC,2DAAwD;AACxD,uDAAoD;AACpD,6DAA0D;AAC1D,6CAA0C;AAC1C,+CAA4C;AAG5C,IAAa,SAAS,iBAAtB,MAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Dashboard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,4BAA0B;AAC1B,2DAAgD;AAChD,2DAAwC;AACxC,2DAAwD;AACxD,uDAAoD;AACpD,6DAA0D;AAC1D,6CAA0C;AAC1C,+CAA4C;AAG5C,IAAa,SAAS,iBAAtB,MAAa,SAAS;IAOlB,YAA2D,YAA0B,EAC5B,UAAsB;QADpB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,eAAU,GAAV,UAAU,CAAY;IAAI,CAAC;IAEpF,KAAK,CAAC,iBAAiB,CAAC,aAAqB;QACzC,eAAM,CAAC,KAAK,CAAC,gCAAgC,aAAa,GAAG,CAAC,CAAC;QAE/D,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACnC,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QACjC,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC;QAC3D,MAAM,IAAI,CAAC,UAAU,CAAC,8BAA8B,CAAC,aAAa,CAAC,CAAC;QAEpE,MAAM,IAAI,CAAC,UAAU,CAAC,4BAA4B,CAAC,aAAa,CAAC,CAAC;QAClE,MAAM,IAAI,CAAC,UAAU,CAAC,8BAA8B,CAAC,aAAa,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,aAAqB;QAClD,eAAM,CAAC,KAAK,CAAC,yCAAyC,aAAa,GAAG,CAAC,CAAC;QAExE,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACnC,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QACjC,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC;QAC3D,MAAM,IAAI,CAAC,UAAU,CAAC,8BAA8B,CAAC,aAAa,CAAC,CAAC;QACpE,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QACjC,MAAM,IAAI,CAAC,UAAU,CAAC,4BAA4B,CAAC,aAAa,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,aAAqB;QAClD,eAAM,CAAC,KAAK,CAAC,yCAAyC,aAAa,GAAG,CAAC,CAAC;QAExE,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,IAAI,CAAC,UAAU,CAAC,8BAA8B,CAAC,aAAa,CAAC,CAAC;QACpE,MAAM,IAAI,CAAC,UAAU,CAAC,4BAA4B,CAAC,aAAa,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,aAAa;QACf,eAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACxC,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,6BAAa,CAAC,oBAAoB,CAAC,CAAC;QACtF,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;IAE1B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAkB,mCAAgB,CAAC,6BAA6B;QAC3E,eAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAEnC,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,uBAAE,CAAC,KAAK,CAAC,WAAS,CAAC,uBAAuB,CAAC,EAAE,OAAO,CAAC,CAAC;QAC7F,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,uBAAE,CAAC,KAAK,CAAC,WAAS,CAAC,6BAA6B,CAAC,EAAE,OAAO,CAAC,CAAC;IACvG,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,UAAkB,mCAAgB,CAAC,+BAA+B;QAC1F,eAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAEhD,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,uBAAE,CAAC,KAAK,CAAC,WAAS,CAAC,uBAAuB,CAAC,EAAE,OAAO,CAAC,CAAC;IAC/F,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,UAAkB,mCAAgB,CAAC,+BAA+B;QAC/F,eAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAErD,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,uBAAE,CAAC,KAAK,CAAC,WAAS,CAAC,6BAA6B,CAAC,EAAE,OAAO,CAAC,CAAC;IACrG,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,UAAkB,mCAAgB,CAAC,+BAA+B;QACnF,eAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAEzC,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,uBAAE,CAAC,KAAK,CAAC,WAAS,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC,CAAC;IACnG,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,UAAkB,mCAAgB,CAAC,+BAA+B;QAC/E,eAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAErC,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,uBAAE,CAAC,KAAK,CAAC,WAAS,CAAC,6BAA6B,CAAC,EAAE,OAAO,CAAC,CAAC;IACxG,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,UAAkB,mCAAgB,CAAC,8BAA8B;QAC3F,eAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAElD,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,uBAAE,CAAC,KAAK,CAAC,WAAS,CAAC,6BAA6B,CAAC,EAAE,OAAO,CAAC,CAAC;IAC1G,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,UAAkB,mCAAgB,CAAC,gCAAgC;QACrG,eAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAE1D,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,uBAAE,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,UAAkB,mCAAgB,CAAC,gCAAgC;QAC/F,eAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAEpD,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,uBAAE,CAAC,GAAG,CAAC,WAAS,CAAC,2BAA2B,CAAC,EAAE,OAAO,CAAC,CAAC;IACjG,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,UAAkB,mCAAgB,CAAC,gCAAgC;QAC5F,eAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAE9C,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,uBAAE,CAAC,GAAG,CAAC,uCAAuC,CAAC,EAAE,OAAO,CAAC,CAAC;IAC5G,CAAC;CAEJ,CAAA;AAtG2B,iCAAuB,GAAW,gEAAgE,CAAC;AACnG,uCAA6B,GAAW,yDAAyD,CAAC;AAClG,uCAA6B,GAAW,gCAAgC,CAAC;AACzE,qCAA2B,GAAW,kBAAkB,CAAC;AACzD,4BAAkB,GAAG,kCAAkC,CAAC;AALvE,SAAS;IADrB,sBAAU,EAAE;IAQI,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;IAC5B,WAAA,kBAAM,CAAC,yBAAO,CAAC,UAAU,CAAC,CAAA;qCADkC,2BAAY;QAChB,uBAAU;GARtE,SAAS,CAuGrB;AAvGY,8BAAS"}
|
|
@@ -136,6 +136,23 @@ let Workspaces = Workspaces_1 = class Workspaces {
|
|
|
136
136
|
const workspaceListItemLocator = selenium_webdriver_1.By.xpath(this.getWorkspaceListItemLocator(workspaceName));
|
|
137
137
|
await this.driverHelper.waitDisappearance(workspaceListItemLocator, timeout);
|
|
138
138
|
}
|
|
139
|
+
async getAllCreatedWorkspacesNames(timeout = TimeoutConstants_1.TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
140
|
+
Logger_1.Logger.debug('Workspaces.getAllCreatedWorkspacesNames');
|
|
141
|
+
const workspaceNames = [];
|
|
142
|
+
try {
|
|
143
|
+
const workspaceItems = await this.driverHelper.waitAllPresence(selenium_webdriver_1.By.xpath(Workspaces_1.WORKSPACE_ITEM_TABLE_NAME_SECTION_XPATH), timeout);
|
|
144
|
+
for (let item of workspaceItems) {
|
|
145
|
+
Logger_1.Logger.debug(`Workspaces.getAllCreatedWorkspacesNames - try to get ${workspaceItems.indexOf(item)} items name`);
|
|
146
|
+
workspaceNames.push(await item.getText());
|
|
147
|
+
Logger_1.Logger.debug(`Workspaces.getAllCreatedWorkspacesNames - workspace name is "${workspaceNames[workspaceNames.length - 1]}"`);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
catch (e) {
|
|
151
|
+
Logger_1.Logger.debug(`Workspaces.getAllCreatedWorkspacesNames - ${e}`);
|
|
152
|
+
}
|
|
153
|
+
Logger_1.Logger.debug(`Workspaces.getAllCreatedWorkspacesNames - ${workspaceNames.length} workspaces have been created in DevSpaces`);
|
|
154
|
+
return workspaceNames;
|
|
155
|
+
}
|
|
139
156
|
getWorkspaceListItemLocator(workspaceName) {
|
|
140
157
|
return `//tr[td/span/a[text()='${workspaceName}']]`;
|
|
141
158
|
}
|
|
@@ -156,6 +173,7 @@ let Workspaces = Workspaces_1 = class Workspaces {
|
|
|
156
173
|
}
|
|
157
174
|
};
|
|
158
175
|
Workspaces.ADD_WORKSPACE_BUTTON_XPATH = `//button[text()='Add Workspace']`;
|
|
176
|
+
Workspaces.WORKSPACE_ITEM_TABLE_NAME_SECTION_XPATH = `//td[@data-label="Name"]/span/a`;
|
|
159
177
|
Workspaces = Workspaces_1 = __decorate([
|
|
160
178
|
inversify_1.injectable(),
|
|
161
179
|
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
@@ -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,2DAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"Workspaces.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Workspaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,7 +73,7 @@ let OcpLoginPage = OcpLoginPage_1 = class OcpLoginPage {
|
|
|
73
73
|
await this.driverHelper.enterValue(selenium_webdriver_1.By.id('inputUsername'), userName);
|
|
74
74
|
}
|
|
75
75
|
async enterPasswordOpenShift(passw) {
|
|
76
|
-
Logger_1.Logger.debug(`OcpLoginPage.enterPasswordOpenShift
|
|
76
|
+
Logger_1.Logger.debug(`OcpLoginPage.enterPasswordOpenShift"`);
|
|
77
77
|
await this.driverHelper.enterValue(selenium_webdriver_1.By.id('inputPassword'), passw);
|
|
78
78
|
}
|
|
79
79
|
async clickOnLoginButton() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OcpLoginPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwD;AACxD,2DAAgD;AAChD,2DAAwC;AACxC,+CAA4C;AAC5C,uDAAoD;AACpD,6DAA0D;AAG1D,IAAa,YAAY,oBAAzB,MAAa,YAAY;IAIrB,YACmD,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAI,CAAC;IAElF,KAAK,CAAC,sBAAsB,CAAC,GAAW;QACpC,eAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAEpD,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,6BAA6B;QAC/B,eAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAE3D,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,uBAAE,CAAC,KAAK,CAAC,cAAY,CAAC,0BAA0B,CAAC,EAAE,mCAAgB,CAAC,6BAA6B,CAAC,CAAC;IAC9I,CAAC;IAED,KAAK,CAAC,yBAAyB;QAC3B,eAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAEvD,MAAM,yBAAyB,GAAO,uBAAE,CAAC,KAAK,CAAC,gBAAgB,6BAAa,CAAC,gCAAgC,KAAK,CAAC,CAAC;QACpH,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,6BAA6B;QAC/B,eAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAE3D,MAAM,uBAAuB,GAAO,uBAAE,CAAC,KAAK,CAAC,gBAAgB,6BAAa,CAAC,gCAAgC,KAAK,CAAC,CAAC;QAClH,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,uBAAuB,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC3F,CAAC;IAED,KAAK,CAAC,+CAA+C;QACjD,eAAM,CAAC,KAAK,CAAC,8DAA8D,CAAC,CAAC;QAE7E,MAAM,6CAA6C,GAAO,uBAAE,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACxG,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,6CAA6C,CAAC,CAAC;IAC5F,CAAC;IAED,KAAK,CAAC,0CAA0C;QAC5C,eAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;QAExE,MAAM,6CAA6C,GAAO,uBAAE,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACxG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,6CAA6C,EAAE,mCAAgB,CAAC,6BAA6B,CAAC,CAAC;IAC1I,CAAC;IAED,KAAK,CAAC,mCAAmC;QACrC,eAAM,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;QAEpE,MAAM,gCAAgC,GAAO,uBAAE,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QAC/E,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,gCAAgC,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,QAAgB;QACzC,eAAM,CAAC,KAAK,CAAC,wCAAwC,QAAQ,GAAG,CAAC,CAAC;QAElE,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,uBAAE,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,KAAa;QACtC,eAAM,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"OcpLoginPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpLoginPage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -21,11 +21,12 @@ import { Logger } from '../../utils/Logger';
|
|
|
21
21
|
export class Dashboard {
|
|
22
22
|
private static readonly WORKSPACES_BUTTON_XPATH: string = `//div[@id='page-sidebar']//a[contains(text(), 'Workspaces (')]`;
|
|
23
23
|
private static readonly CREATE_WORKSPACE_BUTTON_XPATH: string = `//div[@id='page-sidebar']//a[text()='Create Workspace']`;
|
|
24
|
-
private static readonly
|
|
24
|
+
private static readonly LOADER_PAGE_STEP_TITLES_XPATH: string = '//*[@data-testid="step-title"]';
|
|
25
25
|
private static readonly WORKSPACE_STARTING_PAGE_CSS: string = '.ide-loader-page';
|
|
26
|
+
private static readonly LOADER_ALERT_XPATH = '//*[@data-testid="loader-alert"]';
|
|
26
27
|
|
|
27
28
|
constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
|
|
28
|
-
|
|
29
|
+
@inject(CLASSES.Workspaces) private readonly workspaces: Workspaces) { }
|
|
29
30
|
|
|
30
31
|
async stopWorkspaceByUI(workspaceName: string) {
|
|
31
32
|
Logger.debug(`Dashboard.stopWorkspaceByUI "${workspaceName}"`);
|
|
@@ -84,16 +85,22 @@ export class Dashboard {
|
|
|
84
85
|
await this.driverHelper.waitAndClick(By.xpath(Dashboard.CREATE_WORKSPACE_BUTTON_XPATH), timeout);
|
|
85
86
|
}
|
|
86
87
|
|
|
88
|
+
async getLoaderAlert(timeout: number = TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT) {
|
|
89
|
+
Logger.debug('Dashboard.getLoaderAlert');
|
|
90
|
+
|
|
91
|
+
return await this.driverHelper.waitAndGetText(By.xpath(Dashboard.LOADER_ALERT_XPATH), timeout);
|
|
92
|
+
}
|
|
93
|
+
|
|
87
94
|
async waitLoader(timeout: number = TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT) {
|
|
88
95
|
Logger.debug('Dashboard.waitLoader');
|
|
89
96
|
|
|
90
|
-
await this.driverHelper.
|
|
97
|
+
await this.driverHelper.waitAllPresence(By.xpath(Dashboard.LOADER_PAGE_STEP_TITLES_XPATH), timeout);
|
|
91
98
|
}
|
|
92
99
|
|
|
93
100
|
async waitLoaderDisappearance(timeout: number = TimeoutConstants.TS_WAIT_LOADER_ABSENCE_TIMEOUT) {
|
|
94
101
|
Logger.debug('Dashboard.waitLoaderDisappearance');
|
|
95
102
|
|
|
96
|
-
await this.driverHelper.waitDisappearance(By.
|
|
103
|
+
await this.driverHelper.waitDisappearance(By.xpath(Dashboard.LOADER_PAGE_STEP_TITLES_XPATH), timeout);
|
|
97
104
|
}
|
|
98
105
|
|
|
99
106
|
async waitDisappearanceNavigationMenu(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
import { injectable, inject } from 'inversify';
|
|
12
12
|
import { DriverHelper } from '../../utils/DriverHelper';
|
|
13
13
|
import { CLASSES } from '../../inversify.types';
|
|
14
|
-
import { By } from 'selenium-webdriver';
|
|
14
|
+
import { By, WebElement } from 'selenium-webdriver';
|
|
15
15
|
import { Logger } from '../../utils/Logger';
|
|
16
16
|
import { TimeoutConstants } from '../../TimeoutConstants';
|
|
17
17
|
|
|
@@ -23,8 +23,10 @@ export enum WorkspaceStatusUI {
|
|
|
23
23
|
@injectable()
|
|
24
24
|
export class Workspaces {
|
|
25
25
|
private static readonly ADD_WORKSPACE_BUTTON_XPATH: string = `//button[text()='Add Workspace']`;
|
|
26
|
+
private static readonly WORKSPACE_ITEM_TABLE_NAME_SECTION_XPATH: string = `//td[@data-label="Name"]/span/a`;
|
|
26
27
|
|
|
27
|
-
constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) {
|
|
28
|
+
constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) {
|
|
29
|
+
}
|
|
28
30
|
|
|
29
31
|
async waitPage(timeout: number = TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT) {
|
|
30
32
|
Logger.debug('Workspaces.waitPage');
|
|
@@ -168,6 +170,25 @@ export class Workspaces {
|
|
|
168
170
|
await this.driverHelper.waitDisappearance(workspaceListItemLocator, timeout);
|
|
169
171
|
}
|
|
170
172
|
|
|
173
|
+
async getAllCreatedWorkspacesNames(timeout: number = TimeoutConstants.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
174
|
+
Logger.debug('Workspaces.getAllCreatedWorkspacesNames');
|
|
175
|
+
|
|
176
|
+
const workspaceNames: string[] = [];
|
|
177
|
+
try {
|
|
178
|
+
const workspaceItems: WebElement[] = await this.driverHelper.waitAllPresence(By.xpath(Workspaces.WORKSPACE_ITEM_TABLE_NAME_SECTION_XPATH), timeout);
|
|
179
|
+
for (let item of workspaceItems) {
|
|
180
|
+
Logger.debug(`Workspaces.getAllCreatedWorkspacesNames - try to get ${workspaceItems.indexOf(item)} items name`);
|
|
181
|
+
workspaceNames.push(await item.getText());
|
|
182
|
+
Logger.debug(`Workspaces.getAllCreatedWorkspacesNames - workspace name is "${workspaceNames[workspaceNames.length - 1]}"`);
|
|
183
|
+
}
|
|
184
|
+
} catch (e) {
|
|
185
|
+
Logger.debug(`Workspaces.getAllCreatedWorkspacesNames - ${e}`);
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
Logger.debug(`Workspaces.getAllCreatedWorkspacesNames - ${workspaceNames.length} workspaces have been created in DevSpaces`);
|
|
189
|
+
return workspaceNames;
|
|
190
|
+
}
|
|
191
|
+
|
|
171
192
|
private getWorkspaceListItemLocator(workspaceName: string): string {
|
|
172
193
|
return `//tr[td/span/a[text()='${workspaceName}']]`;
|
|
173
194
|
}
|
|
@@ -191,5 +212,4 @@ export class Workspaces {
|
|
|
191
212
|
private getOpenButtonLocator(workspaceName: string) {
|
|
192
213
|
return By.xpath(`${this.getWorkspaceListItemLocator(workspaceName)}//td[@data-key=5]//a[text()='Open']`);
|
|
193
214
|
}
|
|
194
|
-
|
|
195
215
|
}
|
|
@@ -78,7 +78,7 @@ export class OcpLoginPage {
|
|
|
78
78
|
}
|
|
79
79
|
|
|
80
80
|
async enterPasswordOpenShift(passw: string) {
|
|
81
|
-
Logger.debug(`OcpLoginPage.enterPasswordOpenShift
|
|
81
|
+
Logger.debug(`OcpLoginPage.enterPasswordOpenShift"`);
|
|
82
82
|
|
|
83
83
|
await this.driverHelper.enterValue(By.id('inputPassword'), passw);
|
|
84
84
|
}
|