Zfilipin has submitted this change and it was merged. Change subject: accommodate altered page create workflow on beta ......................................................................
accommodate altered page create workflow on beta Change-Id: I4d42d94bd3789da5ecf3aa7fc0011ecb49d4792a --- M features/page.feature M features/step_definitions/page_steps.rb M features/support/pages/article_page.rb 3 files changed, 20 insertions(+), 13 deletions(-) Approvals: Zfilipin: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/features/page.feature b/features/page.feature index cd9c722..eabf94d 100644 --- a/features/page.feature +++ b/features/page.feature @@ -1,12 +1,15 @@ [email protected] [email protected] @login Feature: Page - Scenario: Anonymous goes to page that does not exist + Background: + Given I am logged in + + Scenario:Go to page that does not exist Given I am at page that does not exist - Then page text should contain There is currently no text in this page. + Then page text should contain Wikipedia does not have an article with this exact name And link Create should be there - Scenario: Anonymous goes to start a new page using the URL + Scenario: Prepare to start a new page using the URL Given I am at page that does not exist When I click link Create Then edit page should open @@ -16,7 +19,7 @@ And Show Changes button should be there And Edit controls should be there - Scenario: Anonymous starts a new page using the URL + Scenario: Start a new page using the URL Given I am at page that does not exist When I click link Create And I enter article text @@ -27,9 +30,9 @@ And Discussion link should be there And Edit link should be there And View History link should be there - And watchlist element should not be there + And unwatch element should be there + And watch element should not be there - @login Scenario: Move existing page dialog Given I am logged in And I am starting a page to be moved @@ -39,10 +42,9 @@ And I should see a Namespace selectbox And I should see a To new title textbox And I should see a Reason textarea - And I should see a Leave a redirect radio button And I should see a Watch source page radio button - @ie6-bug @login + @ie6-bug Scenario: Move existing page Given I am logged in And I am starting a page to be moved to a new name diff --git a/features/step_definitions/page_steps.rb b/features/step_definitions/page_steps.rb index e4aff23..9172667 100644 --- a/features/step_definitions/page_steps.rb +++ b/features/step_definitions/page_steps.rb @@ -22,7 +22,7 @@ @browser.url.should match Regexp.escape(@does_not_exist_page_name) end Then /^page text should be there$/ do - on(ArticlePage).page_text.should == "Starting a new page using the URL" + on(ArticlePage).page_text.should match Regexp.escape("Starting a new page using the URL") end Then /^page text should contain (.+)$/ do |text| on(DoesNotExistPage).page_text.should match Regexp.escape(text) @@ -33,8 +33,12 @@ Then /^text box with page text should be there$/ do on(EditPage).article_text_element.should exist end -Then /^watchlist element should not be there$/ do - on(ArticlePage).watchlist_element.should_not exist +Then /^watch element should not be there$/ do + on(ArticlePage).watch_element.should_not exist +end + +Then /^unwatch element should be there$/ do + on(ArticlePage).unwatch_element.should exist end Given /^I am starting a page to be moved$/ do diff --git a/features/support/pages/article_page.rb b/features/support/pages/article_page.rb index 13abc8a..14e760b 100644 --- a/features/support/pages/article_page.rb +++ b/features/support/pages/article_page.rb @@ -8,7 +8,8 @@ a(:edit, text: 'Edit') div(:page_text, id: 'mw-content-text') h1(:title, id: 'firstHeading') - a(:watchlist, text: 'Unwatch') + li(:watch, id: 'ca-watch') + li(:unwatch, id: 'ca-unwatch') a(:move_link, text: 'Move') div(:actions, id: 'p-cactions') a(:actions_link) do |page| -- To view, visit https://gerrit.wikimedia.org/r/67365 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d42d94bd3789da5ecf3aa7fc0011ecb49d4792a Gerrit-PatchSet: 2 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Cmcmahon <[email protected]> Gerrit-Reviewer: Cmcmahon <[email protected]> Gerrit-Reviewer: Rachel99 <[email protected]> Gerrit-Reviewer: Zfilipin <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
