mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeMirror
synced 2024-11-27 15:40:00 +00:00
Merge "selenium: run tests concurrently"
This commit is contained in:
commit
c82ea859c3
|
@ -22,7 +22,6 @@ class EditPage extends Page {
|
|||
}
|
||||
|
||||
get visualEditorSave() { return $( '.ve-ui-toolbar-saveButton' ); }
|
||||
get visualEditorToggle() { return $( '.ve-init-mw-editSwitch' ); }
|
||||
get visualEditorSurface() { return $( '.ve-ui-surface-source' ); }
|
||||
|
||||
async cursorToPosition( index ) {
|
||||
|
@ -36,9 +35,11 @@ class EditPage extends Page {
|
|||
await browser.keys( keys );
|
||||
}
|
||||
|
||||
getHighlightedMatchingBrackets() {
|
||||
const elements = $$( '.CodeMirror-line .cm-mw-matchingbracket' );
|
||||
const matchingTexts = elements.map( function ( el ) {
|
||||
get highlightedBrackets() { return $$( '.CodeMirror-line .cm-mw-matchingbracket' ); }
|
||||
|
||||
async getHighlightedMatchingBrackets() {
|
||||
await this.highlightedBrackets[ 0 ].waitForDisplayed();
|
||||
const matchingTexts = await this.highlightedBrackets.map( function ( el ) {
|
||||
return el.getText();
|
||||
} );
|
||||
return matchingTexts.join( '' );
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
const assert = require( 'assert' ),
|
||||
EditPage = require( '../pageobjects/edit.page' ),
|
||||
FixtureContent = require( '../fixturecontent' ),
|
||||
LoginPage = require( 'wdio-mediawiki/LoginPage' ),
|
||||
UserPreferences = require( '../userpreferences' ),
|
||||
Util = require( 'wdio-mediawiki/Util' );
|
||||
|
||||
|
@ -12,7 +11,7 @@ describe( 'CodeMirror bracket match highlighting for the wikitext 2010 editor',
|
|||
|
||||
before( async function () {
|
||||
title = Util.getTestString( 'CodeMirror-fixture1-' );
|
||||
await LoginPage.loginAdmin();
|
||||
await UserPreferences.loginAsOther();
|
||||
await FixtureContent.createFixturePage( title );
|
||||
await UserPreferences.enableWikitext2010EditorWithCodeMirror();
|
||||
} );
|
||||
|
|
|
@ -1,9 +1,18 @@
|
|||
'use strict';
|
||||
|
||||
const BlankPage = require( 'wdio-mediawiki/BlankPage' ),
|
||||
const Api = require( 'wdio-mediawiki/Api' ),
|
||||
BlankPage = require( 'wdio-mediawiki/BlankPage' ),
|
||||
LoginPage = require( 'wdio-mediawiki/LoginPage' ),
|
||||
Util = require( 'wdio-mediawiki/Util' );
|
||||
|
||||
class UserPreferences {
|
||||
async loginAsOther() {
|
||||
const username = Util.getTestString( 'User-' );
|
||||
const password = Util.getTestString();
|
||||
await Api.createAccount( await Api.bot(), username, password );
|
||||
await LoginPage.login( username, password );
|
||||
}
|
||||
|
||||
async setPreferences( preferences ) {
|
||||
await BlankPage.open();
|
||||
Util.waitForModuleState( 'mediawiki.base' );
|
||||
|
|
|
@ -2,10 +2,12 @@
|
|||
|
||||
const { config } = require( 'wdio-mediawiki/wdio-defaults.conf.js' );
|
||||
|
||||
exports.config = { ...config
|
||||
exports.config = { ...config,
|
||||
// Override, or add to, the setting from wdio-mediawiki.
|
||||
// Learn more at https://webdriver.io/docs/configurationfile/
|
||||
//
|
||||
// Example:
|
||||
// logLevel: 'info',
|
||||
|
||||
maxInstances: 4
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue