Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/117242
Change subject: Hygiene: Correct wording of URL check in QA tests ...................................................................... Hygiene: Correct wording of URL check in QA tests Change-Id: I151c42b4f2e6278a60fc2b1bd48175ad1499c26b --- M tests/browser/features/menu_opens_page.feature M tests/browser/features/search.feature M tests/browser/features/step_definitions/common_steps.rb M tests/browser/features/uploads_lead.feature M tests/browser/features/wikitext_editor.feature 5 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/42/117242/1 diff --git a/tests/browser/features/menu_opens_page.feature b/tests/browser/features/menu_opens_page.feature index 5276c75..5561963 100644 --- a/tests/browser/features/menu_opens_page.feature +++ b/tests/browser/features/menu_opens_page.feature @@ -6,28 +6,28 @@ Scenario: Home URL is set correctly When I click on "Home" in the main navigation menu - Then the URL of of my page should contain "Main_Page" + Then The URL of the page should contain "Main_Page" Scenario: Random URL is set correctly When I click on "Random" in the main navigation menu - Then the URL of of my page should contain "campaign=random" + Then The URL of the page should contain "campaign=random" Scenario: Nearby URL is set correctly When I click on "Nearby" in the main navigation menu - Then the URL of of my page should contain "Special:Nearby" + Then The URL of the page should contain "Special:Nearby" Scenario: Watchlist URL is set correctly When I click on "Watchlist" in the main navigation menu - Then the URL of of my page should contain "returnto=Special%3AWatchlist" + Then The URL of the page should contain "returnto=Special%3AWatchlist" Scenario: Uploads URL is set correctly When I click on "Uploads" in the main navigation menu - Then the URL of of my page should contain "returnto=Special%3AUploads" + Then The URL of the page should contain "returnto=Special%3AUploads" Scenario: Settings URL is set correctly When I click on "Settings" in the main navigation menu - Then the URL of of my page should contain "Special:MobileOptions" + Then The URL of the page should contain "Special:MobileOptions" Scenario: Log In URL is set correctly When I click on "Log in" in the main navigation menu - Then the URL of of my page should contain "Special:UserLogin" + Then The URL of the page should contain "Special:UserLogin" diff --git a/tests/browser/features/search.feature b/tests/browser/features/search.feature index 78ebbbf..f14586a 100644 --- a/tests/browser/features/search.feature +++ b/tests/browser/features/search.feature @@ -11,12 +11,12 @@ Scenario: Closing search (overlay button) When I click the search overlay close button Then I don't see the search overlay - And the URL of of my page should contain "Main%20Page" + And The URL of the page should contain "Main%20Page" Scenario: Closing search (browser button) When I click the browser back button Then I don't see the search overlay - And the URL of of my page should contain "Main%20Page" + And The URL of the page should contain "Main%20Page" Scenario: Search for partial text When I type into search box "bara" diff --git a/tests/browser/features/step_definitions/common_steps.rb b/tests/browser/features/step_definitions/common_steps.rb index 9880dbb..45e3c3b 100644 --- a/tests/browser/features/step_definitions/common_steps.rb +++ b/tests/browser/features/step_definitions/common_steps.rb @@ -101,7 +101,7 @@ visit(ArticlePage, :using_params => {:article_name => article}) end -Then(/^the URL of of my page should contain "(.+)"$/) do |article| +Then(/^The URL of the page should contain "(.+)"$/) do |article| on(ArticlePage).current_url.should match article end diff --git a/tests/browser/features/uploads_lead.feature b/tests/browser/features/uploads_lead.feature index ae6d1b9..ebdb536 100644 --- a/tests/browser/features/uploads_lead.feature +++ b/tests/browser/features/uploads_lead.feature @@ -13,9 +13,9 @@ Scenario: Closing upload preview (overlay button) When I click the upload preview overlay close button and confirm Then I don't see the upload preview - And the URL of of my page should contain "Nonexistent_page_abc" + And The URL of the page should contain "Nonexistent_page_abc" Scenario: Closing upload preview (browser button) When I click the browser back button and confirm Then I don't see the upload preview - And the URL of of my page should contain "Nonexistent_page_abc" + And The URL of the page should contain "Nonexistent_page_abc" diff --git a/tests/browser/features/wikitext_editor.feature b/tests/browser/features/wikitext_editor.feature index 3c8708b..1d4f7d9 100644 --- a/tests/browser/features/wikitext_editor.feature +++ b/tests/browser/features/wikitext_editor.feature @@ -12,9 +12,9 @@ Scenario: Closing editor (overlay button) When I click the wikitext editor overlay close button Then I should not see the wikitext editor - And the URL of of my page should contain "Nonexistent_page_ijewrcmhvg34773" + And The URL of the page should contain "Nonexistent_page_ijewrcmhvg34773" Scenario: Closing editor (browser button) When I click the browser back button Then I should not see the wikitext editor - And the URL of of my page should contain "Nonexistent_page_ijewrcmhvg34773" + And The URL of the page should contain "Nonexistent_page_ijewrcmhvg34773" -- To view, visit https://gerrit.wikimedia.org/r/117242 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I151c42b4f2e6278a60fc2b1bd48175ad1499c26b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits