@eclipse-che/che-e2e 7.46.1-dev-a471b4b → 7.46.1-dev-deca6d7
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/tests/load_test/LoadTest.spec.js +18 -22
- package/dist/tests/load_test/LoadTest.spec.js.map +1 -1
- package/dist/utils/requestHandlers/CheApiRequestHandler.js +2 -0
- package/dist/utils/requestHandlers/CheApiRequestHandler.js.map +1 -1
- package/dist/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.js +16 -3
- package/dist/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
- package/mocha-load.json +4 -1
- package/package.json +1 -1
- package/tests/load_test/LoadTest.spec.ts +21 -31
- package/utils/requestHandlers/CheApiRequestHandler.ts +2 -0
- package/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts +6 -3
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/*********************************************************************
|
|
3
|
-
* Copyright (c)
|
|
3
|
+
* Copyright (c) 2022 Red Hat, Inc.
|
|
4
4
|
*
|
|
5
5
|
* This program and the accompanying materials are made
|
|
6
6
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -11,31 +11,27 @@
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
const inversify_config_1 = require("../../inversify.config");
|
|
13
13
|
const inversify_types_1 = require("../../inversify.types");
|
|
14
|
-
const
|
|
14
|
+
const TestConstants_1 = require("../../TestConstants");
|
|
15
15
|
const WorkspaceHandlingTests_1 = require("../../testsLibrary/WorkspaceHandlingTests");
|
|
16
|
+
const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
|
|
16
17
|
const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
|
|
17
|
-
const
|
|
18
|
-
const
|
|
19
|
-
const
|
|
20
|
-
const
|
|
21
|
-
const
|
|
22
|
-
const workspaceName = workspaceNameHandler.generateWorkspaceName('wksp-test-', 5);
|
|
23
|
-
const workspacePrefixUrl = `${__1.TestConstants.TS_SELENIUM_BASE_URL}/dashboard/#/ide/${__1.TestConstants.TS_SELENIUM_USERNAME}/`;
|
|
18
|
+
const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
|
|
19
|
+
const devfileUrl = 'https://github.com/che-samples/web-nodejs-sample/tree/devfilev2';
|
|
20
|
+
const factoryUrl = `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}#${devfileUrl}?new`;
|
|
21
|
+
const projectName = 'web-nodejs-sample';
|
|
22
|
+
const subRootFolder = 'app';
|
|
24
23
|
suite('Load test suite', async () => {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
24
|
+
suite('Create workspace', async () => {
|
|
25
|
+
test('Create workspace using factory', async () => {
|
|
26
|
+
await browserTabsUtil.navigateTo(factoryUrl);
|
|
27
|
+
});
|
|
28
|
+
workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
|
|
29
|
+
projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
|
|
30
30
|
});
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
test('Wait loading workspace and get time', async () => {
|
|
36
|
-
WorkspaceHandlingTests_1.WorkspaceHandlingTests.setWorkspaceName(workspaceName);
|
|
37
|
-
await ide.waitWorkspaceAndIde();
|
|
38
|
-
await projectTree.openProjectTreeContainer();
|
|
31
|
+
suite('Stopping and deleting the workspace', async () => {
|
|
32
|
+
test('Stop and remove workspace', async () => {
|
|
33
|
+
await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
34
|
+
});
|
|
39
35
|
});
|
|
40
36
|
});
|
|
41
37
|
//# sourceMappingURL=LoadTest.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoadTest.spec.js","sourceRoot":"","sources":["../../../tests/load_test/LoadTest.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;AAExE,6DAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"LoadTest.spec.js","sourceRoot":"","sources":["../../../tests/load_test/LoadTest.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;AAExE,6DAAsD;AACtD,2DAAgD;AAChD,uDAAoD;AACpD,sFAAmF;AAInF,MAAM,mBAAmB,GAAwB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,mBAAmB,CAAC,CAAC;AAC/F,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;AACnF,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;AAExG,MAAM,UAAU,GAAW,iEAAiE,CAAC;AAC7F,MAAM,UAAU,GAAW,GAAG,6BAAa,CAAC,oBAAoB,IAAI,UAAU,MAAM,CAAC;AACrF,MAAM,WAAW,GAAW,mBAAmB,CAAC;AAChD,MAAM,aAAa,GAAW,KAAK,CAAC;AAEpC,KAAK,CAAC,iBAAiB,EAAE,KAAK,IAAI,EAAE;IAChC,KAAK,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QACjC,IAAI,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,sBAAsB,CAAC,mCAAmC,EAAE,CAAC;QAE7D,mBAAmB,CAAC,sBAAsB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,KAAK,CAAE,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACrD,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;YACzC,MAAM,sBAAsB,CAAC,sBAAsB,CAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACnG,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC"}
|
|
@@ -51,6 +51,7 @@ let CheApiRequestHandler = class CheApiRequestHandler {
|
|
|
51
51
|
return request;
|
|
52
52
|
}
|
|
53
53
|
request_censored.headers.Authorization = 'CENSORED';
|
|
54
|
+
request_censored.headers.Cookie = 'CENSORED';
|
|
54
55
|
Logger_1.Logger.info(`RequestHandler request:\n` + request_censored);
|
|
55
56
|
}
|
|
56
57
|
catch (err) {
|
|
@@ -85,6 +86,7 @@ let CheApiRequestHandler = class CheApiRequestHandler {
|
|
|
85
86
|
return response;
|
|
86
87
|
}
|
|
87
88
|
response_censored.config.headers.Authorization = 'CENSORED';
|
|
89
|
+
response_censored.config.headers.Cookie = 'CENSORED';
|
|
88
90
|
if (response_censored.data.access_token != null) {
|
|
89
91
|
response_censored.data.access_token = 'CENSORED';
|
|
90
92
|
}
|
|
@@ -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;AAE/C,sCAAmC;AAGnC,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;
|
|
1
|
+
{"version":3,"file":"CheApiRequestHandler.js","sourceRoot":"","sources":["../../../utils/requestHandlers/CheApiRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,17 +5,30 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
8
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
15
|
exports.CheMultiuserAuthorizationHeaderHandler = void 0;
|
|
10
16
|
const inversify_1 = require("inversify");
|
|
17
|
+
const DriverHelper_1 = require("../../DriverHelper");
|
|
18
|
+
const inversify_types_1 = require("../../../inversify.types");
|
|
11
19
|
let CheMultiuserAuthorizationHeaderHandler = class CheMultiuserAuthorizationHeaderHandler {
|
|
20
|
+
constructor(driverHelper) {
|
|
21
|
+
this.driverHelper = driverHelper;
|
|
22
|
+
}
|
|
12
23
|
async get() {
|
|
13
|
-
|
|
14
|
-
return { headers: { 'cookie':
|
|
24
|
+
let token = await this.driverHelper.getDriver().manage().getCookie('_oauth_proxy');
|
|
25
|
+
return { headers: { 'cookie': `_oauth_proxy=${token.value}` } };
|
|
15
26
|
}
|
|
16
27
|
};
|
|
17
28
|
CheMultiuserAuthorizationHeaderHandler = __decorate([
|
|
18
|
-
inversify_1.injectable()
|
|
29
|
+
inversify_1.injectable(),
|
|
30
|
+
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
31
|
+
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
19
32
|
], CheMultiuserAuthorizationHeaderHandler);
|
|
20
33
|
exports.CheMultiuserAuthorizationHeaderHandler = CheMultiuserAuthorizationHeaderHandler;
|
|
21
34
|
//# sourceMappingURL=CheMultiuserAuthorizationHeaderHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAWA,yCAA+C;AAC/C,qDAAkD;AAClD,8DAAmD;AAGnD,IAAa,sCAAsC,GAAnD,MAAa,sCAAsC;IAC/C,YAA2D,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAI,CAAC;IAE1F,KAAK,CAAC,GAAG;QACL,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACnF,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,gBAAgB,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC;IACpE,CAAC;CACJ,CAAA;AAPY,sCAAsC;IADlD,sBAAU,EAAE;IAEI,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAAgC,2BAAY;GAD5E,sCAAsC,CAOlD;AAPY,wFAAsC"}
|
package/mocha-load.json
CHANGED
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*********************************************************************
|
|
2
|
-
* Copyright (c)
|
|
2
|
+
* Copyright (c) 2022 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
|
|
@@ -9,46 +9,36 @@
|
|
|
9
9
|
**********************************************************************/
|
|
10
10
|
|
|
11
11
|
import { e2eContainer } from '../../inversify.config';
|
|
12
|
-
import { CLASSES
|
|
13
|
-
import {
|
|
14
|
-
import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
|
|
15
|
-
import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage';
|
|
16
|
-
import { TestWorkspaceUtil } from '../../utils/workspace/TestWorkspaceUtil';
|
|
17
|
-
import { TestConstants, WorkspaceNameHandler } from '../..';
|
|
18
|
-
import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
|
|
12
|
+
import { CLASSES } from '../../inversify.types';
|
|
13
|
+
import { TestConstants } from '../../TestConstants';
|
|
19
14
|
import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
|
|
15
|
+
import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
|
|
16
|
+
import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
|
|
20
17
|
|
|
18
|
+
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
21
19
|
const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
|
|
22
|
-
const
|
|
23
|
-
const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
|
|
24
|
-
const cheLoginPage: ICheLoginPage = e2eContainer.get<ICheLoginPage>(TYPES.CheLogin);
|
|
25
|
-
const testWorkspaceUtils: TestWorkspaceUtil = e2eContainer.get<TestWorkspaceUtil>(TYPES.WorkspaceUtil);
|
|
26
|
-
const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
|
|
20
|
+
const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
|
|
27
21
|
|
|
28
|
-
const
|
|
29
|
-
const
|
|
22
|
+
const devfileUrl: string = 'https://github.com/che-samples/web-nodejs-sample/tree/devfilev2';
|
|
23
|
+
const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}#${devfileUrl}?new`;
|
|
24
|
+
const projectName: string = 'web-nodejs-sample';
|
|
25
|
+
const subRootFolder: string = 'app';
|
|
30
26
|
|
|
31
27
|
suite('Load test suite', async () => {
|
|
28
|
+
suite('Create workspace', async () => {
|
|
29
|
+
test('Create workspace using factory', async () => {
|
|
30
|
+
await browserTabsUtil.navigateTo(factoryUrl);
|
|
31
|
+
});
|
|
32
32
|
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
suiteSetup(async function () {
|
|
36
|
-
const wsConfig = await testWorkspaceUtils.getBaseDevfile();
|
|
37
|
-
wsConfig.metadata!.name = workspaceName;
|
|
38
|
-
await testWorkspaceUtils.createWsFromDevFile(wsConfig);
|
|
39
|
-
});
|
|
33
|
+
workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
|
|
40
34
|
|
|
41
|
-
|
|
42
|
-
await browserTabsUtil.navigateTo(workspacePrefixUrl + workspaceName);
|
|
43
|
-
await cheLoginPage.login();
|
|
35
|
+
projectAndFileTests.waitWorkspaceReadiness(projectName, subRootFolder);
|
|
44
36
|
});
|
|
45
37
|
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
38
|
+
suite ('Stopping and deleting the workspace', async () => {
|
|
39
|
+
test('Stop and remove workspace', async () => {
|
|
40
|
+
await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
|
|
41
|
+
});
|
|
50
42
|
});
|
|
51
43
|
|
|
52
44
|
});
|
|
53
|
-
|
|
54
|
-
|
|
@@ -35,6 +35,7 @@ export class CheApiRequestHandler {
|
|
|
35
35
|
return request;
|
|
36
36
|
}
|
|
37
37
|
request_censored.headers.Authorization = 'CENSORED';
|
|
38
|
+
request_censored.headers.Cookie = 'CENSORED';
|
|
38
39
|
Logger.info(`RequestHandler request:\n` + request_censored);
|
|
39
40
|
} catch (err) {
|
|
40
41
|
Logger.error(`RequestHandler request: Failed to deep clone AxiosRequestConfig:` + err);
|
|
@@ -69,6 +70,7 @@ export class CheApiRequestHandler {
|
|
|
69
70
|
return response;
|
|
70
71
|
}
|
|
71
72
|
response_censored.config.headers.Authorization = 'CENSORED';
|
|
73
|
+
response_censored.config.headers.Cookie = 'CENSORED';
|
|
72
74
|
if (response_censored.data.access_token != null) {
|
|
73
75
|
response_censored.data.access_token = 'CENSORED';
|
|
74
76
|
}
|
|
@@ -9,13 +9,16 @@
|
|
|
9
9
|
**********************************************************************/
|
|
10
10
|
import { AxiosRequestConfig } from 'axios';
|
|
11
11
|
import { IAuthorizationHeaderHandler } from './IAuthorizationHeaderHandler';
|
|
12
|
-
import { injectable } from 'inversify';
|
|
12
|
+
import { inject, injectable } from 'inversify';
|
|
13
|
+
import { DriverHelper } from '../../DriverHelper';
|
|
14
|
+
import { CLASSES } from '../../../inversify.types';
|
|
13
15
|
|
|
14
16
|
@injectable()
|
|
15
17
|
export class CheMultiuserAuthorizationHeaderHandler implements IAuthorizationHeaderHandler {
|
|
18
|
+
constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
|
|
16
19
|
|
|
17
20
|
async get(): Promise<AxiosRequestConfig> {
|
|
18
|
-
|
|
19
|
-
return { headers: { 'cookie':
|
|
21
|
+
let token = await this.driverHelper.getDriver().manage().getCookie('_oauth_proxy');
|
|
22
|
+
return { headers: { 'cookie': `_oauth_proxy=${token.value}` } };
|
|
20
23
|
}
|
|
21
24
|
}
|