Skip to content

Commit 2e5dae1

Browse files
committed
tests: clean up selenium leftovers
All tests have been migrated to Cypress and are now using the new CommunityConfiguration 2.0 However, the api-testing tests still rely on CC1.0, and so they still require that LocalSettings hack. Bug: T380581 Change-Id: Iedffb3043dfcc80c80ab3c01530b3fbee665b04c
1 parent c0f8695 commit 2e5dae1

13 files changed

+641
-6179
lines changed

package-lock.json

+287-5,777
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-9
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
"@typescript-eslint/parser": "^7.18.0",
2727
"@vue/test-utils": "^2.4.6",
2828
"@vue/vue3-jest": "^29.2.6",
29-
"@wdio/cli": "7.19.7",
30-
"@wdio/devtools-service": "7.19.7",
31-
"@wdio/junit-reporter": "7.16.6",
32-
"@wdio/local-runner": "7.19.7",
33-
"@wdio/mocha-framework": "7.33.0",
34-
"@wdio/spec-reporter": "7.19.7",
3529
"@wikimedia/codex": "1.18.0",
3630
"@wikimedia/types-wikimedia": "^0.4.4",
3731
"@wmde/eslint-config-wikimedia-typescript": "^0.2.12",
@@ -67,9 +61,7 @@
6761
"typescript": "^4.9.5",
6862
"typescript-eslint": "^7.8.0",
6963
"vue": "3.4.27",
70-
"vuex": "4.0.2",
71-
"wdio-intercept-service": "4.2.2",
72-
"wdio-mediawiki": "2.6.0"
64+
"vuex": "4.0.2"
7365
},
7466
"engines": {
7567
"npm": ">=7.21.0",

tests/LocalSettingsSetup.cjs tests/api-testing/LocalSettingsSetup.cjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const childProcess = require( 'child_process' ),
66
phpFpmService = 'php' + phpVersion + '-fpm',
77
fs = require( 'fs' ),
88
path = require( 'path' ),
9-
ip = path.resolve( __dirname + '/../../../' ),
9+
ip = path.resolve( __dirname + '/../../../../' ),
1010
localSettingsPath = path.resolve( ip + '/LocalSettings.php' ),
1111
localSettingsContents = fs.readFileSync( localSettingsPath );
1212

@@ -39,8 +39,8 @@ async function overrideLocalSettings() {
3939
console.log( 'Setting up modified ' + localSettingsPath );
4040
fs.writeFileSync( localSettingsPath,
4141
localSettingsContents + `
42-
if ( file_exists( "$IP/extensions/GrowthExperiments/tests/selenium/fixtures/GrowthExperiments.LocalSettings.php" ) ) {
43-
require_once "$IP/extensions/GrowthExperiments/tests/selenium/fixtures/GrowthExperiments.LocalSettings.php";
42+
if ( file_exists( "$IP/extensions/GrowthExperiments/tests/api-testing/GrowthExperiments.LocalSettings.php" ) ) {
43+
require_once "$IP/extensions/GrowthExperiments/tests/api-testing/GrowthExperiments.LocalSettings.php";
4444
}
4545
` );
4646
}

tests/selenium/fixtures/SuggestedEditsContent.xml tests/api-testing/SuggestedEditsContent.xml

+347
Large diffs are not rendered by default.

tests/api-testing/fixtures.cjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ const fs = require( 'fs' );
33
const path = require( 'path' );
44
const childProcess = require( 'child_process' );
55
const ip = path.resolve( __dirname + '/../../../../' );
6-
const LocalSettingsSetup = require( __dirname + '/../LocalSettingsSetup.cjs' );
6+
const LocalSettingsSetup = require( __dirname + '/LocalSettingsSetup.cjs' );
77

88
exports.mochaGlobalSetup = async function () {
99
await LocalSettingsSetup.overrideLocalSettings();
1010
await LocalSettingsSetup.restartPhpFpmService();
1111
// Import the test articles and their suggestions
1212
childProcess.spawnSync(
1313
'php',
14-
[ 'maintenance/run.php', 'importDump', path.resolve( __dirname + '/../selenium/fixtures/SuggestedEditsContent.xml' ) ],
14+
[ 'maintenance/run.php', 'importDump', path.resolve( __dirname + '/SuggestedEditsContent.xml' ) ],
1515
{ cwd: ip }
1616
);
1717
childProcess.spawnSync(
1818
'php',
1919
[ 'maintenance/run.php', 'edit', '--user=Admin', 'MediaWiki:NewcomerTasks.json' ],
20-
{ input: fs.readFileSync( path.resolve( __dirname + '/../selenium/fixtures/MediaWikiNewcomerTasks.json' ) ), cwd: ip }
20+
{ input: fs.readFileSync( path.resolve( __dirname + '/MediaWikiNewcomerTasks.json' ) ), cwd: ip }
2121
);
2222
};
2323

tests/selenium/.eslintrc.json

-10
This file was deleted.

tests/selenium/README.md

-21
This file was deleted.

tests/selenium/pageobjects/homepage.page.js

-196
This file was deleted.

tests/selenium/pageobjects/preferences.page.js

-32
This file was deleted.

tests/selenium/pageobjects/specialwelcomesurvey.page.js

-24
This file was deleted.

0 commit comments

Comments
 (0)