Merge "selenium: Remove "RunJobs" wait from specialrecentchanges test"

[lhc/web/wiklou.git] / tests / selenium / pageobjects / edit.page.js

diff --git a/tests/selenium/pageobjects/edit.page.js b/tests/selenium/pageobjects/edit.page.js
index a1784f4..4302e8f 100644 (file)
--- a/tests/selenium/pageobjects/edit.page.js
+++ b/tests/selenium/pageobjects/edit.page.js
@@ -1,33 +1,27 @@
-const Page = require( './page' ),
-       // https://github.com/Fannon/mwbot
-       MWBot = require( 'mwbot' );
+const Page = require( 'wdio-mediawiki/Page' );
 
 class EditPage extends Page {
-       get content() { return browser.element( '#wpTextbox1' ); }
-       get displayedContent() { return browser.element( '#mw-content-text' ); }
-       get heading() { return browser.element( '#firstHeading' ); }
-       get save() { return browser.element( '#wpSave' ); }
+       get content() { return $( '#wpTextbox1' ); }
+       get conflictingContent() { return $( '#wpTextbox2' ); }
+       get displayedContent() { return $( '#mw-content-text .mw-parser-output' ); }
+       get heading() { return $( '#firstHeading' ); }
+       get save() { return $( '#wpSave' ); }
+       get previewButton() { return $( '#wpPreview' ); }
 
-       openForEditing( name ) {
-               super.open( name + '&action=edit' );
+       openForEditing( title ) {
+               super.openTitle( title, { action: 'edit' } );
        }
 
-       edit( name, content ) {
+       preview( name, content ) {
                this.openForEditing( name );
                this.content.setValue( content );
-               this.save.click();
+               this.previewButton.click();
        }
 
-       apiEdit( name, content ) {
-               let bot = new MWBot();
-
-               return bot.loginGetEditToken( {
-                       apiUrl: `${browser.options.baseUrl}/api.php`,
-                       username: browser.options.username,
-                       password: browser.options.password
-               } ).then( function () {
-                       return bot.edit( name, content, `Created page with "${content}"` );
-               } );
+       edit( name, content ) {
+               this.openForEditing( name );
+               this.content.setValue( content );
+               this.save.click();
        }
 }