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 8bc7dc6..4302e8f 100644 (file)
--- a/tests/selenium/pageobjects/edit.page.js
+++ b/tests/selenium/pageobjects/edit.page.js
@@ -1,25 +1,27 @@
-const Page = require( 'wdio-mediawiki/Page' ),
-       Api = require( 'wdio-mediawiki/Api' );
+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( 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();
        }
 
-       // @deprecated Use wdio-mediawiki/Api#edit() instead.
-       apiEdit( name, content ) {
-               return Api.edit( name, content );
+       edit( name, content ) {
+               this.openForEditing( name );
+               this.content.setValue( content );
+               this.save.click();
        }
 }