Skip to content

Commit c45e3c5

Browse files
Marcarriandanielwiehl
Marcarrian
authored and
danielwiehl
committed
test(workbench/router): refactor router page object to reflect the Workbench Router API
Page objects for the Workbench API should closely mimic the underlying API, i.e., provide a method similar to the actual API to make tests more readable and concise. Relates to #479
1 parent 74168d0 commit c45e3c5

17 files changed

+806
-812
lines changed

‎projects/scion/e2e-testing/src/workbench/browser-history.e2e-spec.ts‎

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,22 @@ test.describe('Browser History', () => {
2626

2727
// Add view-1 to the left part
2828
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
29-
await routerPage.enterPath('test-view');
30-
await routerPage.enterTarget('view.101');
31-
await routerPage.enterBlankPartId('left');
32-
await routerPage.clickNavigate();
29+
await routerPage.navigate(['test-view'], {
30+
target: 'view.101',
31+
blankPartId: 'left',
32+
cssClass: 'testee'
33+
});
3334

3435
// Expect view-1 to be active
3536
const testee1ViewPage = new ViewPagePO(appPO, {viewId: 'view.101'});
3637
await expectView(testee1ViewPage).toBeActive();
3738

3839
// Add view-2 to the left part
39-
await routerPage.enterPath('test-view');
40-
await routerPage.enterTarget('view.102');
41-
await routerPage.enterBlankPartId('left');
42-
await routerPage.clickNavigate();
40+
await routerPage.navigate(['test-view'], {
41+
target: 'view.102',
42+
blankPartId: 'left',
43+
cssClass: 'testee'
44+
});
4345

4446
// Expect view-2 to be active
4547
const testee2ViewPage = new ViewPagePO(appPO, {viewId: 'view.102'});
@@ -110,18 +112,20 @@ test.describe('Browser History', () => {
110112

111113
// Add view-1
112114
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
113-
await routerPage.enterPath('test-view');
114-
await routerPage.enterTarget('view.101');
115-
await routerPage.checkActivate(false);
116-
await routerPage.enterInsertionIndex('end');
117-
await routerPage.clickNavigate();
115+
await routerPage.navigate(['test-view'], {
116+
target: 'view.101',
117+
activate: false,
118+
blankInsertionIndex: 'end',
119+
cssClass: 'testee'
120+
});
118121

119122
// Add view-2
120-
await routerPage.enterPath('test-view');
121-
await routerPage.enterTarget('view.102');
122-
await routerPage.checkActivate(false);
123-
await routerPage.enterInsertionIndex('end');
124-
await routerPage.clickNavigate();
123+
await routerPage.navigate(['test-view'], {
124+
target: 'view.102',
125+
activate: false,
126+
blankInsertionIndex: 'end',
127+
cssClass: 'testee'
128+
});
125129

126130
const testee1ViewPage = new ViewPagePO(appPO, {viewId: 'view.101'});
127131
const testee2ViewPage = new ViewPagePO(appPO, {viewId: 'view.102'});
@@ -189,10 +193,10 @@ test.describe('Browser History', () => {
189193
await appPO.navigateTo({microfrontendSupport: false});
190194

191195
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
192-
await routerPage.enterPath('test-pages/standalone-view-test-page/component');
193-
await routerPage.enterTarget(await routerPage.view.getViewId());
194-
await routerPage.enterCssClass('testee');
195-
await routerPage.clickNavigate();
196+
await routerPage.navigate(['test-pages/standalone-view-test-page/component'], {
197+
target: await routerPage.view.getViewId(),
198+
cssClass: 'testee'
199+
});
196200

197201
const standaloneViewTestPage = new StandaloneViewTestPagePO(appPO, {cssClass: 'testee'});
198202
await expectView(routerPage).not.toBeAttached();
@@ -211,10 +215,10 @@ test.describe('Browser History', () => {
211215
await appPO.navigateTo({microfrontendSupport: false});
212216

213217
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
214-
await routerPage.enterPath('test-pages/standalone-view-test-page/load-component');
215-
await routerPage.enterTarget(await routerPage.view.getViewId());
216-
await routerPage.enterCssClass('testee');
217-
await routerPage.clickNavigate();
218+
await routerPage.navigate(['test-pages/standalone-view-test-page/load-component'], {
219+
target: await routerPage.view.getViewId(),
220+
cssClass: 'testee'
221+
});
218222

219223
const standaloneViewTestPage = new StandaloneViewTestPagePO(appPO, {cssClass: 'testee'});
220224
await expectView(routerPage).not.toBeAttached();
@@ -233,10 +237,10 @@ test.describe('Browser History', () => {
233237
await appPO.navigateTo({microfrontendSupport: false});
234238

235239
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
236-
await routerPage.enterPath('test-pages/standalone-view-test-page/load-children/module');
237-
await routerPage.enterTarget(await routerPage.view.getViewId());
238-
await routerPage.enterCssClass('testee');
239-
await routerPage.clickNavigate();
240+
await routerPage.navigate(['test-pages/standalone-view-test-page/load-children/module'], {
241+
target: await routerPage.view.getViewId(),
242+
cssClass: 'testee'
243+
});
240244

241245
const standaloneViewTestPage = new StandaloneViewTestPagePO(appPO, {cssClass: 'testee'});
242246
await expectView(routerPage).not.toBeAttached();
@@ -255,10 +259,10 @@ test.describe('Browser History', () => {
255259
await appPO.navigateTo({microfrontendSupport: false});
256260

257261
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
258-
await routerPage.enterPath('test-pages/standalone-view-test-page/load-children/routes');
259-
await routerPage.enterTarget(await routerPage.view.getViewId());
260-
await routerPage.enterCssClass('testee');
261-
await routerPage.clickNavigate();
262+
await routerPage.navigate(['test-pages/standalone-view-test-page/load-children/routes'], {
263+
target: await routerPage.view.getViewId(),
264+
cssClass: 'testee'
265+
});
262266

263267
const standaloneViewTestPage = new StandaloneViewTestPagePO(appPO, {cssClass: 'testee'});
264268
await expectView(routerPage).not.toBeAttached();
@@ -277,10 +281,10 @@ test.describe('Browser History', () => {
277281
await appPO.navigateTo({microfrontendSupport: false});
278282

279283
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
280-
await routerPage.enterPath('test-pages/standalone-view-test-page/children');
281-
await routerPage.enterTarget(await routerPage.view.getViewId());
282-
await routerPage.enterCssClass('testee');
283-
await routerPage.clickNavigate();
284+
await routerPage.navigate(['test-pages/standalone-view-test-page/children'], {
285+
target: await routerPage.view.getViewId(),
286+
cssClass: 'testee'
287+
});
284288

285289
const standaloneViewTestPage = new StandaloneViewTestPagePO(appPO, {cssClass: 'testee'});
286290
await expectView(routerPage).not.toBeAttached();
@@ -302,10 +306,10 @@ test.describe('Browser History', () => {
302306
await appPO.navigateTo({microfrontendSupport: false});
303307

304308
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
305-
await routerPage.enterPath('test-pages/non-standalone-view-test-page/component');
306-
await routerPage.enterTarget(await routerPage.view.getViewId());
307-
await routerPage.enterCssClass('testee');
308-
await routerPage.clickNavigate();
309+
await routerPage.navigate(['test-pages/non-standalone-view-test-page/component'], {
310+
target: await routerPage.view.getViewId(),
311+
cssClass: 'testee'
312+
});
309313

310314
const nonStandaloneViewTestPage = new NonStandaloneViewTestPagePO(appPO, {cssClass: 'testee'});
311315
await expectView(routerPage).not.toBeAttached();
@@ -324,10 +328,10 @@ test.describe('Browser History', () => {
324328
await appPO.navigateTo({microfrontendSupport: false});
325329

326330
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
327-
await routerPage.enterPath('test-pages/non-standalone-view-test-page/load-children/module');
328-
await routerPage.enterTarget(await routerPage.view.getViewId());
329-
await routerPage.enterCssClass('testee');
330-
await routerPage.clickNavigate();
331+
await routerPage.navigate(['test-pages/non-standalone-view-test-page/load-children/module'], {
332+
target: await routerPage.view.getViewId(),
333+
cssClass: 'testee',
334+
});
331335

332336
const nonStandaloneViewTestPage = new NonStandaloneViewTestPagePO(appPO, {cssClass: 'testee'});
333337
await expectView(routerPage).not.toBeAttached();
@@ -346,10 +350,10 @@ test.describe('Browser History', () => {
346350
await appPO.navigateTo({microfrontendSupport: false});
347351

348352
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
349-
await routerPage.enterPath('test-pages/non-standalone-view-test-page/children');
350-
await routerPage.enterTarget(await routerPage.view.getViewId());
351-
await routerPage.enterCssClass('testee');
352-
await routerPage.clickNavigate();
353+
await routerPage.navigate(['test-pages/non-standalone-view-test-page/children'], {
354+
target: await routerPage.view.getViewId(),
355+
cssClass: 'testee'
356+
});
353357

354358
const nonStandaloneViewTestPage = new NonStandaloneViewTestPagePO(appPO, {cssClass: 'testee'});
355359
await expectView(routerPage).not.toBeAttached();

‎projects/scion/e2e-testing/src/workbench/browser-reload.e2e-spec.ts‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ test.describe('Browser Reload', () => {
2222
await appPO.navigateTo({microfrontendSupport: false});
2323

2424
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
25-
await routerPage.enterPath('test-pages/standalone-view-test-page/component');
26-
await routerPage.enterTarget('view.101');
27-
await routerPage.clickNavigate();
25+
await routerPage.navigate(['test-pages/standalone-view-test-page/component'], {
26+
target: 'view.101',
27+
});
2828

2929
const standaloneViewTestPage = new StandaloneViewTestPagePO(appPO, {viewId: 'view.101'});
3030
await expectView(standaloneViewTestPage).toBeActive();
@@ -37,9 +37,9 @@ test.describe('Browser Reload', () => {
3737
await appPO.navigateTo({microfrontendSupport: false});
3838

3939
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
40-
await routerPage.enterPath('test-pages/standalone-view-test-page/load-component');
41-
await routerPage.enterTarget('view.101');
42-
await routerPage.clickNavigate();
40+
await routerPage.navigate(['test-pages/standalone-view-test-page/load-component'], {
41+
target: 'view.101',
42+
});
4343

4444
const standaloneViewTestPage = new StandaloneViewTestPagePO(appPO, {viewId: 'view.101'});
4545
await expectView(standaloneViewTestPage).toBeActive();
@@ -52,9 +52,9 @@ test.describe('Browser Reload', () => {
5252
await appPO.navigateTo({microfrontendSupport: false});
5353

5454
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
55-
await routerPage.enterPath('test-pages/standalone-view-test-page/load-children/module');
56-
await routerPage.enterTarget('view.101');
57-
await routerPage.clickNavigate();
55+
await routerPage.navigate(['test-pages/standalone-view-test-page/load-children/module'], {
56+
target: 'view.101',
57+
});
5858

5959
const standaloneViewTestPage = new StandaloneViewTestPagePO(appPO, {viewId: 'view.101'});
6060
await expectView(standaloneViewTestPage).toBeActive();
@@ -67,9 +67,9 @@ test.describe('Browser Reload', () => {
6767
await appPO.navigateTo({microfrontendSupport: false});
6868

6969
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
70-
await routerPage.enterPath('test-pages/standalone-view-test-page/load-children/routes');
71-
await routerPage.enterTarget('view.101');
72-
await routerPage.clickNavigate();
70+
await routerPage.navigate(['test-pages/standalone-view-test-page/load-children/routes'], {
71+
target: 'view.101',
72+
});
7373

7474
const standaloneViewTestPage = new StandaloneViewTestPagePO(appPO, {viewId: 'view.101'});
7575
await expectView(standaloneViewTestPage).toBeActive();
@@ -82,9 +82,9 @@ test.describe('Browser Reload', () => {
8282
await appPO.navigateTo({microfrontendSupport: false});
8383

8484
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
85-
await routerPage.enterPath('test-pages/standalone-view-test-page/children');
86-
await routerPage.enterTarget('view.101');
87-
await routerPage.clickNavigate();
85+
await routerPage.navigate(['test-pages/standalone-view-test-page/children'], {
86+
target: 'view.101',
87+
});
8888

8989
const standaloneViewTestPage = new StandaloneViewTestPagePO(appPO, {viewId: 'view.101'});
9090
await expectView(standaloneViewTestPage).toBeActive();
@@ -100,9 +100,9 @@ test.describe('Browser Reload', () => {
100100
await appPO.navigateTo({microfrontendSupport: false});
101101

102102
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
103-
await routerPage.enterPath('test-pages/non-standalone-view-test-page/component');
104-
await routerPage.enterTarget('view.101');
105-
await routerPage.clickNavigate();
103+
await routerPage.navigate(['test-pages/non-standalone-view-test-page/component'], {
104+
target: 'view.101',
105+
});
106106

107107
const nonStandaloneViewTestPage = new NonStandaloneViewTestPagePO(appPO, {viewId: 'view.101'});
108108
await expectView(nonStandaloneViewTestPage).toBeActive();
@@ -115,9 +115,9 @@ test.describe('Browser Reload', () => {
115115
await appPO.navigateTo({microfrontendSupport: false});
116116

117117
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
118-
await routerPage.enterPath('test-pages/non-standalone-view-test-page/load-children/module');
119-
await routerPage.enterTarget('view.101');
120-
await routerPage.clickNavigate();
118+
await routerPage.navigate(['test-pages/non-standalone-view-test-page/load-children/module'], {
119+
target: 'view.101',
120+
});
121121

122122
const nonStandaloneViewTestPage = new NonStandaloneViewTestPagePO(appPO, {viewId: 'view.101'});
123123
await expectView(nonStandaloneViewTestPage).toBeActive();
@@ -130,9 +130,9 @@ test.describe('Browser Reload', () => {
130130
await appPO.navigateTo({microfrontendSupport: false});
131131

132132
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
133-
await routerPage.enterPath('test-pages/non-standalone-view-test-page/children');
134-
await routerPage.enterTarget('view.101');
135-
await routerPage.clickNavigate();
133+
await routerPage.navigate(['test-pages/non-standalone-view-test-page/children'], {
134+
target: 'view.101',
135+
});
136136

137137
const nonStandaloneViewTestPage = new NonStandaloneViewTestPagePO(appPO, {viewId: 'view.101'});
138138
await expectView(nonStandaloneViewTestPage).toBeActive();

‎projects/scion/e2e-testing/src/workbench/dialog.e2e-spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2108,10 +2108,10 @@ test.describe('Workbench Dialog', () => {
21082108
await dialogOpenerPage.view.tab.dragTo({partId: await dialogOpenerPage.view.part.getPartId(), region: 'east'});
21092109

21102110
// Navigate to FocusTestPageComponent
2111-
await routerPage.enterPath('/test-pages/focus-test-page');
2112-
await routerPage.enterTarget(await routerPage.view.getViewId());
2113-
await routerPage.enterCssClass('focus-page');
2114-
await routerPage.clickNavigate();
2111+
await routerPage.navigate(['/test-pages/focus-test-page'], {
2112+
target: await routerPage.view.getViewId(),
2113+
cssClass: 'focus-page'
2114+
});
21152115

21162116
// Open application-modal dialog.
21172117
await dialogOpenerPage.open('dialog-page', {modality: 'application', cssClass: 'testee'});
@@ -2139,10 +2139,10 @@ test.describe('Workbench Dialog', () => {
21392139
await dialogOpenerPage.view.tab.dragTo({partId: await dialogOpenerPage.view.part.getPartId(), region: 'east'});
21402140

21412141
// Navigate to FocusTestPageComponent
2142-
await routerPage.enterPath('/test-pages/focus-test-page');
2143-
await routerPage.enterTarget(await routerPage.view.getViewId());
2144-
await routerPage.enterCssClass('focus-page');
2145-
await routerPage.clickNavigate();
2142+
await routerPage.navigate(['/test-pages/focus-test-page'], {
2143+
target: await routerPage.view.getViewId(),
2144+
cssClass: 'focus-page'
2145+
});
21462146

21472147
// Open application-modal dialog.
21482148
await dialogOpenerPage.open('dialog-page', {modality: 'application', cssClass: 'testee'});

‎projects/scion/e2e-testing/src/workbench/maximize-main-area.e2e-spec.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ test.describe('Workbench', () => {
2828

2929
// Open view 1 in main area.
3030
const routerPage = await workbenchNavigator.openInNewTab(RouterPagePO);
31-
await routerPage.enterPath('test-view');
32-
await routerPage.enterTarget('blank');
33-
await routerPage.enterCssClass('view-1');
34-
await routerPage.checkActivate(false);
35-
await routerPage.clickNavigate();
31+
await routerPage.navigate(['test-view'], {
32+
target: 'blank',
33+
activate: false,
34+
cssClass: 'view-1'
35+
});
3636

3737
// Open view 2 in main area.
38-
await routerPage.enterPath('test-view');
39-
await routerPage.enterTarget('blank');
40-
await routerPage.enterCssClass('view-2');
41-
await routerPage.checkActivate(false);
42-
await routerPage.clickNavigate();
38+
await routerPage.navigate(['test-view'], {
39+
target: 'blank',
40+
activate: false,
41+
cssClass: 'view-2'
42+
});
4343
await routerPage.view.tab.close();
4444

4545
// Move view 2 to the right of view 1.

0 commit comments

Comments
 (0)