[browser test] updates for no beta warning to dismiss

See https://gerrit.wikimedia.org/r/#/c/119217/

Change-Id: If3b6f7c9b9a7ce3a4d4c5d8b822d123b50d3c106

modules/ve-mw/test/browser/features/step_definitions/references_steps.rb

@@ -9,16 +9,8 @@ end
 When(/^I click Edit for VisualEditor$/) do
   on(VisualEditorPage) do |page|
     page.edit_ve_element.when_present.click
-    # Attempt to dismiss "beta warning" pop-up multiple times, since SauceLabs sometimes fails on the first attempt to dismiss.
-      try = 10
-      try.times do
-      #This begin/rescue clause dismisses the VE warning message when it exists, and does not fail when it does not exist
-        begin
-          page.beta_warning_element.when_present.click
-        rescue
-      end
-    end
-    page.content_element.fire_event("onfocus")
+    # no longer need to dismiss beta warning here https://gerrit.wikimedia.org/r/#/c/119217/
+    page.content_element.when_present.fire_event("onfocus")
   end
 end
 

modules/ve-mw/test/browser/features/step_definitions/shared_steps.rb

@@ -38,17 +38,8 @@ end
 When(/^I edit the page with (.+)$/) do |input_string|
   on(VisualEditorPage) do |page|
     page.edit_ve_element.when_present.click
-    # Attempt to dismiss "beta warning" pop-up multiple times, since SauceLabs sometimes fails on the first attempt to dismiss.
-    try = 3
-    try.times do
-      #This begin/rescue clause dismisses the VE warning message when it exists, and does not fail when it does not exist
-      begin
-        #should not be needed because try.times should handle the beta_warning. sleep 1 #Chrome seems to not honor when_present correctly as of 5 Dec 2013
-        page.beta_warning_element.when_present.click
-      rescue
-      end
-    end
-    page.content_element.fire_event("onfocus")
+    # no longer need to dismiss beta warning here https://gerrit.wikimedia.org/r/#/c/119217/
+    page.content_element.when_present.fire_event("onfocus")
     page.content_element.when_present.send_keys(input_string + " #{@random_string} ")
   end
 end

modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb

@@ -2,7 +2,7 @@ class VisualEditorPage
   include PageObject
 
   include URL
-  page_url URL.url("User:#{ENV['MEDIAWIKI_USER']}/#{ENV['BROWSER']}")
+  page_url URL.url("User:#{ENV['MEDIAWIKI_USER']}/#{ENV['BROWSER']}?vehidebetadialog=true")
 
   div(:container_disabled, class: "oo-ui-widget oo-ui-widget-disabled oo-ui-flaggableElement-constructive oo-ui-.oo-ui-buttonedElement-framed")
   div(:content, class: "ve-ce-documentNode ve-ce-branchNode")
@@ -51,7 +51,7 @@ class VisualEditorPage
   div(:visual_editor_toolbar, class: "oo-ui-toolbar-tools")
   span(:transclusion, class: "oo-ui-iconedElement-icon oo-ui-icon-template")
 
-  in_iframe(:index => 0) do |frame|
+  in_iframe(index: 0) do |frame|
     a(:beta_warning, title: "Close", frame: frame)
     div(:content_box, class: "ve-ce-documentNode ve-ce-branchNode", frame: frame)
     span(:leftarrowclose, class: "oo-ui-iconedElement-icon oo-ui-icon-previous", frame: frame)
@@ -60,7 +60,8 @@ class VisualEditorPage
     div(:ve_link_ui, class: "oo-ui-window-title", frame: frame)
   end
 
-  in_iframe(:index => 1) do |frame|
+  # not having beta warning makes iframes off by one
+  in_iframe(index: 0) do |frame|
     span(:add_parameter, text: "Add parameter", frame: frame)
     span(:add_template, text: "Add template", frame: frame)
     span(:insert_template, text: "Insert template", frame: frame)
@@ -87,7 +88,8 @@ class VisualEditorPage
     text_field(:transclusion_textfield, index: 0, frame: frame)
   end
 
-  in_iframe(:index => 2) do |frame|
+  # not having beta warning makes iframes off by one
+  in_iframe(index: 1) do |frame|
     div(:links_diff_view, class: "ve-ui-mwSaveDialog-viewer", frame: frame)
     span(:links_review_changes, class: "oo-ui-labeledElement-label", text: "Review your changes", frame: frame)
     div(:media_diff_view, class: "ve-ui-mwSaveDialog-viewer", frame: frame)