wdio-mediawiki 6.3.3 → 6.5.0

package/Api.js

@@ -18,7 +18,8 @@ class Api {
 			baseUrl,
 			username,
 			password,
-			verbose
+			verbose,
+			cookies
 		} = options;
 
 		this.session = {
@@ -27,7 +28,7 @@ class Api {
 			createAccountToken: null
 		};
 
-		this.cookies = new Cookies();
+		this.cookies = new Cookies( cookies );
 		this.httpClient = new MwApiHttpClient( {
 			cookies: this.cookies,
 			options: {
@@ -211,6 +212,7 @@ class Api {
  * - options.baseUrl -  browser.options.baseUrl
  * - options.username - browser.options.capabilities['mw:user']
  * - options.password - browser.options.capabilities['mw:pwd']
+ * - options.cookies - extra cookies to send with every API request (name -> value map)
  * - options.verbose set to true logs every response from MediaWiki
  *
  * @param {Object} [options={}] Optional api configuration.
@@ -223,7 +225,8 @@ class Api {
  *   baseUrl: 'https://mw.example.org',
  *   username: 'Admin',
  *   password: process.env.MW_PWD,
- *   verbose: true
+ *   verbose: true,
+ *   cookies: { cookie1: 'value1', cookie2: 'value2' }
  * });
  */
 export const createApiClient = async function ( options = {} ) {
@@ -234,6 +237,7 @@ export const createApiClient = async function ( options = {} ) {
 		baseUrl,
 		username,
 		password,
+		cookies: options.cookies,
 		verbose: options.verbose ?? false
 	} );
 	await api.loginGetEditToken( username, password );

package/api/Cookies.js

@@ -3,8 +3,8 @@
  */
 export class Cookies {
 
-	constructor() {
-		this.pairs = {};
+	constructor( defaultCookies = {} ) {
+		this.pairs = { ...defaultCookies };
 	}
 
 	/**

package/api/MwApiHttpClient.js

@@ -49,7 +49,7 @@ export class MwApiHttpClient {
 			}
 
 			if ( !response.ok ) {
-				console.error( `[API] HTTP ${ response.status }: ${ response.statusText }` );
+				console.error( `[API] HTTP ${ response.status }: ${ response.statusText }`, text );
 				throw new Error( `HTTP ${ response.status }` );
 			}
 

package/index.js

@@ -1,10 +1,23 @@
 import { mkdir } from 'fs/promises';
+import { readFileSync } from 'fs';
 import os from 'node:os';
 import process from 'node:process';
+import { resolve } from 'path';
 import { spawn } from 'child_process';
 
 const DISPLAY_BASE = 100;
 
+// eslint-disable-next-line security/detect-non-literal-fs-filename
+export const version = JSON.parse( readFileSync( new URL( './package.json', import.meta.url ), 'utf8' ) ).version;
+
+function getPackageVersion( packageName ) {
+	try {
+		// eslint-disable-next-line security/detect-non-literal-fs-filename
+		return JSON.parse( readFileSync( resolve( process.cwd(), 'node_modules', packageName, 'package.json' ), 'utf8' ) ).version;
+	} catch {}
+	return 'unknown';
+}
+
 /**
  * @since 1.1.0
  * @return {string} File name friendly version of ISO 8601 date and time
@@ -160,6 +173,8 @@ export function logSystemInformation() {
 	console.log( `[System information] Memory (host): ${ formatMegabytesAndGigabytes( freeBytes ) } free` );
 	console.log( `[System information] RAM used by NodeJS ${ formatMegabytesAndGigabytes( rss ) }` );
 	console.log( `[System information] CPU: ${ cores } cores` );
+	console.log( `[Package information] WebdriverIO: ${ getPackageVersion( 'webdriverio' ) }` );
+	console.log( `[Package information] wdio-mediawiki: ${ version }` );
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wdio-mediawiki",
-	"version": "6.3.3",
+	"version": "6.5.0",
 	"type": "module",
 	"main": "index.js",
 	"description": "WebdriverIO plugin for testing a MediaWiki site.",

package/wdio-defaults.conf.js

@@ -9,6 +9,7 @@
  */
 
 let ffmpeg;
+import os from 'os';
 import path from 'path';
 import { getChromeOptions } from './chromeOptions.js';
 import { setupProcessHandlers } from './processHandlers.js';
@@ -50,7 +51,7 @@ export const config = {
 	// Define the different browser configurations to use ("capabilities") here.
 	// ============
 
-	maxInstances: process.env.CI ? 6 : 1,
+	maxInstances: process.env.CI ? Math.floor( os.cpus().length * 0.75 ) : 1,
 	// Make sure wdio do not try to start XVFB (we do that ourselves when needed)
 	autoXvfb: false,
 	capabilities: [ {
@@ -159,6 +160,7 @@ export const config = {
 	onPrepare: function ( wdioConfig, capabilities ) {
 		console.log( `Run test targeting ${ wdioConfig.baseUrl }` );
 		logSystemInformation();
+		console.log( `[Configuration] maxInstances ${ wdioConfig.maxInstances } (max tests running in parallel) ` );
 
 		const { maxInstances, useBrowserHeadless, recordVideo } = wdioConfig;