wdio-mediawiki 2.4.0 - Remove Local Patches (#494)

* Local Copy * SuiteLoginPage * Page Patch * Screenshot * docs: notes about publishing (#496) * docs: add links for github and docker hub access tokens * docs(publishing): local.env example * docs: remove note about tagging * chore: update build metadata for wmde.12 release (#500) * Wikibase (#498) * T348616: 1.39.5 (#489) * feat: initial 1.39.5 env * fix: workflow to pickup wmde13 * docs: change log * docs: url * docs: fix wikibase changelog link * docs: add github run number * chore: add build metadata * chore: update example dir to wmde.13 * fix: update test from versions * fix: add missing env files for upgrade tests * feat(publishing): warn about missing github token (#497) * Login Changes * Update * Organize * Version Published --------- Co-authored-by: rti <[email protected]>
wmde · Nov 17, 2023 · 671819d · 671819d
1 parent df3804d
commit 671819d
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 155 deletions.
diff --git a/test/helpers/WDIOMediawikiScreenshotPatch.js b/test/helpers/WDIOMediawikiScreenshotPatch.js
diff --git a/test/helpers/pages/SuiteLoginPage.js b/test/helpers/pages/SuiteLoginPage.js
diff --git a/test/helpers/pages/WDIOMediawikiPagePatch.js b/test/helpers/pages/WDIOMediawikiPagePatch.js
diff --git a/test/package-lock.json b/test/package-lock.json
diff --git a/test/package.json b/test/package.json
@@ -25,7 +25,7 @@
 		"stylelint-config-wikimedia": "0.16.1",
 		"ts-node": "^10.9.1",
 		"typescript": "^5.2.2",
-		"wdio-mediawiki": "^2.3.0",
+		"wdio-mediawiki": "2.4.0",
 		"wdio-wikibase": "^6.0.1"
 	},
 	"browserslist": [

diff --git a/test/specs/repo/extensions/babel.ts b/test/specs/repo/extensions/babel.ts
@@ -1,5 +1,5 @@
 import assert from 'assert';
-import SuiteLoginPage from '../../../helpers/pages/SuiteLoginPage.js';
+import LoginPage from 'wdio-mediawiki/LoginPage.js';
 import { skipIfExtensionNotPresent } from '../../../helpers/default-functions.js';
 
 describe( 'Babel', function () {
@@ -8,7 +8,7 @@ describe( 'Babel', function () {
 	} );
 
 	it( 'Should be able to update the user page with language skills', async () => {
-		await SuiteLoginPage.loginAdmin();
+		await LoginPage.login( process.env.MW_ADMIN_NAME, process.env.MW_ADMIN_PASS );
 
 		const executionContent = await browser.editPage(
 			process.env.MW_SERVER,

diff --git a/test/specs/repo/extensions/nuke.ts b/test/specs/repo/extensions/nuke.ts
@@ -1,5 +1,5 @@
 import assert from 'assert';
-import SuiteLoginPage from '../../../helpers/pages/SuiteLoginPage.js';
+import LoginPage from 'wdio-mediawiki/LoginPage.js';
 import { skipIfExtensionNotPresent } from '../../../helpers/default-functions.js';
 
 describe( 'Nuke', function () {
@@ -23,7 +23,7 @@ describe( 'Nuke', function () {
 
 		assert.strictEqual( pageExistsResult.status, 200 );
 
-		await SuiteLoginPage.loginAdmin();
+		await LoginPage.login( process.env.MW_ADMIN_NAME, process.env.MW_ADMIN_PASS );
 		await browser.url( process.env.MW_SERVER + '/wiki/Special:Nuke' );
 
 		await $( 'button.oo-ui-inputWidget-input' ).click();

diff --git a/test/specs/repo/extensions/wikibase-local-media.ts b/test/specs/repo/extensions/wikibase-local-media.ts
@@ -1,5 +1,5 @@
 import assert from 'assert';
-import SuiteLoginPage from '../../../helpers/pages/SuiteLoginPage.js';
+import LoginPage from 'wdio-mediawiki/LoginPage.js';
 import { skipIfExtensionNotPresent } from '../../../helpers/default-functions.js';
 import WikibaseApi from 'wdio-wikibase/wikibase.api.js';
 
@@ -11,7 +11,7 @@ describe( 'WikibaseLocalMedia', function () {
 	} );
 
 	it( 'Should allow to upload an image', async () => {
-		await SuiteLoginPage.loginAdmin();
+		await LoginPage.login( process.env.MW_ADMIN_NAME, process.env.MW_ADMIN_PASS );
 
 		await browser.url( process.env.MW_SERVER + '/wiki/Special:Upload/' );
 

diff --git a/test/specs/repo/queryservice.ts b/test/specs/repo/queryservice.ts
@@ -1,8 +1,8 @@
 import assert from 'assert';
 import { stringify } from 'querystring';
+import LoginPage from 'wdio-mediawiki/LoginPage.js';
 import { getTestString } from 'wdio-mediawiki/Util.js';
 import WikibaseApi from 'wdio-wikibase/wikibase.api.js';
-import SuiteLoginPage from '../../helpers/pages/SuiteLoginPage.js';
 import QueryServiceUI from '../../helpers/pages/queryservice-ui/queryservice-ui.page.js';
 
 describe( 'QueryService', () => {
@@ -116,7 +116,7 @@ describe( 'QueryService', () => {
 		// TODO make an item using the UI
 		const itemId = await WikibaseApi.createItem( getTestString( 'T267743-' ) );
 
-		await SuiteLoginPage.loginAdmin();
+		await LoginPage.login( process.env.MW_ADMIN_NAME, process.env.MW_ADMIN_PASS );
 
 		// goto delete page
 		const query = { action: 'delete', title: 'Item:' + itemId };

diff --git a/test/specs/repo_client/extensions/scribunto-item.ts b/test/specs/repo_client/extensions/scribunto-item.ts
@@ -1,6 +1,6 @@
 import { getTestString } from 'wdio-mediawiki/Util.js';
 import assert from 'assert';
-import SuiteLoginPage from '../../../helpers/pages/SuiteLoginPage.js';
+import LoginPage from 'wdio-mediawiki/LoginPage.js';
 import { stringify } from 'querystring';
 import { readFile } from 'fs/promises';
 import { skipIfExtensionNotPresent } from '../../../helpers/default-functions.js';
@@ -71,7 +71,7 @@ describe( 'Scribunto Item', function () {
 
 	// This will generate a change that will dispatch
 	it( 'Should be able to delete the item on repo', async () => {
-		await SuiteLoginPage.loginAdmin();
+		await LoginPage.login( process.env.MW_ADMIN_NAME, process.env.MW_ADMIN_PASS );
 
 		// goto delete page
 		const query = { action: 'delete', title: 'Item:' + itemId };

diff --git a/test/specs/repo_client/item.ts b/test/specs/repo_client/item.ts
@@ -1,8 +1,8 @@
 import assert from 'assert';
 import { stringify } from 'querystring';
+import LoginPage from 'wdio-mediawiki/LoginPage.js';
 import { getTestString } from 'wdio-mediawiki/Util.js';
 import WikibaseApi from 'wdio-wikibase/wikibase.api.js';
-import SuiteLoginPage from '../../helpers/pages/SuiteLoginPage.js';
 import ExternalChange from '../../helpers/types/external-change.js';
 
 const itemLabel = getTestString( 'The Item' );
@@ -105,7 +105,7 @@ describe( 'Item', function () {
 
 	// This will generate a change that will dispatch
 	it( 'Should be able to delete the item on repo', async () => {
-		await SuiteLoginPage.loginAdmin();
+		await LoginPage.login( process.env.MW_ADMIN_NAME, process.env.MW_ADMIN_PASS );
 
 		// goto delete page
 		const query = { action: 'delete', title: 'Item:' + itemId };

diff --git a/test/wdio.conf.ts b/test/wdio.conf.ts
@@ -3,12 +3,12 @@
  * See also: http://webdriver.io/guide/testrunner/configurationfile.html
  */
 
+import { Frameworks, Options } from '@wdio/types';
 import { existsSync, mkdir, rm } from 'fs';
-import JsonReporter from './helpers/json-reporter.js';
-import { defaultFunctions as defaultFunctionsInit } from './helpers/default-functions.js';
-import saveScreenshot from './helpers/WDIOMediawikiScreenshotPatch.js';
+import { saveScreenshot } from 'wdio-mediawiki';
 import WikibaseApi from 'wdio-wikibase/wikibase.api.js';
-import { Options, Frameworks } from '@wdio/types';
+import { defaultFunctions as defaultFunctionsInit } from './helpers/default-functions.js';
+import JsonReporter from './helpers/json-reporter.js';
 
 const resultsDir = process.env.RESULTS_DIR;
 const screenshotPath = `${resultsDir}/screenshots`;
@@ -55,7 +55,7 @@ export const config: WebdriverIO.Config = {
 
 	// Level of verbosity: "trace", "debug", "info", "warn", "error", "silent"
 	logLevel:
-    ( process.env.SELENIUM_LOG_LEVEL as Options.WebDriverLogTypes ) || 'error',
+		( process.env.SELENIUM_LOG_LEVEL as Options.WebDriverLogTypes ) || 'error',
 
 	// Default timeout for each waitFor* command.
 	waitforTimeout: 30 * 1000,
@@ -131,7 +131,7 @@ export const config: WebdriverIO.Config = {
 		const screenshotFilename = `${testFile}__${test.title}`;
 
 		try {
-			saveScreenshot( screenshotPath, screenshotFilename );
+			saveScreenshot( screenshotFilename, screenshotPath );
 		} catch ( error ) {
 			console.error( 'failed writing screenshot ...' );
 			console.error( error );