Esanders has uploaded a new change for review.

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

Change subject: Revert "[Browser tests] Wait for save button to be enabled"
......................................................................

Revert "[Browser tests] Wait for save button to be enabled"

This reverts commit 122be9c95ae1864656a7805186028072062c1b0b.

Change-Id: Ia79636d5fdcf3f1a224c93688c164bf1030c3bee
---
M modules/ve-mw/tests/browser/features/anon.feature
M modules/ve-mw/tests/browser/features/bullets.feature
M modules/ve-mw/tests/browser/features/cite.feature
M modules/ve-mw/tests/browser/features/edit_utf8_logged_in.feature
M modules/ve-mw/tests/browser/features/general_markup.feature
M modules/ve-mw/tests/browser/features/headings.feature
M modules/ve-mw/tests/browser/features/links.feature
M modules/ve-mw/tests/browser/features/media_general_settings.feature
M modules/ve-mw/tests/browser/features/media_interface.feature
M modules/ve-mw/tests/browser/features/options.feature
10 files changed, 42 insertions(+), 61 deletions(-)


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

diff --git a/modules/ve-mw/tests/browser/features/anon.feature 
b/modules/ve-mw/tests/browser/features/anon.feature
index 3053df1..043a50d 100644
--- a/modules/ve-mw/tests/browser/features/anon.feature
+++ b/modules/ve-mw/tests/browser/features/anon.feature
@@ -5,7 +5,6 @@
     Given I go to the "Anonymous Edit Test" page with content "Anonymous Edit 
Test"
     When I edit the page with Editing with
       And I see the IP warning signs
-    Then Save page should be visible
       And I click Save page
       And I do not see This is a minor edit
       And I click Review your changes
diff --git a/modules/ve-mw/tests/browser/features/bullets.feature 
b/modules/ve-mw/tests/browser/features/bullets.feature
index ca9f71d..b11f284 100644
--- a/modules/ve-mw/tests/browser/features/bullets.feature
+++ b/modules/ve-mw/tests/browser/features/bullets.feature
@@ -7,7 +7,6 @@
 
   Scenario Outline: check strings for bullets and numbering
     When I click <control>
-    Then Save page should be visible
       And I click Save page
       And I click Review your changes
     Then a <character> is added in front of input string in the diff view
@@ -20,7 +19,6 @@
   Scenario Outline: check increase indent for bullets and numbering
     When I click <control>
       And I click Increase indentation
-    Then Save page should be visible
       And I click Save page
       And I click Review your changes
     Then a <character> is added in front of input string in the diff view
@@ -35,7 +33,6 @@
   Scenario Outline: check decrease indent for bullets and numbering
     When I click <control>
       And I click Decrease indentation
-    Then Save page should be visible
       And I click Save page
       And I click Review your changes
     Then nothing is added in front of input string in the diff view
diff --git a/modules/ve-mw/tests/browser/features/cite.feature 
b/modules/ve-mw/tests/browser/features/cite.feature
index 852a84e..b19e68d 100644
--- a/modules/ve-mw/tests/browser/features/cite.feature
+++ b/modules/ve-mw/tests/browser/features/cite.feature
@@ -23,7 +23,6 @@
       And I click the new field label
       And I fill in the new field "New website field contents"
       And I click Insert Citation
-    Then Save page should be visible
       And I click Save page
       And I click Review your changes
     Then diff view should show the Website citation added
@@ -44,7 +43,6 @@
       And I click the new field label
       And I fill in the new field "New book field contents"
       And I click Insert Citation
-    Then Save page should be visible
       And I click Save page
       And I click Review your changes
     Then diff view should show the Book citation added
@@ -60,7 +58,6 @@
       And I fill in the seventh textarea with "News URL access date"
       And the News input field titles are in the correct order
       And I click Insert Citation
-    Then Save page should be visible
       And I click Save page
       And I click Review your changes
   Then diff view should show the News citation added
@@ -77,7 +74,6 @@
       And I fill in the eighth textarea with "Journal DOI"
       And the Journal input field titles are in the correct order
       And I click Insert Citation
-    Then Save page should be visible
       And I click Save page
       And I click Review your changes
   Then diff view should show the Journal citation added
diff --git a/modules/ve-mw/tests/browser/features/edit_utf8_logged_in.feature 
b/modules/ve-mw/tests/browser/features/edit_utf8_logged_in.feature
index 75a46ef..2ca5082 100644
--- a/modules/ve-mw/tests/browser/features/edit_utf8_logged_in.feature
+++ b/modules/ve-mw/tests/browser/features/edit_utf8_logged_in.feature
@@ -8,7 +8,6 @@
 
   Scenario Outline: Edit with strings
     When I edit the page with <input_string>
-    Then Save page should be visible
       And I click Save page
       And I click This is a minor edit
       And I click Review your changes
diff --git a/modules/ve-mw/tests/browser/features/general_markup.feature 
b/modules/ve-mw/tests/browser/features/general_markup.feature
index cb684b9..6b41309 100644
--- a/modules/ve-mw/tests/browser/features/general_markup.feature
+++ b/modules/ve-mw/tests/browser/features/general_markup.feature
@@ -7,12 +7,11 @@
 
   Scenario Outline: VisualEditor general markup
     When I click the text style menu
-      And I click the <type_of_markup> menu option
-    Then Save page should be visible
-      And I click Save page
-      And I click Review your changes
+    And I click the <type_of_markup> menu option
+    And I click Save page
+    And I click Review your changes
     Then <expected_markup_text> should appear in the diff view
-      And I can click the X on the save box
+    And I can click the X on the save box
   Examples:
     | type_of_markup | expected_markup_text                          |
     | Bold           | '''General Markup VisualEditor Test'''        |
@@ -22,12 +21,11 @@
   Scenario Outline: VisualEditor more general markup
     When I click the text style menu
       And I click the More option
-      And I click the <type_of_markup> menu option
-    Then Save page should be visible
-      And I click Save page
-      And I click Review your changes
+    And I click the <type_of_markup> menu option
+    And I click Save page
+    And I click Review your changes
     Then <expected_markup_text> should appear in the diff view
-      And I can click the X on the save box
+    And I can click the X on the save box
   Examples:
     | type_of_markup | expected_markup_text                          |
     | Computer Code  | <code>General Markup VisualEditor Test</code> |
diff --git a/modules/ve-mw/tests/browser/features/headings.feature 
b/modules/ve-mw/tests/browser/features/headings.feature
index d0ca29f..2f3adec 100644
--- a/modules/ve-mw/tests/browser/features/headings.feature
+++ b/modules/ve-mw/tests/browser/features/headings.feature
@@ -8,7 +8,6 @@
   Scenario Outline: Cycle through headings values
     When I click the down arrow on the Headings menu
       And I click <headings_interface_name>
-    Then Save page should be visible
       And I click Save page
       And I click Review your changes
     Then <headings_string> should appear in the diff view
diff --git a/modules/ve-mw/tests/browser/features/links.feature 
b/modules/ve-mw/tests/browser/features/links.feature
index 44a56a0..554ead8 100644
--- a/modules/ve-mw/tests/browser/features/links.feature
+++ b/modules/ve-mw/tests/browser/features/links.feature
@@ -8,25 +8,22 @@
       And I can see the Link User Inteface
 
   Scenario: Enter external link
-    When I enter external link http://www.example.com into link Content box
-      And I click Done to close Link User Interface
-    Then Save page should be visible
-      And I click Save page
-      And I click Review your changes
-    Then an external link appears in the diff view
+  When I enter external link http://www.example.com into link Content box
+    And I click Done to close Link User Interface
+    And I click Save page
+    And I click Review your changes
+  Then an external link appears in the diff view
 
   Scenario: Enter internal link
-    When I enter internal link Main Page into link Content box
-      And I click Done to close Link User Interface
-    Then Save page should be visible
-      And I click Save page
-      And I click Review your changes
-    Then an internal link appears in the diff view
+  When I enter internal link Main Page into link Content box
+    And I click Done to close Link User Interface
+    And I click Save page
+    And I click Review your changes
+  Then an internal link appears in the diff view
 
   Scenario: Enter non-existing link
     When I enter non existing link DoesNotExist into link Content box
-      And I click Done to close Link User Interface
-    Then Save page should be visible
-      And I click Save page
-      And I click Review your changes
-    Then a non-existing link appears in the diff view
+    And I click Done to close Link User Interface
+    And I click Save page
+    And I click Review your changes
+  Then a non-existing link appears in the diff view
diff --git 
a/modules/ve-mw/tests/browser/features/media_general_settings.feature 
b/modules/ve-mw/tests/browser/features/media_general_settings.feature
index e7c3933..5a1ed40 100644
--- a/modules/ve-mw/tests/browser/features/media_general_settings.feature
+++ b/modules/ve-mw/tests/browser/features/media_general_settings.feature
@@ -3,17 +3,16 @@
 
   Background:
     Given I go to the "Media Interface VisualEditor Test" page with content 
"Media Interface VisualEditor Test"
-      And I click in the editable part
+    And I click in the editable part
 
   Scenario: VisualEditor insert new media
     Given I click Media
-      And I enter bug into media Search box
-      And I select an Image
-      And I click Use this image
-      And I fill up the Caption field with "caption"
-      And I fill up the Alternative text with "alt text"
-      And I click Insert
-    Then Save page should be visible
-      And I click Save page
-      And I click Review your changes
+    And I enter bug into media Search box
+    And I select an Image
+    And I click Use this image
+    And I fill up the Caption field with "caption"
+    And I fill up the Alternative text with "alt text"
+    And I click Insert
+    And I click Save page
+    And I click Review your changes
     Then diff view should show media file with caption and alt text
diff --git a/modules/ve-mw/tests/browser/features/media_interface.feature 
b/modules/ve-mw/tests/browser/features/media_interface.feature
index 67d1645..a83df71 100644
--- a/modules/ve-mw/tests/browser/features/media_interface.feature
+++ b/modules/ve-mw/tests/browser/features/media_interface.feature
@@ -11,7 +11,6 @@
       And I select an Image
       And I click Use this image
       And I click Insert
-    Then Save page should be visible
       And I click Save page
       And I click Review your changes
     Then  diff view should show correct markup
diff --git a/modules/ve-mw/tests/browser/features/options.feature 
b/modules/ve-mw/tests/browser/features/options.feature
index 996eb9c..1531c28 100644
--- a/modules/ve-mw/tests/browser/features/options.feature
+++ b/modules/ve-mw/tests/browser/features/options.feature
@@ -32,21 +32,19 @@
       And I check the option for Enable display title
       And I type "automated test" for display title textbox
       And I click Apply Changes button
-    Then Save page should be visible
       And I click Save page
       And I click Review your changes
     Then the options set in Advanced Settings panel should appear in diff view
 
   Scenario: Setting the fields in Page Settings
-    When I click Page Settings
-      And I check the option for Redirect this page to
-      And I type "Linux" for redirect page
-      And I check the option for Prevent this redirect being updated when 
target page is moved
-      And I select the option Always for showing Table of Contents
-      And I check the option for Disable edit links next to each heading on 
this page
-      And I check the option for This is a Disambiguation page
-      And I click Apply Changes button
-    Then Save page should be visible
-      And I click Save page
-      And I click Review your changes
-    Then the options set in Page Settings panel should appear in diff view
+   When I click Page Settings
+     And I check the option for Redirect this page to
+     And I type "Linux" for redirect page
+     And I check the option for Prevent this redirect being updated when 
target page is moved
+     And I select the option Always for showing Table of Contents
+     And I check the option for Disable edit links next to each heading on 
this page
+     And I check the option for This is a Disambiguation page
+     And I click Apply Changes button
+     And I click Save page
+     And I click Review your changes
+   Then the options set in Page Settings panel should appear in diff view

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia79636d5fdcf3f1a224c93688c164bf1030c3bee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to