Skip to content

Commit 50a5598

Browse files
Update wdio (v9), wdio-mediawiki (v4), wdio-wikibase (v6.4)
The devtools-service package is gone, but we can replace the emulateDevice() call from change I6710ef0bd5 (commit 0b8eb44) with two different calls from main WebdriverIO nowadays. Wrap wdio-mediawiki’s onComplete() handler in a try-catch ignoring any errors, to work around T407831. Bug: T406844 Change-Id: I64cd1cac916a8f0d03a8ba00984c398b63c509c5
1 parent 48157bc commit 50a5598

File tree

8 files changed

+35160
-49096
lines changed

8 files changed

+35160
-49096
lines changed

client/data-bridge/package-lock.json

Lines changed: 19420 additions & 27762 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/data-bridge/package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,10 @@
4343
"@vue/eslint-config-typescript": "^9.1.0",
4444
"@vue/test-utils": "^2.3.0",
4545
"@vue/vue3-jest": "^28.1.0",
46-
"@wdio/cli": "^8.46.0",
47-
"@wdio/devtools-service": "^8.42.0",
48-
"@wdio/local-runner": "^8.46.0",
49-
"@wdio/mocha-framework": "^8.46.0",
50-
"@wdio/spec-reporter": "^8.43.0",
46+
"@wdio/cli": "^9.20.0",
47+
"@wdio/local-runner": "^9.20.0",
48+
"@wdio/mocha-framework": "^9.20.0",
49+
"@wdio/spec-reporter": "^9.20.0",
5150
"@wmde/eslint-config-wikimedia-typescript": "^0.2.1",
5251
"@wmde/vuex-helpers": "^0.1.2",
5352
"@wmde/wikibase-datamodel-types": "^0.2.0",
@@ -90,8 +89,8 @@
9089
"url-search-params-polyfill": "^8.1.1",
9190
"vue-eslint-parser": "^7.11.0",
9291
"vuex": "4.0.2",
93-
"wdio-mediawiki": "3.0.1",
94-
"wdio-wikibase": "6.3.0",
92+
"wdio-mediawiki": "4.1.3",
93+
"wdio-wikibase": "6.4.0",
9594
"wikimedia-ui-base": "^0.19.0"
9695
}
9796
}

client/data-bridge/tests/selenium/pageobjects/dataBridge.page.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,13 +296,11 @@ class DataBridgePage extends Page {
296296
return; // don't change size if window has right dimensions already
297297
}
298298

299-
browser.emulateDevice( {
300-
viewport: {
301-
width: targetWidth, // <number> page width in pixels.
302-
height: targetHeight, // <number> page height in pixels.
303-
},
304-
userAgent: `acting like a ${mobile ? 'narrow' : 'wide'} viewport`,
299+
browser.setViewport( {
300+
width: targetWidth, // <number> page width in pixels.
301+
height: targetHeight, // <number> page height in pixels.
305302
} );
303+
browser.emulate( 'userAgent', `acting like a ${mobile ? 'narrow' : 'wide'} viewport` );
306304
// FIXME: reenable if tests become flaky and we still need that pause:
307305
// browser.pause( 1000 ); // wait for resize animations to complete
308306
}

client/data-bridge/tests/selenium/wdio.conf.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,7 @@ exports.config = {
136136
// resolved to continue.
137137

138138
beforeSuite() {
139-
browser.call( () => WikibaseApi.initialize(
140-
undefined,
141-
browser.options.capabilities[ 'mw:user' ],
142-
browser.options.capabilities[ 'mw:pwd' ]
143-
) );
139+
browser.call( () => WikibaseApi.initialize() );
144140
},
145141

146142
/**

client/tests/selenium/wdio.conf.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,15 @@ exports.config = {
3232
waitforTimeout: 10 * 1000,
3333

3434
// See also: http://webdriver.io/guide/testrunner/reporters.html
35-
reporters: [ 'spec' ]
35+
reporters: [ 'spec' ],
36+
37+
onComplete() {
38+
try {
39+
return config.onComplete();
40+
} catch ( _ ) {
41+
// ignore TypeError: Cannot read properties of undefined (reading 'project') [T407831]
42+
// remove this onComplete() override again once we’re on a version of wdio-mediawiki
43+
// with a fix (maybe 6.0.1?)
44+
}
45+
}
3646
};

0 commit comments

Comments
 (0)