@eclipse-che/che-e2e 7.113.0 → 7.114.0-next-8ca713c
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/CODE_STYLE.md +5 -0
- package/dist/pageobjects/dashboard/Dashboard.js +4 -2
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js +2 -1
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -1
- package/dist/utils/workspace/TestWorkspaceUtil.js +6 -4
- package/dist/utils/workspace/TestWorkspaceUtil.js.map +1 -1
- package/package.json +2 -3
- package/pageobjects/dashboard/Dashboard.ts +8 -2
- package/pageobjects/login/kubernetes/DexLoginPage.ts +6 -1
- package/utils/workspace/TestWorkspaceUtil.ts +8 -4
package/CODE_STYLE.md
CHANGED
|
@@ -28,6 +28,7 @@ Automated lint checking and code format performs with ESLint and Prettier tools
|
|
|
28
28
|
### Preferable code style
|
|
29
29
|
|
|
30
30
|
1. Page-object and util classes
|
|
31
|
+
|
|
31
32
|
1. ✔ Class declaration using dependency injection (inversify library)
|
|
32
33
|
|
|
33
34
|
```
|
|
@@ -37,6 +38,7 @@ Automated lint checking and code format performs with ESLint and Prettier tools
|
|
|
37
38
|
```
|
|
38
39
|
|
|
39
40
|
2. Public methods
|
|
41
|
+
|
|
40
42
|
- ✔ Declare public methods without "public "keyword
|
|
41
43
|
- ✔ Add Logger.debug() inside method to log its name (with optional message)
|
|
42
44
|
|
|
@@ -49,6 +51,7 @@ Automated lint checking and code format performs with ESLint and Prettier tools
|
|
|
49
51
|
```
|
|
50
52
|
|
|
51
53
|
3. Locators
|
|
54
|
+
|
|
52
55
|
- ✔ For static locators - private static readonly fields type of By
|
|
53
56
|
|
|
54
57
|
```
|
|
@@ -102,6 +105,7 @@ Automated lint checking and code format performs with ESLint and Prettier tools
|
|
|
102
105
|
```
|
|
103
106
|
|
|
104
107
|
2. Mocha framework
|
|
108
|
+
|
|
105
109
|
- ✔ TDD framework (`suite()`, `test()`)
|
|
106
110
|
- ✔ Inject class instances, declare all test data inside test `suit()` function to avoid unnecessary code execution if test suit will not be run
|
|
107
111
|
|
|
@@ -118,6 +122,7 @@ Automated lint checking and code format performs with ESLint and Prettier tools
|
|
|
118
122
|
- ✔ Use test [./constants](constants) to make test flexible
|
|
119
123
|
|
|
120
124
|
3. Packages
|
|
125
|
+
|
|
121
126
|
1. Add packages as dev dependencies
|
|
122
127
|
2. If any changes re-create package-lock.json before push
|
|
123
128
|
|
|
@@ -121,7 +121,8 @@ let Dashboard = Dashboard_1 = class Dashboard {
|
|
|
121
121
|
}
|
|
122
122
|
async waitStartingPageLoaderDisappearance(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT) {
|
|
123
123
|
Logger_1.Logger.debug();
|
|
124
|
-
|
|
124
|
+
const attempts = Math.ceil(timeout / TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
|
|
125
|
+
await this.driverHelper.waitDisappearance(Dashboard_1.STARTING_PAGE_LOADER, attempts, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
|
|
125
126
|
await this.driverHelper.wait(TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
|
|
126
127
|
}
|
|
127
128
|
async closeAboutDialogWindow() {
|
|
@@ -152,7 +153,8 @@ let Dashboard = Dashboard_1 = class Dashboard {
|
|
|
152
153
|
await this.openDashboard();
|
|
153
154
|
await this.driverHelper.waitAndClick(Dashboard_1.USER_SETTINGS_DROPDOWN, timeout);
|
|
154
155
|
await this.driverHelper.waitAndClick(Dashboard_1.LOGOUT_BUTTON, timeout);
|
|
155
|
-
|
|
156
|
+
const attempts = Math.ceil(timeout / TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
|
|
157
|
+
await this.driverHelper.waitDisappearance(Dashboard_1.USER_SETTINGS_DROPDOWN, attempts, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
|
|
156
158
|
}
|
|
157
159
|
async clickContinueWithDefaultDevfileButton(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT) {
|
|
158
160
|
Logger_1.Logger.debug();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Dashboard.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Dashboard.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,8 @@ let DexLoginPage = DexLoginPage_1 = class DexLoginPage {
|
|
|
52
52
|
}
|
|
53
53
|
async waitDexLoginPageDisappearance() {
|
|
54
54
|
Logger_1.Logger.debug();
|
|
55
|
-
|
|
55
|
+
const attempts = Math.ceil(TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT / TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
|
|
56
|
+
await this.driverHelper.waitDisappearance(DexLoginPage_1.DEX_PAGE_CONTENT_CONTAINER, attempts, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
|
|
56
57
|
}
|
|
57
58
|
};
|
|
58
59
|
DexLoginPage.DEX_PAGE_CONTENT_CONTAINER = selenium_webdriver_1.By.className('dex-container');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DexLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/kubernetes/DexLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,sEAA2D;AAC3D,kDAA+C;AAC/C,2DAAwC;AACxC,4EAAyE;AACzE,8DAA2D;AAGpD,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAMxB,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,gBAAgB;QACrB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,cAAY,CAAC,0BAA0B,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IAClI,CAAC;IAED,KAAK,CAAC,kBAAkB;QACvB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,cAAY,CAAC,aAAa,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,QAAgB;QAC7C,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,cAAY,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,QAAgB;QAC7C,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,cAAY,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,6BAA6B;QAClC,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"DexLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/kubernetes/DexLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,sEAA2D;AAC3D,kDAA+C;AAC/C,2DAAwC;AACxC,4EAAyE;AACzE,8DAA2D;AAGpD,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAMxB,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,gBAAgB;QACrB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,cAAY,CAAC,0BAA0B,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IAClI,CAAC;IAED,KAAK,CAAC,kBAAkB;QACvB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,cAAY,CAAC,aAAa,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,QAAgB;QAC7C,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,cAAY,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,QAAgB;QAC7C,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,cAAY,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,6BAA6B;QAClC,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,QAAQ,GAAW,IAAI,CAAC,IAAI,CAAC,qCAAiB,CAAC,6BAA6B,GAAG,qCAAiB,CAAC,2BAA2B,CAAC,CAAC;QACpI,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CACxC,cAAY,CAAC,0BAA0B,EACvC,QAAQ,EACR,qCAAiB,CAAC,2BAA2B,CAC7C,CAAC;IACH,CAAC;;AA3CuB,uCAA0B,GAAO,uBAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;AAC/D,wBAAW,GAAO,uBAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;AACjC,2BAAc,GAAO,uBAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;AACvC,0BAAa,GAAO,uBAAE,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;AAJtD,YAAY;IADxB,IAAA,sBAAU,GAAE;IAQV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GARhC,YAAY,CA6CxB;AA7CY,oCAAY"}
|
|
@@ -99,10 +99,10 @@ let TestWorkspaceUtil = class TestWorkspaceUtil {
|
|
|
99
99
|
}
|
|
100
100
|
catch (error) {
|
|
101
101
|
if (axios_1.default.isAxiosError(error) && error.response?.status === 404) {
|
|
102
|
-
Logger_1.Logger.
|
|
103
|
-
|
|
102
|
+
Logger_1.Logger.info(`Workspace ${workspaceName} not found, already deleted`);
|
|
103
|
+
return;
|
|
104
104
|
}
|
|
105
|
-
Logger_1.Logger.error(`delete workspace call failed. URL used: ${
|
|
105
|
+
Logger_1.Logger.error(`delete workspace call failed. URL used: ${deleteWorkspaceApiUrl}`);
|
|
106
106
|
throw error;
|
|
107
107
|
}
|
|
108
108
|
if (deleteWorkspaceResponse.status !== 204) {
|
|
@@ -111,13 +111,15 @@ let TestWorkspaceUtil = class TestWorkspaceUtil {
|
|
|
111
111
|
for (let i = 0; i < this.attempts; i++) {
|
|
112
112
|
try {
|
|
113
113
|
deleteWorkspaceResponse = await this.processRequestHandler.get(deleteWorkspaceApiUrl);
|
|
114
|
+
Logger_1.Logger.trace(`GET ${deleteWorkspaceApiUrl} returned status: ${deleteWorkspaceResponse.status}; data: ${deleteWorkspaceResponse.data}`);
|
|
114
115
|
}
|
|
115
116
|
catch (error) {
|
|
116
|
-
if (axios_1.default.isAxiosError(error) && error.response?.status === 404) {
|
|
117
|
+
if (axios_1.default.isAxiosError(error) && (error.response?.status === 404 || error.response?.status === 500)) {
|
|
117
118
|
deleteWorkspaceStatus = true;
|
|
118
119
|
Logger_1.Logger.debug(`${workspaceName} deleted successfully`);
|
|
119
120
|
break;
|
|
120
121
|
}
|
|
122
|
+
Logger_1.Logger.trace(`GET ${deleteWorkspaceApiUrl} threw error: ${error}`);
|
|
121
123
|
}
|
|
122
124
|
await this.driverHelper.wait(this.polling);
|
|
123
125
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TestWorkspaceUtil.js","sourceRoot":"","sources":["../../../utils/workspace/TestWorkspaceUtil.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TestWorkspaceUtil.js","sourceRoot":"","sources":["../../../utils/workspace/TestWorkspaceUtil.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-che/che-e2e",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.114.0-next-8ca713c",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -66,8 +66,7 @@
|
|
|
66
66
|
"dependencies": {
|
|
67
67
|
"@eclipse-che/api": "latest",
|
|
68
68
|
"inversify": "6.0.1",
|
|
69
|
-
"reflect-metadata": "0.1.13"
|
|
70
|
-
"@eclipse-che/che-devworkspace-generator": "7.113.0"
|
|
69
|
+
"reflect-metadata": "0.1.13"
|
|
71
70
|
},
|
|
72
71
|
"resolutions": {
|
|
73
72
|
"minimist": "^1.2.5"
|
|
@@ -168,7 +168,8 @@ export class Dashboard {
|
|
|
168
168
|
async waitStartingPageLoaderDisappearance(timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
|
|
169
169
|
Logger.debug();
|
|
170
170
|
|
|
171
|
-
|
|
171
|
+
const attempts: number = Math.ceil(timeout / TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
|
|
172
|
+
await this.driverHelper.waitDisappearance(Dashboard.STARTING_PAGE_LOADER, attempts, TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
|
|
172
173
|
await this.driverHelper.wait(TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
|
|
173
174
|
}
|
|
174
175
|
|
|
@@ -211,7 +212,12 @@ export class Dashboard {
|
|
|
211
212
|
await this.openDashboard();
|
|
212
213
|
await this.driverHelper.waitAndClick(Dashboard.USER_SETTINGS_DROPDOWN, timeout);
|
|
213
214
|
await this.driverHelper.waitAndClick(Dashboard.LOGOUT_BUTTON, timeout);
|
|
214
|
-
|
|
215
|
+
const attempts: number = Math.ceil(timeout / TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
|
|
216
|
+
await this.driverHelper.waitDisappearance(
|
|
217
|
+
Dashboard.USER_SETTINGS_DROPDOWN,
|
|
218
|
+
attempts,
|
|
219
|
+
TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING
|
|
220
|
+
);
|
|
215
221
|
}
|
|
216
222
|
|
|
217
223
|
async clickContinueWithDefaultDevfileButton(timeout: number = TIMEOUT_CONSTANTS.TS_CLICK_DASHBOARD_ITEM_TIMEOUT): Promise<void> {
|
|
@@ -54,6 +54,11 @@ export class DexLoginPage {
|
|
|
54
54
|
async waitDexLoginPageDisappearance(): Promise<void> {
|
|
55
55
|
Logger.debug();
|
|
56
56
|
|
|
57
|
-
|
|
57
|
+
const attempts: number = Math.ceil(TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT / TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING);
|
|
58
|
+
await this.driverHelper.waitDisappearance(
|
|
59
|
+
DexLoginPage.DEX_PAGE_CONTENT_CONTAINER,
|
|
60
|
+
attempts,
|
|
61
|
+
TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING
|
|
62
|
+
);
|
|
58
63
|
}
|
|
59
64
|
}
|
|
@@ -103,10 +103,10 @@ export class TestWorkspaceUtil implements ITestWorkspaceUtil {
|
|
|
103
103
|
deleteWorkspaceResponse = await this.processRequestHandler.delete(deleteWorkspaceApiUrl);
|
|
104
104
|
} catch (error) {
|
|
105
105
|
if (axios.isAxiosError(error) && error.response?.status === 404) {
|
|
106
|
-
Logger.
|
|
107
|
-
|
|
106
|
+
Logger.info(`Workspace ${workspaceName} not found, already deleted`);
|
|
107
|
+
return;
|
|
108
108
|
}
|
|
109
|
-
Logger.error(`delete workspace call failed. URL used: ${
|
|
109
|
+
Logger.error(`delete workspace call failed. URL used: ${deleteWorkspaceApiUrl}`);
|
|
110
110
|
throw error;
|
|
111
111
|
}
|
|
112
112
|
|
|
@@ -117,12 +117,16 @@ export class TestWorkspaceUtil implements ITestWorkspaceUtil {
|
|
|
117
117
|
for (let i: number = 0; i < this.attempts; i++) {
|
|
118
118
|
try {
|
|
119
119
|
deleteWorkspaceResponse = await this.processRequestHandler.get(deleteWorkspaceApiUrl);
|
|
120
|
+
Logger.trace(
|
|
121
|
+
`GET ${deleteWorkspaceApiUrl} returned status: ${deleteWorkspaceResponse.status}; data: ${deleteWorkspaceResponse.data}`
|
|
122
|
+
);
|
|
120
123
|
} catch (error) {
|
|
121
|
-
if (axios.isAxiosError(error) && error.response?.status === 404) {
|
|
124
|
+
if (axios.isAxiosError(error) && (error.response?.status === 404 || error.response?.status === 500)) {
|
|
122
125
|
deleteWorkspaceStatus = true;
|
|
123
126
|
Logger.debug(`${workspaceName} deleted successfully`);
|
|
124
127
|
break;
|
|
125
128
|
}
|
|
129
|
+
Logger.trace(`GET ${deleteWorkspaceApiUrl} threw error: ${error}`);
|
|
126
130
|
}
|
|
127
131
|
await this.driverHelper.wait(this.polling);
|
|
128
132
|
}
|