@eclipse-che/che-e2e 7.45.0 → 7.48.0
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.
|
@@ -32,12 +32,10 @@ const TestConstants_1 = require("../../TestConstants");
|
|
|
32
32
|
const TimeoutConstants_1 = require("../../TimeoutConstants");
|
|
33
33
|
const Workspaces_1 = require("./Workspaces");
|
|
34
34
|
const Logger_1 = require("../../utils/Logger");
|
|
35
|
-
const BrowserTabsUtil_1 = require("../../utils/BrowserTabsUtil");
|
|
36
35
|
let Dashboard = Dashboard_1 = class Dashboard {
|
|
37
|
-
constructor(driverHelper, workspaces
|
|
36
|
+
constructor(driverHelper, workspaces) {
|
|
38
37
|
this.driverHelper = driverHelper;
|
|
39
38
|
this.workspaces = workspaces;
|
|
40
|
-
this.browserTabUtil = browserTabUtil;
|
|
41
39
|
}
|
|
42
40
|
async stopWorkspaceByUI(workspaceName) {
|
|
43
41
|
Logger_1.Logger.debug(`Dashboard.stopWorkspaceByUI "${workspaceName}"`);
|
|
@@ -65,11 +63,6 @@ let Dashboard = Dashboard_1 = class Dashboard {
|
|
|
65
63
|
}
|
|
66
64
|
async openDashboard() {
|
|
67
65
|
Logger_1.Logger.debug('Dashboard.openDashboard');
|
|
68
|
-
const windowHandles = await this.browserTabUtil.getAllWindowHandles();
|
|
69
|
-
if (windowHandles.length > 1) {
|
|
70
|
-
const windowHandle = await this.browserTabUtil.getCurrentWindowHandle();
|
|
71
|
-
await this.browserTabUtil.waitAndSwitchToAnotherWindow(windowHandle, 1000);
|
|
72
|
-
}
|
|
73
66
|
await this.driverHelper.getDriver().navigate().to(TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL);
|
|
74
67
|
await this.waitPage();
|
|
75
68
|
}
|
|
@@ -115,10 +108,8 @@ Dashboard = Dashboard_1 = __decorate([
|
|
|
115
108
|
inversify_1.injectable(),
|
|
116
109
|
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
117
110
|
__param(1, inversify_1.inject(inversify_types_1.CLASSES.Workspaces)),
|
|
118
|
-
__param(2, inversify_1.inject(inversify_types_1.CLASSES.BrowserTabsUtil)),
|
|
119
111
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper,
|
|
120
|
-
Workspaces_1.Workspaces
|
|
121
|
-
BrowserTabsUtil_1.BrowserTabsUtil])
|
|
112
|
+
Workspaces_1.Workspaces])
|
|
122
113
|
], Dashboard);
|
|
123
114
|
exports.Dashboard = Dashboard;
|
|
124
115
|
//# sourceMappingURL=Dashboard.js.map
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"Dashboard.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/Dashboard.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -16,7 +16,6 @@ import { TestConstants } from '../../TestConstants';
|
|
|
16
16
|
import { TimeoutConstants } from '../../TimeoutConstants';
|
|
17
17
|
import { Workspaces } from './Workspaces';
|
|
18
18
|
import { Logger } from '../../utils/Logger';
|
|
19
|
-
import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
|
|
20
19
|
|
|
21
20
|
@injectable()
|
|
22
21
|
export class Dashboard {
|
|
@@ -26,8 +25,7 @@ export class Dashboard {
|
|
|
26
25
|
private static readonly WORKSPACE_STARTING_PAGE_CSS: string = '.ide-loader-page';
|
|
27
26
|
|
|
28
27
|
constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
|
|
29
|
-
@inject(CLASSES.Workspaces) private readonly workspaces: Workspaces
|
|
30
|
-
@inject(CLASSES.BrowserTabsUtil) private readonly browserTabUtil: BrowserTabsUtil) { }
|
|
28
|
+
@inject(CLASSES.Workspaces) private readonly workspaces: Workspaces) { }
|
|
31
29
|
|
|
32
30
|
async stopWorkspaceByUI(workspaceName: string) {
|
|
33
31
|
Logger.debug(`Dashboard.stopWorkspaceByUI "${workspaceName}"`);
|
|
@@ -62,11 +60,6 @@ export class Dashboard {
|
|
|
62
60
|
|
|
63
61
|
async openDashboard() {
|
|
64
62
|
Logger.debug('Dashboard.openDashboard');
|
|
65
|
-
const windowHandles = await this.browserTabUtil.getAllWindowHandles();
|
|
66
|
-
if (windowHandles.length > 1) {
|
|
67
|
-
const windowHandle = await this.browserTabUtil.getCurrentWindowHandle();
|
|
68
|
-
await this.browserTabUtil.waitAndSwitchToAnotherWindow(windowHandle, 1000);
|
|
69
|
-
}
|
|
70
63
|
await this.driverHelper.getDriver().navigate().to(TestConstants.TS_SELENIUM_BASE_URL);
|
|
71
64
|
await this.waitPage();
|
|
72
65
|
|