jenkins-bot has submitted this change and it was merged.

Change subject: QA: Allow browser tests in alpha mode
......................................................................


QA: Allow browser tests in alpha mode

Introduce "I am in alpha mode" definition
Rename beta_page to more generic mobile options

Change-Id: I64070ecb121fd8c021ea139dd010b7dae06139cf
---
M tests/browser/features/step_definitions/common_steps.rb
D tests/browser/features/support/pages/beta_page.rb
A tests/browser/features/support/pages/mobile_options_page.rb
3 files changed, 29 insertions(+), 13 deletions(-)

Approvals:
  JGonera: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/browser/features/step_definitions/common_steps.rb 
b/tests/browser/features/step_definitions/common_steps.rb
index 5051868..3e6305c 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -39,12 +39,23 @@
 end
 
 Given /^I am in beta mode$/ do
-  visit(BetaPage) do |page|
+  visit(MobileOptions) do |page|
     page.beta_element.click
     page.save_settings
   end
 end
 
+Given /^I am in alpha mode$/ do
+  visit(MobileOptions) do |page|
+    page.beta_element.click
+    page.save_settings
+    visit(MobileOptions) do |page|
+      page.alpha_element.click
+      page.save_settings
+    end
+  end
+end
+
 Given /^I am not logged in$/ do
   # nothing to do here, user in not logged in by default
 end
diff --git a/tests/browser/features/support/pages/beta_page.rb 
b/tests/browser/features/support/pages/beta_page.rb
deleted file mode 100644
index c596013..0000000
--- a/tests/browser/features/support/pages/beta_page.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class BetaPage
-  include PageObject
-
-  include URL
-  page_url URL.url("Special:MobileOptions/BetaOptIn")
-
-  div(:beta_parent, id: "enable-beta-toggle")
-  span(:beta) do |page|
-    page.beta_parent_element.span_element(class: "mw-mf-settings-off")
-  end
-  button(:save_settings, id:"mw-mf-settings-save")
-end
diff --git a/tests/browser/features/support/pages/mobile_options_page.rb 
b/tests/browser/features/support/pages/mobile_options_page.rb
new file mode 100644
index 0000000..0cca8dd
--- /dev/null
+++ b/tests/browser/features/support/pages/mobile_options_page.rb
@@ -0,0 +1,17 @@
+class MobileOptions
+  include PageObject
+
+  include URL
+  page_url URL.url("Special:MobileOptions")
+
+  div(:beta_parent, id: "enable-beta-toggle")
+  div(:alpha_parent, id: "enable-alpha-toggle")
+
+  span(:beta) do |page|
+    page.beta_parent_element.span_element(class: "mw-mf-settings-off")
+  end
+  span(:alpha) do |page|
+    page.alpha_parent_element.span_element(class: "mw-mf-settings-off")
+  end
+  button(:save_settings, id:"mw-mf-settings-save")
+end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I64070ecb121fd8c021ea139dd010b7dae06139cf
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to