Cmcmahon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102473
Change subject: Watchlist no longer has special login/signin link
......................................................................
Watchlist no longer has special login/signin link
Change-Id: I8c21e0801c16129fc0b8b89ea346eeaa25e29db6
---
M tests/browser/features/step_definitions/watchlist_steps.rb
M tests/browser/features/support/pages/home_page.rb
M tests/browser/features/watchlist.feature
3 files changed, 5 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/73/102473/1
diff --git a/tests/browser/features/step_definitions/watchlist_steps.rb
b/tests/browser/features/step_definitions/watchlist_steps.rb
index ed39dfc..9e21f05 100644
--- a/tests/browser/features/step_definitions/watchlist_steps.rb
+++ b/tests/browser/features/step_definitions/watchlist_steps.rb
@@ -1,11 +1,3 @@
-When /^I select the watchlist icon$/ do
- on(HomePage).watch_link_element.when_present.click
-end
-
-Then /^I receive notification that I need to log in to use the watchlist
functionality$/ do
- on(HomePage).text.should include "Please login or sign up to watch this
page."
-end
-
Then /^When I click Sign In I go to the Log In page$/ do
on(LoginPage) do |page|
page.login_wl_element.when_present.click
@@ -36,18 +28,10 @@
end
end
-When /^I click Login$/ do
- on(HomePage).login_watchlist_element.when_present.click
-end
-
Then /^Login page opens$/ do
Watir::Wait.until { @browser.url.match(Regexp.escape("Special:UserLogin")) }
@browser.url.should match Regexp.escape("Special:UserLogin")
@browser.url.should_not match Regexp.escape("&type=signup")
-end
-
-When /^I click Sign up$/ do
- on(HomePage).sign_up_watchlist_element.when_present.click
end
Then /^Sign up page opens$/ do
diff --git a/tests/browser/features/support/pages/home_page.rb
b/tests/browser/features/support/pages/home_page.rb
index a97c1fe..6882a20 100644
--- a/tests/browser/features/support/pages/home_page.rb
+++ b/tests/browser/features/support/pages/home_page.rb
@@ -13,7 +13,6 @@
a(:desktop_link, text: "Desktop")
a(:disclaimer_link, text: "Disclaimers")
a(:login_button, href: /Special:UserLogin/)
- a(:login_watchlist, href: /returntoquery=article_action%3Dwatch/)
div(:main_page, id: "mainpage")
a(:mainmenu_button, id: "mw-mf-main-menu-button")
span(:mobile_select, text: "Mobile")
@@ -32,7 +31,6 @@
a(:search_result) do |page|
page.search_results_element.a
end
- a(:sign_up_watchlist, href:
/returntoquery=article_action%3Dwatch&type=signup/)
a(:watch_link, class: "watch-this-article")
div(:watch_note, text: "Added San Francisco Chronicle to your watchlist")
div(:watch_note_removed, text: "Removed San Francisco Chronicle from your
watchlist")
diff --git a/tests/browser/features/watchlist.feature
b/tests/browser/features/watchlist.feature
index 4602e91..bb7839c 100644
--- a/tests/browser/features/watchlist.feature
+++ b/tests/browser/features/watchlist.feature
@@ -4,33 +4,20 @@
Scenario: I receive notification that I need to log in to use the watchlist
functionality
Given I am on the home page
And I am not logged in
- When I select the watchlist icon
- Then I receive notification that I need to log in to use the watchlist
functionality
-
- Scenario: Login link leads to login page
- Given I am on the home page
- And I am not logged in
- When I select the watchlist icon
- And I click Login
- Then Login page opens
-
- Scenario: Sign up link leads to Sign up page
- Given I am on the home page
- And I am not logged in
- When I select the watchlist icon
- And I click Sign up
- Then Sign up page opens
+ When I select Watchlist
+ Then I receive watchlist message A watchlist helps you bookmark pages and
keep track of changes to them.
+ And I receive watchlist message Login to see it.
Scenario: Add an article to the watchlist
Given I am logged into the mobile website
When I go to random page
- And I select the watchlist icon
+ And I select Watchlist
Then I receive notification that the article has been added to the
watchlist
And the article watchlist icon is selected
Scenario: Remove an article from the watchlist
Given I am logged into the mobile website
When I go to random page
- And I select the watchlist icon
+ And I select Watchlist
Then I receive notification that the article has been removed from the
watchlist
And the article no longer has the watchlist icon selected
--
To view, visit https://gerrit.wikimedia.org/r/102473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c21e0801c16129fc0b8b89ea346eeaa25e29db6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
