[MediaWiki-commits] [Gerrit] [BrowserTest] interim step to alphabetize - change (mediawiki...VisualEditor)

[Cmcmahon (Code Review)]

Cmcmahon has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173835

Change subject: [BrowserTest] interim step to alphabetize
......................................................................

[BrowserTest] interim step to alphabetize

no change to function

Change-Id: Id655a9777e3b8bd3e3fbb974c73912f9f975bf7c
---
M 
modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb
1 file changed, 14 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/35/173835/1

diff --git 
a/modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb
 
b/modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb
index a0c329c..267fe8c 100644
--- 
a/modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb
+++ 
b/modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb
@@ -2,11 +2,11 @@
   on(VisualEditorPage).confirm_switch_element.when_present.click
 end
 
-When(/^I enter the wikitext editor$/) do
+When(/^I click Edit for VisualEditor from this page$/) do
   on(VisualEditorPage) do |page|
-    page.edit_wikitext_element.when_present.click
-    step 'I clear the confirm dialog by clicking Keep changes'
-    page.wikitext_editor_element.when_present
+    page.alert do
+      page.edit_ve_element.when_present.click
+    end
   end
 end
 
@@ -19,11 +19,11 @@
   end
 end
 
-When(/^I click Edit for VisualEditor from this page$/) do
+When(/^I enter the wikitext editor$/) do
   on(VisualEditorPage) do |page|
-    page.alert do
-      page.edit_ve_element.when_present.click
-    end
+    page.edit_wikitext_element.when_present.click
+    step 'I clear the confirm dialog by clicking Keep changes'
+    page.wikitext_editor_element.when_present
   end
 end
 
@@ -39,13 +39,13 @@
   on(VisualEditorPage).wikitext_editor_element.when_present(10).should 
be_visible
 end
 
-Then(/^I should be in wikitext editing mode$/) do
+Then(/^I should be in Visual Editor editing alternate mode$/) do
   on(VisualEditorPage) do |page|
     page.wait_until(15) do
-      page.text.include? "Editing Edit page for"
+      page.text.include? "Edit page for"
     end
+    page.content_element.when_present.should be_visible
   end
-  @browser.url.should eql(ENV['MEDIAWIKI_URL'] + "Edit page for " + 
ENV['BROWSER'] + "?action=submit")
 end
 
 Then(/^I should be in Visual Editor editing mode$/) do
@@ -58,11 +58,11 @@
   @browser.url.should match Regexp.new(expected_url)
 end
 
-Then(/^I should be in Visual Editor editing alternate mode$/) do
+Then(/^I should be in wikitext editing mode$/) do
   on(VisualEditorPage) do |page|
     page.wait_until(15) do
-      page.text.include? "Edit page for"
+      page.text.include? "Editing Edit page for"
     end
-    page.content_element.when_present.should be_visible
   end
+  @browser.url.should eql(ENV['MEDIAWIKI_URL'] + "Edit page for " + 
ENV['BROWSER'] + "?action=submit")
 end

-- 
To view, visit https://gerrit.wikimedia.org/r/173835
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id655a9777e3b8bd3e3fbb974c73912f9f975bf7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon <cmcma...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits