Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Selenium: Target Mediawiki-Docker by default

Browse source 
Removed default values for MEDIAWIKI_USER, MEDIAWIKI_PASSWORD, MW_SERVER
and MW_SCRIPT_PATH in wdio.conf.js in order to use values from the .env file.

Bug: T247312
Change-Id: I728c705b476f7741982d7e7c3e0ed219f2fcd054
This commit is contained in:
Harriet Ayugi 2020-11-26 01:28:38 +03:00 committed by Zfilipin
parent 9d3633cfd5
commit b8a2e21eed
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package-lock.json generated
View file

@ -3408,6 +3408,12 @@
"is-obj": "^2.0.0"
}
},
"dotenv": {
"version": "8.2.0",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
"integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
"dev": true
},
"download": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz",

1
package.json
View file

@ -22,6 +22,7 @@
"@wdio/sauce-service": "6.1.9",
"@wdio/sync": "6.1.8",
"api-testing": "1.3.0",
"dotenv": "8.2.0",
"eslint-config-wikimedia": "0.17.0",
"grunt": "1.3.0",
"grunt-banana-checker": "0.9.0",

9
tests/selenium/wdio.conf.js
View file

@ -1,5 +1,6 @@
'use strict';
require( 'dotenv' ).config();
const fs = require( 'fs' );
const path = require( 'path' );
const video = require( 'wdio-video-reporter' );
@ -27,8 +28,8 @@ exports.config = {
// Access via `browser.config.<key>`.
// Defaults are for MediaWiki-Vagrant
// ======
mwUser: process.env.MEDIAWIKI_USER || 'Admin',
mwPwd: process.env.MEDIAWIKI_PASSWORD || 'vagrant',
mwUser: process.env.MEDIAWIKI_USER,
mwPwd: process.env.MEDIAWIKI_PASSWORD,
// ==================
// Runner Configuration
@ -82,8 +83,8 @@ exports.config = {
// Stop after this many failures, or 0 to run all tests before reporting failures.
bail: 0,
// Base for browser.url() and wdio-mediawiki/Page#openTitle()
baseUrl: ( process.env.MW_SERVER || 'http://127.0.0.1:8080' ) + (
process.env.MW_SCRIPT_PATH || '/w'
baseUrl: ( process.env.MW_SERVER ) + (
process.env.MW_SCRIPT_PATH
),
services: [
...( process.env.SAUCE_ACCESS_KEY ? [ 'sauce' ] : [] )