@eclipse-che/che-e2e 7.95.0-next-f15e722 → 7.95.0-next-064b37c
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-library/ProjectAndFileTests.js +8 -2
- package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
- package/dist/tests-library/WorkspaceHandlingTests.js +38 -2
- package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
- package/package.json +1 -1
- package/tests-library/ProjectAndFileTests.ts +8 -1
- package/tests-library/WorkspaceHandlingTests.ts +40 -4
|
@@ -31,10 +31,12 @@ const Logger_1 = require("../utils/Logger");
|
|
|
31
31
|
const TIMEOUT_CONSTANTS_1 = require("../constants/TIMEOUT_CONSTANTS");
|
|
32
32
|
const CheCodeLocatorLoader_1 = require("../pageobjects/ide/CheCodeLocatorLoader");
|
|
33
33
|
const monaco_page_objects_1 = require("monaco-page-objects");
|
|
34
|
+
const WorkspaceHandlingTests_1 = require("../tests-library/WorkspaceHandlingTests");
|
|
34
35
|
let ProjectAndFileTests = ProjectAndFileTests_1 = class ProjectAndFileTests {
|
|
35
|
-
constructor(driverHelper, cheCodeLocatorLoader) {
|
|
36
|
+
constructor(driverHelper, cheCodeLocatorLoader, workspaceHandlingTests) {
|
|
36
37
|
this.driverHelper = driverHelper;
|
|
37
38
|
this.cheCodeLocatorLoader = cheCodeLocatorLoader;
|
|
39
|
+
this.workspaceHandlingTests = workspaceHandlingTests;
|
|
38
40
|
}
|
|
39
41
|
async waitWorkspaceReadinessForCheCodeEditor() {
|
|
40
42
|
Logger_1.Logger.debug('waiting for editor.');
|
|
@@ -46,6 +48,8 @@ let ProjectAndFileTests = ProjectAndFileTests_1 = class ProjectAndFileTests {
|
|
|
46
48
|
}
|
|
47
49
|
catch (err) {
|
|
48
50
|
Logger_1.Logger.error(`waiting for workspace readiness failed: ${err}`);
|
|
51
|
+
// assume that start workspace page is still opened
|
|
52
|
+
await this.workspaceHandlingTests.logStartWorkspaceInfo();
|
|
49
53
|
throw err;
|
|
50
54
|
}
|
|
51
55
|
}
|
|
@@ -133,8 +137,10 @@ ProjectAndFileTests = ProjectAndFileTests_1 = __decorate([
|
|
|
133
137
|
(0, inversify_1.injectable)(),
|
|
134
138
|
__param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
|
|
135
139
|
__param(1, (0, inversify_1.inject)(inversify_types_1.CLASSES.CheCodeLocatorLoader)),
|
|
140
|
+
__param(2, (0, inversify_1.inject)(inversify_types_1.CLASSES.WorkspaceHandlingTests)),
|
|
136
141
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper,
|
|
137
|
-
CheCodeLocatorLoader_1.CheCodeLocatorLoader
|
|
142
|
+
CheCodeLocatorLoader_1.CheCodeLocatorLoader,
|
|
143
|
+
WorkspaceHandlingTests_1.WorkspaceHandlingTests])
|
|
138
144
|
], ProjectAndFileTests);
|
|
139
145
|
exports.ProjectAndFileTests = ProjectAndFileTests;
|
|
140
146
|
//# sourceMappingURL=ProjectAndFileTests.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectAndFileTests.js","sourceRoot":"","sources":["../../tests-library/ProjectAndFileTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,wDAAqD;AACrD,gEAAqD;AACrD,4CAAyC;AACzC,sEAAmE;AACnE,kFAA+E;AAC/E,6DAAqG;
|
|
1
|
+
{"version":3,"file":"ProjectAndFileTests.js","sourceRoot":"","sources":["../../tests-library/ProjectAndFileTests.ts"],"names":[],"mappings":"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"}
|
|
@@ -110,8 +110,9 @@ let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingT
|
|
|
110
110
|
Logger_1.Logger.info(`obtained workspace name from workspace loader page: ${WorkspaceHandlingTests_1.workspaceName}`);
|
|
111
111
|
return;
|
|
112
112
|
}
|
|
113
|
-
Logger_1.Logger.error(
|
|
114
|
-
|
|
113
|
+
Logger_1.Logger.error('failed to obtain workspace name');
|
|
114
|
+
await this.logStartWorkspaceInfo();
|
|
115
|
+
throw new selenium_webdriver_1.error.InvalidArgumentError('WorkspaceHandlingTests.obtainWorkspaceNameFromStartingPage failed to obtain workspace name.');
|
|
115
116
|
}
|
|
116
117
|
async stopWorkspace(workspaceName) {
|
|
117
118
|
await this.dashboard.openDashboard();
|
|
@@ -125,8 +126,43 @@ let WorkspaceHandlingTests = WorkspaceHandlingTests_1 = class WorkspaceHandlingT
|
|
|
125
126
|
await this.dashboard.openDashboard();
|
|
126
127
|
await this.dashboard.stopAndRemoveWorkspaceByUI(workspaceName);
|
|
127
128
|
}
|
|
129
|
+
async logStartWorkspaceInfo() {
|
|
130
|
+
const status = await this.getWorkspaceStatus();
|
|
131
|
+
const alertTitle = await this.getWorkspaceAlertTitle();
|
|
132
|
+
const alertDescription = await this.getWorkspaceAlertDescription();
|
|
133
|
+
Logger_1.Logger.info('Start workspace status: ' + status);
|
|
134
|
+
Logger_1.Logger.info('Start workspace progress title: ' + alertTitle);
|
|
135
|
+
Logger_1.Logger.info('Start workspace progress description: ' + alertDescription);
|
|
136
|
+
}
|
|
137
|
+
async getWorkspaceAlertDescription() {
|
|
138
|
+
try {
|
|
139
|
+
return await this.driverHelper.getDriver().findElement(WorkspaceHandlingTests_1.WORKSPACE_ALERT_DESCRIPTION).getText();
|
|
140
|
+
}
|
|
141
|
+
catch (err) {
|
|
142
|
+
return '(unknown)';
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
async getWorkspaceStatus() {
|
|
146
|
+
try {
|
|
147
|
+
return await this.driverHelper.getDriver().findElement(WorkspaceHandlingTests_1.WORKSPACE_STATUS).getText();
|
|
148
|
+
}
|
|
149
|
+
catch (err) {
|
|
150
|
+
return '(unknown)';
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
async getWorkspaceAlertTitle() {
|
|
154
|
+
try {
|
|
155
|
+
return await this.driverHelper.getDriver().findElement(WorkspaceHandlingTests_1.WORKSPACE_ALERT_TITLE).getAttribute('innerHTML');
|
|
156
|
+
}
|
|
157
|
+
catch (err) {
|
|
158
|
+
return '(unknown)';
|
|
159
|
+
}
|
|
160
|
+
}
|
|
128
161
|
};
|
|
129
162
|
WorkspaceHandlingTests.WORKSPACE_NAME = selenium_webdriver_1.By.xpath('//h1[contains(.,"Starting workspace ")]');
|
|
163
|
+
WorkspaceHandlingTests.WORKSPACE_STATUS = selenium_webdriver_1.By.xpath('//*/span[@class="pf-c-label__content"]');
|
|
164
|
+
WorkspaceHandlingTests.WORKSPACE_ALERT_TITLE = selenium_webdriver_1.By.xpath('//h4[@class="pf-c-alert__title"]');
|
|
165
|
+
WorkspaceHandlingTests.WORKSPACE_ALERT_DESCRIPTION = selenium_webdriver_1.By.xpath('//*/div[@class="pf-c-alert__description"]');
|
|
130
166
|
WorkspaceHandlingTests.workspaceName = 'undefined';
|
|
131
167
|
WorkspaceHandlingTests = WorkspaceHandlingTests_1 = __decorate([
|
|
132
168
|
(0, inversify_1.injectable)(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceHandlingTests.js","sourceRoot":"","sources":["../../tests-library/WorkspaceHandlingTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,gEAAqD;AACrD,kEAA+D;AAC/D,8EAA2E;AAC3E,8DAA2D;AAC3D,4CAAyC;AACzC,sEAAmE;AACnE,sEAAmE;AACnE,wDAAqD;AACrD,2DAA+C;AAGxC,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;
|
|
1
|
+
{"version":3,"file":"WorkspaceHandlingTests.js","sourceRoot":"","sources":["../../tests-library/WorkspaceHandlingTests.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -16,6 +16,7 @@ import { Logger } from '../utils/Logger';
|
|
|
16
16
|
import { TIMEOUT_CONSTANTS } from '../constants/TIMEOUT_CONSTANTS';
|
|
17
17
|
import { CheCodeLocatorLoader } from '../pageobjects/ide/CheCodeLocatorLoader';
|
|
18
18
|
import { By, SideBarView, ViewContent, ViewItem, ViewSection, Workbench } from 'monaco-page-objects';
|
|
19
|
+
import { WorkspaceHandlingTests } from '../tests-library/WorkspaceHandlingTests';
|
|
19
20
|
|
|
20
21
|
@injectable()
|
|
21
22
|
export class ProjectAndFileTests {
|
|
@@ -25,7 +26,9 @@ export class ProjectAndFileTests {
|
|
|
25
26
|
@inject(CLASSES.DriverHelper)
|
|
26
27
|
private readonly driverHelper: DriverHelper,
|
|
27
28
|
@inject(CLASSES.CheCodeLocatorLoader)
|
|
28
|
-
private readonly cheCodeLocatorLoader: CheCodeLocatorLoader
|
|
29
|
+
private readonly cheCodeLocatorLoader: CheCodeLocatorLoader,
|
|
30
|
+
@inject(CLASSES.WorkspaceHandlingTests)
|
|
31
|
+
private readonly workspaceHandlingTests: WorkspaceHandlingTests
|
|
29
32
|
) {}
|
|
30
33
|
|
|
31
34
|
async waitWorkspaceReadinessForCheCodeEditor(): Promise<void> {
|
|
@@ -40,6 +43,10 @@ export class ProjectAndFileTests {
|
|
|
40
43
|
Logger.debug(`editor was opened in ${end - start} seconds.`);
|
|
41
44
|
} catch (err) {
|
|
42
45
|
Logger.error(`waiting for workspace readiness failed: ${err}`);
|
|
46
|
+
|
|
47
|
+
// assume that start workspace page is still opened
|
|
48
|
+
await this.workspaceHandlingTests.logStartWorkspaceInfo();
|
|
49
|
+
|
|
43
50
|
throw err;
|
|
44
51
|
}
|
|
45
52
|
}
|
|
@@ -23,6 +23,9 @@ import { By, error } from 'selenium-webdriver';
|
|
|
23
23
|
@injectable()
|
|
24
24
|
export class WorkspaceHandlingTests {
|
|
25
25
|
private static WORKSPACE_NAME: By = By.xpath('//h1[contains(.,"Starting workspace ")]');
|
|
26
|
+
private static WORKSPACE_STATUS: By = By.xpath('//*/span[@class="pf-c-label__content"]');
|
|
27
|
+
private static WORKSPACE_ALERT_TITLE: By = By.xpath('//h4[@class="pf-c-alert__title"]');
|
|
28
|
+
private static WORKSPACE_ALERT_DESCRIPTION: By = By.xpath('//*/div[@class="pf-c-alert__description"]');
|
|
26
29
|
private static workspaceName: string = 'undefined';
|
|
27
30
|
private static parentGUID: string;
|
|
28
31
|
|
|
@@ -111,10 +114,9 @@ export class WorkspaceHandlingTests {
|
|
|
111
114
|
Logger.info(`obtained workspace name from workspace loader page: ${WorkspaceHandlingTests.workspaceName}`);
|
|
112
115
|
return;
|
|
113
116
|
}
|
|
114
|
-
Logger.error(
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
);
|
|
117
|
+
Logger.error('failed to obtain workspace name');
|
|
118
|
+
await this.logStartWorkspaceInfo();
|
|
119
|
+
throw new error.InvalidArgumentError('WorkspaceHandlingTests.obtainWorkspaceNameFromStartingPage failed to obtain workspace name.');
|
|
118
120
|
}
|
|
119
121
|
|
|
120
122
|
async stopWorkspace(workspaceName: string): Promise<void> {
|
|
@@ -131,4 +133,38 @@ export class WorkspaceHandlingTests {
|
|
|
131
133
|
await this.dashboard.openDashboard();
|
|
132
134
|
await this.dashboard.stopAndRemoveWorkspaceByUI(workspaceName);
|
|
133
135
|
}
|
|
136
|
+
|
|
137
|
+
async logStartWorkspaceInfo(): Promise<void> {
|
|
138
|
+
const status: string = await this.getWorkspaceStatus();
|
|
139
|
+
const alertTitle: string = await this.getWorkspaceAlertTitle();
|
|
140
|
+
const alertDescription: string = await this.getWorkspaceAlertDescription();
|
|
141
|
+
|
|
142
|
+
Logger.info('Start workspace status: ' + status);
|
|
143
|
+
Logger.info('Start workspace progress title: ' + alertTitle);
|
|
144
|
+
Logger.info('Start workspace progress description: ' + alertDescription);
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
private async getWorkspaceAlertDescription(): Promise<string> {
|
|
148
|
+
try {
|
|
149
|
+
return await this.driverHelper.getDriver().findElement(WorkspaceHandlingTests.WORKSPACE_ALERT_DESCRIPTION).getText();
|
|
150
|
+
} catch (err) {
|
|
151
|
+
return '(unknown)';
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
private async getWorkspaceStatus(): Promise<string> {
|
|
156
|
+
try {
|
|
157
|
+
return await this.driverHelper.getDriver().findElement(WorkspaceHandlingTests.WORKSPACE_STATUS).getText();
|
|
158
|
+
} catch (err) {
|
|
159
|
+
return '(unknown)';
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
private async getWorkspaceAlertTitle(): Promise<string> {
|
|
164
|
+
try {
|
|
165
|
+
return await this.driverHelper.getDriver().findElement(WorkspaceHandlingTests.WORKSPACE_ALERT_TITLE).getAttribute('innerHTML');
|
|
166
|
+
} catch (err) {
|
|
167
|
+
return '(unknown)';
|
|
168
|
+
}
|
|
169
|
+
}
|
|
134
170
|
}
|