@eclipse-che/che-e2e 7.43.0-dev-41be804 → 7.43.0-dev-fc26d86
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/openshift/CheLoginPage.js +3 -3
- package/dist/pageobjects/openshift/CheLoginPage.js.map +1 -1
- package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js +5 -1
- package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js.map +1 -1
- package/dist/utils/requestHandlers/CheApiRequestHandler.js +27 -6
- package/dist/utils/requestHandlers/CheApiRequestHandler.js.map +1 -1
- package/package.json +3 -3
- package/pageobjects/openshift/CheLoginPage.ts +3 -3
- package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts +3 -1
- package/utils/requestHandlers/CheApiRequestHandler.ts +27 -6
|
@@ -35,11 +35,11 @@ let CheLoginPage = class CheLoginPage {
|
|
|
35
35
|
}
|
|
36
36
|
async waitEclipseCheLoginFormPage() {
|
|
37
37
|
Logger_1.Logger.debug('CheLoginPage.waitEclipseCheLoginFormPage');
|
|
38
|
-
await this.driverHelper.waitVisibility(selenium_webdriver_1.By.id('
|
|
38
|
+
await this.driverHelper.waitVisibility(selenium_webdriver_1.By.id('login'), TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
39
39
|
}
|
|
40
40
|
async inputUserNameEclipseCheLoginPage(userName) {
|
|
41
41
|
Logger_1.Logger.debug(`CheLoginPage.inputUserNameEclipseCheLoginPage username: "${userName}"`);
|
|
42
|
-
await this.driverHelper.enterValue(selenium_webdriver_1.By.id('
|
|
42
|
+
await this.driverHelper.enterValue(selenium_webdriver_1.By.id('login'), userName);
|
|
43
43
|
}
|
|
44
44
|
async inputPaswordEclipseCheLoginPage(passw) {
|
|
45
45
|
Logger_1.Logger.debug(`CheLoginPage.inputPaswordEclipseCheLoginPage password: "${passw}"`);
|
|
@@ -47,7 +47,7 @@ let CheLoginPage = class CheLoginPage {
|
|
|
47
47
|
}
|
|
48
48
|
async clickEclipseCheLoginButton() {
|
|
49
49
|
Logger_1.Logger.debug('CheLoginPage.clickEclipseCheLoginButton');
|
|
50
|
-
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.id('
|
|
50
|
+
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.id('submit-login'));
|
|
51
51
|
}
|
|
52
52
|
async isFirstBrokerLoginPageVisible() {
|
|
53
53
|
Logger_1.Logger.debug('CheLoginPage.waitFirstBrokerLoginPage');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheLoginPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/CheLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwD;AACxD,2DAAgD;AAChD,2DAAwC;AACxC,+CAA4C;AAC5C,6DAA0D;AAG1D,IAAa,YAAY,GAAzB,MAAa,YAAY;IAErB,YACmD,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAI,CAAC;IAElF,KAAK,CAAC,2BAA2B;QACzB,eAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAEzD,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,uBAAE,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"CheLoginPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/CheLoginPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -131,7 +131,7 @@ suite('Language server validation', async () => {
|
|
|
131
131
|
});
|
|
132
132
|
suite('Validation of workspace build and run', async () => {
|
|
133
133
|
test('Build application', async () => {
|
|
134
|
-
const taskName = 'build';
|
|
134
|
+
const taskName = 'maven-build';
|
|
135
135
|
await topMenu.runTask(`${taskName}, ${globalTaskScope}`);
|
|
136
136
|
await terminal.waitIconSuccess(taskName, 500000);
|
|
137
137
|
});
|
|
@@ -256,6 +256,10 @@ async function sendRequestToDebugApp(urlToApp) {
|
|
|
256
256
|
if (error.message === 'timeout of 1000ms exceeded') {
|
|
257
257
|
console.log('>>>>The debugger is set >>>>>>>>>>>>>>>>>>> ' + error.message);
|
|
258
258
|
}
|
|
259
|
+
else {
|
|
260
|
+
const { data } = await httpClient.get(urlToApp);
|
|
261
|
+
console.log('>>>>>>>seems the app. is not set under debug properly: >>>>>>>>>>>>>>' + data);
|
|
262
|
+
}
|
|
259
263
|
}
|
|
260
264
|
}
|
|
261
265
|
async function waitDebugToConnect() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevWorkspaceHappyPath.spec.js","sourceRoot":"","sources":["../../../tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DevWorkspaceHappyPath.spec.js","sourceRoot":"","sources":["../../../tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,7 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
29
29
|
const TestConstants_1 = require("../../TestConstants");
|
|
30
30
|
const inversify_types_1 = require("../../inversify.types");
|
|
31
31
|
const inversify_1 = require("inversify");
|
|
32
|
+
const Logger_1 = require("../Logger");
|
|
32
33
|
let CheApiRequestHandler = class CheApiRequestHandler {
|
|
33
34
|
constructor(headerHandler) {
|
|
34
35
|
this.headerHandler = headerHandler;
|
|
@@ -37,15 +38,23 @@ let CheApiRequestHandler = class CheApiRequestHandler {
|
|
|
37
38
|
* This method adds a request interceptor into axios request interceptors list and returns an ID of the interceptor
|
|
38
39
|
*/
|
|
39
40
|
static enableRequestInteceptor() {
|
|
40
|
-
|
|
41
|
+
Logger_1.Logger.debug(`CheApiRequestHandler.enableRequestInterceptor`);
|
|
41
42
|
return axios_1.default.interceptors.request.use(request => {
|
|
42
43
|
try {
|
|
43
44
|
let request_censored = JSON.parse(JSON.stringify(request));
|
|
45
|
+
if (request_censored === undefined) {
|
|
46
|
+
Logger_1.Logger.error('JSON.parse returned an undefined object, cannot process request');
|
|
47
|
+
return request;
|
|
48
|
+
}
|
|
49
|
+
if (request_censored.headers === undefined) {
|
|
50
|
+
Logger_1.Logger.warn('Request does not contain any headers object');
|
|
51
|
+
return request;
|
|
52
|
+
}
|
|
44
53
|
request_censored.headers.Authorization = 'CENSORED';
|
|
45
|
-
|
|
54
|
+
Logger_1.Logger.info(`RequestHandler request:\n` + request_censored);
|
|
46
55
|
}
|
|
47
56
|
catch (err) {
|
|
48
|
-
|
|
57
|
+
Logger_1.Logger.error(`RequestHandler request: Failed to deep clone AxiosRequestConfig:` + err);
|
|
49
58
|
}
|
|
50
59
|
return request;
|
|
51
60
|
});
|
|
@@ -54,7 +63,7 @@ let CheApiRequestHandler = class CheApiRequestHandler {
|
|
|
54
63
|
* This method adds a response interceptor into axios response interceptors list and returns an ID of the interceptor
|
|
55
64
|
*/
|
|
56
65
|
static enableResponseInterceptor() {
|
|
57
|
-
|
|
66
|
+
Logger_1.Logger.debug(`CheApiRequestHandler.enableResponseRedirects`);
|
|
58
67
|
return axios_1.default.interceptors.response.use(response => {
|
|
59
68
|
try {
|
|
60
69
|
let response_censored = JSON.parse(JSON.stringify(response, (key, value) => {
|
|
@@ -63,6 +72,18 @@ let CheApiRequestHandler = class CheApiRequestHandler {
|
|
|
63
72
|
default: return value;
|
|
64
73
|
}
|
|
65
74
|
}));
|
|
75
|
+
if (response_censored === undefined) {
|
|
76
|
+
Logger_1.Logger.error('JSON.parse returned an undefined object, cannot process response');
|
|
77
|
+
return response;
|
|
78
|
+
}
|
|
79
|
+
if (response_censored.config === undefined) {
|
|
80
|
+
Logger_1.Logger.warn('Response does not contain any config object');
|
|
81
|
+
return response;
|
|
82
|
+
}
|
|
83
|
+
if (response_censored.config.headers === undefined) {
|
|
84
|
+
Logger_1.Logger.warn('Response does not contain any config.headers object');
|
|
85
|
+
return response;
|
|
86
|
+
}
|
|
66
87
|
response_censored.config.headers.Authorization = 'CENSORED';
|
|
67
88
|
if (response_censored.data.access_token != null) {
|
|
68
89
|
response_censored.data.access_token = 'CENSORED';
|
|
@@ -70,10 +91,10 @@ let CheApiRequestHandler = class CheApiRequestHandler {
|
|
|
70
91
|
if (response_censored.data.refresh_token != null) {
|
|
71
92
|
response_censored.data.refresh_token = 'CENSORED';
|
|
72
93
|
}
|
|
73
|
-
|
|
94
|
+
Logger_1.Logger.info(`RequestHandler response:\n` + response_censored);
|
|
74
95
|
}
|
|
75
96
|
catch (err) {
|
|
76
|
-
|
|
97
|
+
Logger_1.Logger.error(`RequestHandler response: Failed to deep clone AxiosResponse:` + err);
|
|
77
98
|
}
|
|
78
99
|
return response;
|
|
79
100
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheApiRequestHandler.js","sourceRoot":"","sources":["../../../utils/requestHandlers/CheApiRequestHandler.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;;;AAExE,kDAAiE;AACjE,uDAAoD;AACpD,2DAA8C;AAC9C,yCAA+C;
|
|
1
|
+
{"version":3,"file":"CheApiRequestHandler.js","sourceRoot":"","sources":["../../../utils/requestHandlers/CheApiRequestHandler.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.43.0-dev-
|
|
3
|
+
"version": "7.43.0-dev-fc26d86",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -37,9 +37,9 @@
|
|
|
37
37
|
"@types/node": "11.13.4",
|
|
38
38
|
"@types/rimraf": "2.0.2",
|
|
39
39
|
"@types/selenium-webdriver": "3.0.16",
|
|
40
|
-
"axios": "0.
|
|
40
|
+
"axios": "^0.25.0",
|
|
41
41
|
"chai": "4.2.0",
|
|
42
|
-
"chromedriver": "
|
|
42
|
+
"chromedriver": "97.0.0",
|
|
43
43
|
"mocha": "^9.1.3",
|
|
44
44
|
"rimraf": "2.6.2",
|
|
45
45
|
"selenium-webdriver": "3.6.0",
|
|
@@ -24,13 +24,13 @@ export class CheLoginPage {
|
|
|
24
24
|
async waitEclipseCheLoginFormPage() {
|
|
25
25
|
Logger.debug('CheLoginPage.waitEclipseCheLoginFormPage');
|
|
26
26
|
|
|
27
|
-
await this.driverHelper.waitVisibility(By.id('
|
|
27
|
+
await this.driverHelper.waitVisibility(By.id('login'), TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
async inputUserNameEclipseCheLoginPage(userName: string) {
|
|
31
31
|
Logger.debug(`CheLoginPage.inputUserNameEclipseCheLoginPage username: "${userName}"`);
|
|
32
32
|
|
|
33
|
-
await this.driverHelper.enterValue(By.id('
|
|
33
|
+
await this.driverHelper.enterValue(By.id('login'), userName);
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
async inputPaswordEclipseCheLoginPage(passw: string) {
|
|
@@ -42,7 +42,7 @@ export class CheLoginPage {
|
|
|
42
42
|
async clickEclipseCheLoginButton() {
|
|
43
43
|
Logger.debug('CheLoginPage.clickEclipseCheLoginButton');
|
|
44
44
|
|
|
45
|
-
await this.driverHelper.waitAndClick(By.id('
|
|
45
|
+
await this.driverHelper.waitAndClick(By.id('submit-login'));
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
async isFirstBrokerLoginPageVisible(): Promise<boolean> {
|
|
@@ -138,7 +138,7 @@ suite('Workspace creation via factory url', async () => {
|
|
|
138
138
|
});
|
|
139
139
|
suite('Validation of workspace build and run', async () => {
|
|
140
140
|
test('Build application', async () => {
|
|
141
|
-
const taskName: string = 'build';
|
|
141
|
+
const taskName: string = 'maven-build';
|
|
142
142
|
await topMenu.runTask(`${taskName}, ${globalTaskScope}`);
|
|
143
143
|
await terminal.waitIconSuccess(taskName, 500_000);
|
|
144
144
|
});
|
|
@@ -275,6 +275,8 @@ async function sendRequestToDebugApp(urlToApp: string) {
|
|
|
275
275
|
} catch (error) {
|
|
276
276
|
if (error.message === 'timeout of 1000ms exceeded') {
|
|
277
277
|
console.log('>>>>The debugger is set >>>>>>>>>>>>>>>>>>> ' + error.message);
|
|
278
|
+
} else { const {data} = await httpClient.get(urlToApp);
|
|
279
|
+
console.log('>>>>>>>seems the app. is not set under debug properly: >>>>>>>>>>>>>>' + data);
|
|
278
280
|
}
|
|
279
281
|
}
|
|
280
282
|
}
|
|
@@ -13,6 +13,7 @@ import { TestConstants } from '../../TestConstants';
|
|
|
13
13
|
import { TYPES } from '../../inversify.types';
|
|
14
14
|
import { inject, injectable } from 'inversify';
|
|
15
15
|
import { IAuthorizationHeaderHandler } from './headers/IAuthorizationHeaderHandler';
|
|
16
|
+
import { Logger } from '../Logger';
|
|
16
17
|
|
|
17
18
|
@injectable()
|
|
18
19
|
export class CheApiRequestHandler {
|
|
@@ -21,14 +22,22 @@ export class CheApiRequestHandler {
|
|
|
21
22
|
* This method adds a request interceptor into axios request interceptors list and returns an ID of the interceptor
|
|
22
23
|
*/
|
|
23
24
|
public static enableRequestInteceptor(): number {
|
|
24
|
-
|
|
25
|
+
Logger.debug(`CheApiRequestHandler.enableRequestInterceptor`);
|
|
25
26
|
return axios.interceptors.request.use( request => {
|
|
26
27
|
try {
|
|
27
28
|
let request_censored: AxiosRequestConfig = JSON.parse(JSON.stringify(request));
|
|
29
|
+
if (request_censored === undefined) {
|
|
30
|
+
Logger.error('JSON.parse returned an undefined object, cannot process request');
|
|
31
|
+
return request;
|
|
32
|
+
}
|
|
33
|
+
if (request_censored.headers === undefined) {
|
|
34
|
+
Logger.warn('Request does not contain any headers object');
|
|
35
|
+
return request;
|
|
36
|
+
}
|
|
28
37
|
request_censored.headers.Authorization = 'CENSORED';
|
|
29
|
-
|
|
38
|
+
Logger.info(`RequestHandler request:\n` + request_censored);
|
|
30
39
|
} catch (err) {
|
|
31
|
-
|
|
40
|
+
Logger.error(`RequestHandler request: Failed to deep clone AxiosRequestConfig:` + err);
|
|
32
41
|
}
|
|
33
42
|
return request;
|
|
34
43
|
});
|
|
@@ -38,7 +47,7 @@ export class CheApiRequestHandler {
|
|
|
38
47
|
* This method adds a response interceptor into axios response interceptors list and returns an ID of the interceptor
|
|
39
48
|
*/
|
|
40
49
|
public static enableResponseInterceptor(): number {
|
|
41
|
-
|
|
50
|
+
Logger.debug(`CheApiRequestHandler.enableResponseRedirects`);
|
|
42
51
|
return axios.interceptors.response.use( response => {
|
|
43
52
|
try {
|
|
44
53
|
let response_censored: AxiosResponse = JSON.parse(JSON.stringify(response, (key, value) => {
|
|
@@ -47,6 +56,18 @@ export class CheApiRequestHandler {
|
|
|
47
56
|
default: return value;
|
|
48
57
|
}
|
|
49
58
|
}));
|
|
59
|
+
if (response_censored === undefined) {
|
|
60
|
+
Logger.error('JSON.parse returned an undefined object, cannot process response');
|
|
61
|
+
return response;
|
|
62
|
+
}
|
|
63
|
+
if (response_censored.config === undefined) {
|
|
64
|
+
Logger.warn('Response does not contain any config object');
|
|
65
|
+
return response;
|
|
66
|
+
}
|
|
67
|
+
if (response_censored.config.headers === undefined) {
|
|
68
|
+
Logger.warn('Response does not contain any config.headers object');
|
|
69
|
+
return response;
|
|
70
|
+
}
|
|
50
71
|
response_censored.config.headers.Authorization = 'CENSORED';
|
|
51
72
|
if (response_censored.data.access_token != null) {
|
|
52
73
|
response_censored.data.access_token = 'CENSORED';
|
|
@@ -54,9 +75,9 @@ export class CheApiRequestHandler {
|
|
|
54
75
|
if (response_censored.data.refresh_token != null) {
|
|
55
76
|
response_censored.data.refresh_token = 'CENSORED';
|
|
56
77
|
}
|
|
57
|
-
|
|
78
|
+
Logger.info(`RequestHandler response:\n` + response_censored);
|
|
58
79
|
} catch (err) {
|
|
59
|
-
|
|
80
|
+
Logger.error(`RequestHandler response: Failed to deep clone AxiosResponse:` + err);
|
|
60
81
|
}
|
|
61
82
|
return response;
|
|
62
83
|
});
|