Skip to content

Commit a8d69bf

Browse files
taymoork2taymoork2
committed
test(journey/recents): webdriverio v7 migration
1 parent 31b1c07 commit a8d69bf

File tree

5 files changed

+114
-117
lines changed

5 files changed

+114
-117
lines changed

‎test/journeys/specs/recents/dataApi/basic.js

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {assert} from 'chai';
22

33
import {createSpace, disconnectDevices, registerDevices, setupGroupTestUsers} from '../../../lib/test-users';
4-
import {jobNames, renameJob, updateJobStatus} from '../../../lib/test-helpers';
54
import {elements as meetElements, hangup} from '../../../lib/test-helpers/space-widget/meet';
65
import {
76
createSpaceAndPost,
@@ -11,18 +10,10 @@ import {
1110
} from '../../../lib/test-helpers/recents-widget';
1211

1312
describe('Widget Recents: Data API', () => {
14-
const browserLocal = browser.select('browserLocal');
15-
const browserRemote = browser.select('browserRemote');
16-
1713
let allPassed = true;
1814
let docbrown, lorraine, marty, participants;
1915
let conversation, oneOnOneConversation;
2016

21-
before('start new sauce session', () => {
22-
renameJob(jobNames.recentsDataApi, browser);
23-
});
24-
25-
2617
before('load browser', () => {
2718
browserLocal.url('/data-api/recents.html');
2819
});
@@ -49,7 +40,7 @@ describe('Widget Recents: Data API', () => {
4940
document.getElementById('webex-widget').appendChild(csmmDom);
5041
window.loadBundle('/dist-recents/bundle.js');
5142
}, marty.token.access_token);
52-
browserLocal.waitForVisible(elements.recentsWidget);
43+
browserLocal.$(elements.recentsWidget).waitForDisplayed();
5344
});
5445

5546
before('open meet widget for lorraine', () => {
@@ -66,7 +57,7 @@ describe('Widget Recents: Data API', () => {
6657

6758
window.openSpaceWidget(options);
6859
}, lorraine.token.access_token, marty.email);
69-
browserRemote.waitForVisible(meetElements.meetWidget);
60+
browserRemote.$(meetElements.meetWidget).waitForDisplayed();
7061
});
7162

7263
it('loads the test page', () => {
@@ -111,9 +102,9 @@ describe('Widget Recents: Data API', () => {
111102

112103
describe('incoming call', () => {
113104
it('displays a call in progress button', () => {
114-
browserRemote.waitForVisible(meetElements.callButton);
115-
browserRemote.click(meetElements.callButton);
116-
browserLocal.waitUntil(() => browserLocal.isVisible(elements.joinCallButton));
105+
browserRemote.$(meetElements.callButton).waitForDisplayed();
106+
browserRemote.$(meetElements.callButton).click();
107+
browserLocal.waitUntil(() => browserLocal.$((elements.joinCallButton)).isDisplayed, {});
117108
hangup(browserRemote);
118109
});
119110
});
@@ -123,9 +114,5 @@ describe('Widget Recents: Data API', () => {
123114
allPassed = allPassed && (this.currentTest.state === 'passed');
124115
});
125116

126-
after(() => {
127-
updateJobStatus(jobNames.recentsDataApi, allPassed);
128-
});
129-
130117
after('disconnect', () => disconnectDevices(participants));
131118
});

‎test/journeys/specs/recents/dataApi/space-list-filter.js

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ import {assert, expect} from 'chai';
33
import {createSpace, disconnectDevices, registerDevices, setupGroupTestUsers} from '../../../lib/test-users';
44
import {enterKeywordAndWait} from '../../../lib/test-helpers/recents-widget/space-list-filter.js';
55

6-
import {jobNames, renameJob, updateJobStatus} from '../../../lib/test-helpers';
76
import {elements} from '../../../lib/test-helpers/recents-widget';
87

98
describe('Widget Recents Space Filters: Data API', () => {
10-
const browserLocal = browser.select('browserLocal');
119
const TIMEOUT = 10000;
1210
const SPACE1 = 'Test Group Space';
1311
const SPACE2 = 'Ask Group Space';
@@ -25,10 +23,6 @@ describe('Widget Recents Space Filters: Data API', () => {
2523
let allPassed = true;
2624
let marty, participants;
2725

28-
before('start new sauce session', () => {
29-
renameJob(jobNames.recentsFilterDataApi, browser);
30-
});
31-
3226
before('create test users and spaces', () => {
3327
participants = setupGroupTestUsers();
3428
[marty] = participants;
@@ -55,17 +49,20 @@ describe('Widget Recents Space Filters: Data API', () => {
5549
document.getElementById('webex-widget').appendChild(csmmDom);
5650
window.loadBundle('/dist-recents/bundle.js');
5751
}, marty.token.access_token);
58-
browserLocal.waitForVisible(elements.recentsWidget);
52+
browserLocal.$(elements.recentsWidget).waitForDisplayed();
5953
});
6054

6155
beforeEach(() => {
62-
browserLocal.waitForVisible(elements.listContainer);
63-
browserLocal.waitForExist(elements.searchInput);
56+
browserLocal.$(elements.listContainer).waitForDisplayed();
57+
browserLocal.$(elements.searchInput).waitForExist();
6458
});
6559

6660
it(`displays 2 items for keyword filter '${KEYWORD1}'`, () => {
6761
const result = enterKeywordAndWait({
68-
browserLocal, keyword: KEYWORD1, expectedTotal: EXPECTED_RESULT_2.length, timeout: TIMEOUT
62+
browserLocal,
63+
keyword: KEYWORD1,
64+
expectedTotal: EXPECTED_RESULT_2.length,
65+
timeout: TIMEOUT
6966
});
7067

7168
result.map((x) => {
@@ -78,7 +75,10 @@ describe('Widget Recents Space Filters: Data API', () => {
7875

7976
it(`displays 3 items for keyword filter '${KEYWORD2}'`, () => {
8077
const result = enterKeywordAndWait({
81-
browserLocal, keyword: KEYWORD2, expectedTotal: EXPECTED_RESULT_3.length, timeout: TIMEOUT
78+
browserLocal,
79+
keyword: KEYWORD2,
80+
expectedTotal: EXPECTED_RESULT_3.length,
81+
timeout: TIMEOUT
8282
});
8383

8484
result.map((x) => {
@@ -91,7 +91,10 @@ describe('Widget Recents Space Filters: Data API', () => {
9191

9292
it(`displays 1 item for keyword filter '${KEYWORD3}'`, () => {
9393
const result = enterKeywordAndWait({
94-
browserLocal, keyword: KEYWORD3, expectedTotal: 1, timeout: TIMEOUT
94+
browserLocal,
95+
keyword: KEYWORD3,
96+
expectedTotal: 1,
97+
timeout: TIMEOUT
9598
});
9699

97100
expect(result).to.be.an('string').that.does.contain(SPACE1);
@@ -100,7 +103,10 @@ describe('Widget Recents Space Filters: Data API', () => {
100103

101104
it('displays original list for backspaces to the 1st index', () => {
102105
const result = enterKeywordAndWait({
103-
browserLocal, keyword: BACKSPACES, expectedTotal: EXPECTED_RESULT_4.length, timeout: TIMEOUT
106+
browserLocal,
107+
keyword: BACKSPACES,
108+
expectedTotal: EXPECTED_RESULT_4.length,
109+
timeout: TIMEOUT
104110
});
105111

106112
result.map((x) => {
@@ -113,19 +119,29 @@ describe('Widget Recents Space Filters: Data API', () => {
113119

114120
it('displays no result if keyword filter does not match items in list ', () => {
115121
const result = enterKeywordAndWait({
116-
browserLocal, keyword: KEYWORD4, expectedTotal: 0, timeout: TIMEOUT
122+
browserLocal,
123+
keyword: KEYWORD4,
124+
expectedTotal: 0,
125+
timeout: TIMEOUT
117126
});
118127

119-
assert.equal(result.value.length, 0, 'result does not exist');
128+
assert.equal(result.length, 0, 'result does not exist');
120129
});
121130

122131
it('displays original list if clear icon is clicked', () => {
123132
enterKeywordAndWait({
124-
browserLocal, keyword: KEYWORD1, expectedTotal: EXPECTED_RESULT_2.length, timeout: TIMEOUT
133+
browserLocal,
134+
keyword: KEYWORD1,
135+
expectedTotal: EXPECTED_RESULT_2.length,
136+
timeout: TIMEOUT
137+
});
138+
browserLocal.$(elements.clearButton).click();
139+
browserLocal.waitUntil(() => browserLocal.$(elements.title).getText().length === 4, {
140+
timeout: TIMEOUT
141+
});
142+
const result = browserLocal.waitUntil(() => browserLocal.$(elements.title).getText(), {
143+
timeout: TIMEOUT
125144
});
126-
browserLocal.click(elements.clearButton);
127-
browserLocal.waitUntil((() => browserLocal.elements(elements.title).getText().length === 4), TIMEOUT);
128-
const result = browserLocal.waitUntil((() => browserLocal.elements(elements.title).getText()), TIMEOUT);
129145

130146
result.map((x) => {
131147
const itemLabel = x.trim();
@@ -137,16 +153,12 @@ describe('Widget Recents Space Filters: Data API', () => {
137153

138154
/* eslint-disable-next-line func-names */
139155
afterEach(function () {
140-
if (browserLocal.element(elements.clearButton).isExisting()) {
141-
browserLocal.click(elements.clearButton);
156+
if (browserLocal.$(elements.clearButton).isExisting()) {
157+
browserLocal.$(elements.clearButton).click();
142158
}
143159
allPassed = allPassed && (this.currentTest.state === 'passed');
144160
});
145161
});
146162

147-
after(() => {
148-
updateJobStatus(jobNames.recentsFilterDataApi, allPassed);
149-
});
150-
151163
after('disconnect', () => disconnectDevices(participants));
152164
});

‎test/journeys/specs/recents/global/basic.js

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import {
2121
findEventName
2222
} from '../../../lib/events';
2323

24-
import {jobNames, renameJob, updateJobStatus} from '../../../lib/test-helpers';
2524
import {elements as meetElements, hangup} from '../../../lib/test-helpers/space-widget/meet';
2625
import {
2726
createSpaceAndPost,
@@ -33,17 +32,10 @@ import {
3332
} from '../../../lib/test-helpers/recents-widget';
3433

3534
describe('Widget Recents', () => {
36-
const browserLocal = browser.select('browserLocal');
37-
const browserRemote = browser.select('browserRemote');
38-
3935
let allPassed = true;
4036
let docbrown, lorraine, marty, participants;
4137
let conversation, oneOnOneConversation;
4238

43-
before('start new sauce session', () => {
44-
renameJob(jobNames.recentsGlobal, browser);
45-
});
46-
4739
before('load browser for recents widget', () => {
4840
browserLocal.url('/recents.html');
4941
});
@@ -71,7 +63,7 @@ describe('Widget Recents', () => {
7163

7264
window.openRecentsWidget(options);
7365
}, marty.token.access_token);
74-
browserLocal.waitForVisible(elements.recentsWidget);
66+
browserLocal.$(elements.recentsWidget).waitForDisplayed();
7567
});
7668

7769
it('open meet widget for lorraine', () => {
@@ -87,7 +79,7 @@ describe('Widget Recents', () => {
8779

8880
window.openSpaceWidget(options);
8981
}, lorraine.token.access_token, marty.email);
90-
browserRemote.waitForVisible(meetElements.meetWidget);
82+
browserRemote.$(meetElements.meetWidget).waitForDisplayed();
9183
});
9284

9385
it('loads the test page', () => {
@@ -195,7 +187,7 @@ describe('Widget Recents', () => {
195187
assert.isNotEmpty(event.id, 'does not contain id');
196188
assert.isNotEmpty(event.roomId, 'does not contain roomId');
197189
assert.isNotEmpty(event.roomType, 'does not contain roomType');
198-
// Note: these 2 attributes randomly show/don not show
190+
// Note: these 2 attributes randomly show/do not show
199191
// assert.isNotEmpty(event.toPersonId, 'does not contain toPersonId');
200192
// assert.isNotEmpty(event.toPersonEmail, 'does not contain toPersonEmail');
201193
assert.isNotEmpty(event.text, 'does not contain text');
@@ -248,7 +240,7 @@ describe('Widget Recents', () => {
248240

249241
it('rooms:selected - group space', () => {
250242
clearEventLog(browserLocal);
251-
browserLocal.click(elements.firstSpace);
243+
browserLocal.$(elements.firstSpace).click();
252244
const events = findEventName({
253245
eventName: 'rooms:selected',
254246
events: getEventLog(browserLocal)
@@ -270,7 +262,7 @@ describe('Widget Recents', () => {
270262

271263
displayIncomingMessage(browserLocal, lorraine, oneOnOneConversation, lorraineText, true);
272264
clearEventLog(browserLocal);
273-
browserLocal.click(elements.firstSpace);
265+
browserLocal.$(elements.firstSpace).click();
274266
const events = findEventName({
275267
eventName: 'rooms:selected',
276268
events: getEventLog(browserLocal)
@@ -285,7 +277,8 @@ describe('Widget Recents', () => {
285277
assert.exists(event.isLocked, 'does not contain isLocked');
286278
assert.isNotEmpty(event.lastActivity, 'does not contain lastActivity');
287279
assert.isNotEmpty(event.created, 'does not contain created');
288-
assert.isNotEmpty(event.toPersonEmail, 'does not contain toPersonEmail');
280+
// Note: this attribute randomly show/do not show
281+
// assert.isNotEmpty(event.toPersonEmail, 'does not contain toPersonEmail');
289282
});
290283

291284
it('memberships:created', () => {
@@ -324,7 +317,10 @@ describe('Widget Recents', () => {
324317
// Remove user from room
325318
clearEventLog(browserLocal);
326319
waitForPromise(lorraine.spark.internal.conversation.leave(kickedConversation, marty));
327-
browserLocal.waitUntil(() => browserLocal.getText(`${elements.firstSpace} ${elements.title}`) !== roomTitle);
320+
browserLocal.waitUntil(
321+
() => browserLocal.$(`${elements.firstSpace} ${elements.title}`).getText() !== roomTitle,
322+
{}
323+
);
328324
const events = findEventName({
329325
eventName: 'memberships:deleted',
330326
events: getEventLog(browserLocal)
@@ -363,9 +359,9 @@ describe('Widget Recents', () => {
363359

364360
describe('incoming call', () => {
365361
it('displays a call in progress button', () => {
366-
browserRemote.waitForVisible(meetElements.callButton);
367-
browserRemote.click(meetElements.callButton);
368-
browserLocal.waitUntil(() => browserLocal.isVisible(elements.joinCallButton));
362+
browserRemote.$(meetElements.callButton).waitForDisplayed();
363+
browserRemote.$(meetElements.callButton).click();
364+
browserLocal.waitUntil(() => browserLocal.$(elements.joinCallButton).isDisplayed, {});
369365
hangup(browserRemote);
370366
});
371367
});
@@ -383,10 +379,6 @@ describe('Widget Recents', () => {
383379
allPassed = allPassed && (this.currentTest.state === 'passed');
384380
});
385381

386-
after(() => {
387-
updateJobStatus(jobNames.recentsGlobal, allPassed);
388-
});
389-
390382
after('disconnect', () => disconnectDevices(participants));
391383
});
392384

0 commit comments

Comments
 (0)