jenkins-bot has submitted this change and it was merged.
Change subject: QA: Moving some common test steps into a 'common' file.
......................................................................
QA: Moving some common test steps into a 'common' file.
Change-Id: Ic0027487f9cf845c0b2e0e57345ab28ff61da33d
---
A tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/step_definitions/watchlist_steps.rb
2 files changed, 36 insertions(+), 37 deletions(-)
Approvals:
Jdlrobson: 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
new file mode 100644
index 0000000..4393249
--- /dev/null
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -0,0 +1,36 @@
+Given /^I am logged into the mobile website$/ do
+ visit(HomePage) do |page|
+ page.mainmenu_button
+ page.login_button
+ end
+ on(LoginPage) do |page|
+ page.login_with(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD'])
+ if page.text.include? "There is no user by the name "
+ puts ENV['MEDIAWIKI_USER'] + ' does not exist... trying to add user'
+ on(HomePage).create_account_element.when_present.click
+ on(LoginPage) do |page|
+ page.username_element.element.when_present.set ENV['MEDIAWIKI_USER']
+ page.signup_password_element.element.when_present.set
ENV['MEDIAWIKI_PASSWORD']
+ page.confirm_password_element.element.when_present.set
ENV['MEDIAWIKI_PASSWORD']
+ page.signup_submit_element.element.when_present.click
+ page.text.should include 'Welcome, ' + ENV['MEDIAWIKI_USER'] + '!'
+ #Can't get around captcha in order to create a user
+ end
+ end
+ end
+end
+
+Given /^I am in beta mode$/ do
+ visit(BetaPage) do |page|
+ page.beta_element.click
+ page.save_settings
+ end
+end
+
+Given /^I am not logged in$/ do
+ # nothing to do here, user in not logged in by default
+end
+
+When /^I go to random page$/ do
+ visit(RandomPage)
+end
diff --git a/tests/browser/features/step_definitions/watchlist_steps.rb
b/tests/browser/features/step_definitions/watchlist_steps.rb
index 05a6f91..6c44824 100644
--- a/tests/browser/features/step_definitions/watchlist_steps.rb
+++ b/tests/browser/features/step_definitions/watchlist_steps.rb
@@ -1,14 +1,3 @@
-Given /^I am in beta mode$/ do
- visit(BetaPage) do |page|
- page.beta_element.click
- page.save_settings
- end
-end
-
-Given /^I am not logged in$/ do
- # nothing to do here, user in not logged in by default
-end
-
When /^I select the watchlist icon$/ do
on(HomePage).watch_link_element.when_present.click
end
@@ -22,32 +11,6 @@
page.login_wl_element.when_present.click
page.text.should include "Sign in"
end
-end
-
-Given /^I am logged into the mobile website$/ do
- visit(HomePage) do |page|
- page.mainmenu_button_element.when_present.click
- page.login_button
- end
- on(LoginPage) do |page|
- page.login_with(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD'])
- if page.text.include? "There is no user by the name "
- puts ENV['MEDIAWIKI_USER'] + ' does not exist... trying to add user'
- on(HomePage).create_account_element.when_present.click
- on(LoginPage) do |page|
- page.username_element.element.when_present.set ENV['MEDIAWIKI_USER']
- page.signup_password_element.element.when_present.set
ENV['MEDIAWIKI_PASSWORD']
- page.confirm_password_element.element.when_present.set
ENV['MEDIAWIKI_PASSWORD']
- page.signup_submit_element.element.when_present.click
- page.text.should include 'Welcome, ' + ENV['MEDIAWIKI_USER'] + '!'
- #Can't get around captcha in order to create a user
- end
- end
- end
-end
-
-When /^I go to random page$/ do
- visit(RandomPage)
end
Then /^I receive notification that the article has been added to the
watchlist$/ do
--
To view, visit https://gerrit.wikimedia.org/r/92582
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0027487f9cf845c0b2e0e57345ab28ff61da33d
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Mgrover <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
