jenkins-bot has submitted this change and it was merged. Change subject: QA: fix moderation test ......................................................................
QA: fix moderation test https://lists.wikimedia.org/pipermail/qa/2014-October/002023.html and makes the test pass Change-Id: I11b176564536be4971026a1f3c109579c3c90305 --- M tests/browser/features/moderation.feature M tests/browser/features/step_definitions/moderation_steps.rb M tests/browser/features/support/pages/flow_page.rb 3 files changed, 13 insertions(+), 27 deletions(-) Approvals: Cmcmahon: Looks good to me, approved Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/moderation.feature b/tests/browser/features/moderation.feature index faac1ba..3fa1441 100644 --- a/tests/browser/features/moderation.feature +++ b/tests/browser/features/moderation.feature @@ -1,4 +1,4 @@ -@chrome @firefox @internet_explorer_10 @login +@chrome @clean @en.wikipedia.beta.wmflabs.org @firefox @internet_explorer_10 @login @test2.wikipedia.org Feature: Moderation Assumes Flow is enabled for the User_talk namespace. diff --git a/tests/browser/features/step_definitions/moderation_steps.rb b/tests/browser/features/step_definitions/moderation_steps.rb index edc2d8a..7b94a1c 100644 --- a/tests/browser/features/step_definitions/moderation_steps.rb +++ b/tests/browser/features/step_definitions/moderation_steps.rb @@ -1,13 +1,9 @@ -# TODO (mattflaschen, 2014-06-25): Have the below actions (e.g. 'I -# click Delete topic') wait for the dialog box to be non-visible -# afterwards (to confirm API call finished), rather than use -# timeouts? When(/^I cancel the dialog$/) do on(FlowPage).dialog_cancel_element.when_present.click end When(/^I click Delete topic$/) do - on(FlowPage).dialog_submit_element.when_present.click + on(FlowPage).dialog_submit_delete_element.when_present.click end When(/^I click Hide topic$/) do @@ -15,27 +11,19 @@ end When(/^I click Suppress topic$/) do - on(FlowPage).dialog_submit_element.when_present.click + on(FlowPage).dialog_submit_suppress_element.when_present.click end When(/^I give reason for deletion as being "(.*?)"$/) do |delete_reason| - on(FlowPage) do |page| - page.dialog_input_expand_element.when_present.click - page.dialog_input_element.when_present.send_keys(delete_reason) - end + on(FlowPage).dialog_input_element.when_present.send_keys(delete_reason) end When(/^I give reason for hiding as being "(.*?)"$/) do |hide_reason| - on(FlowPage) do |page| - page.dialog_input_element.when_present.send_keys(hide_reason) - end + on(FlowPage).dialog_input_element.when_present.send_keys(hide_reason) end When(/^I give reason for suppression as being "(.*?)"$/) do |suppress_reason| - on(FlowPage) do |page| - page.dialog_input_expand_element.when_present.click - page.dialog_input_element.when_present.send_keys(suppress_reason) - end + on(FlowPage).dialog_input_element.when_present.send_keys(suppress_reason) end When(/^I see a dialog box$/) do @@ -50,11 +38,10 @@ on(FlowPage).dialog_element.when_not_present end - Then(/^the top post should be marked as deleted$/) do - on(FlowPage).flow_first_topic_moderation_msg.when_present.should match( 'This topic was deleted' ) + expect(on(FlowPage).flow_first_topic_moderation_msg_element.when_present.text).to match("This topic was locked by Selenium user") end Then(/^the top post should be marked as suppressed$/) do - on(FlowPage).flow_first_topic_moderation_msg.when_present.should match( 'This topic was suppressed' ) -end \ No newline at end of file + expect(on(FlowPage).flow_first_topic_moderation_msg_element.when_present.text).to match("This topic was locked by Selenium user") +end diff --git a/tests/browser/features/support/pages/flow_page.rb b/tests/browser/features/support/pages/flow_page.rb index e6e7fe0..b6e3e76 100644 --- a/tests/browser/features/support/pages/flow_page.rb +++ b/tests/browser/features/support/pages/flow_page.rb @@ -32,8 +32,9 @@ # Dialogs div(:dialog, css: ".flow-ui-modal") textarea(:dialog_input, name: "topic_reason") - button(:dialog_cancel, css: ".flow-ui-modal .mw-ui-destructive") - button(:dialog_submit, text: "Hide") + button(:dialog_cancel, css: "a.mw-ui-destructive:nth-child(2)") + button(:dialog_submit_delete, text: "Delete") + button(:dialog_submit_suppress, text: "Suppress") # Posts ## Highlighted post @@ -43,9 +44,7 @@ div(:flow_first_topic, css: ".flow-topic", index: 0) h2(:flow_first_topic_heading, css: ".flow-topic h2", index: 0) div(:flow_first_topic_body, css: ".flow-post-content", index: 0) - div(:flow_first_topic_moderation_msg) do |page| - page.flow_first_topic_element.div_element(css: '.flow-moderated-topic-title', index: 0) - end + div(:flow_first_topic_moderation_msg, css: "div.flow-topic-titlebar div.flow-moderated-topic-title") div(:flow_first_topic_summary) do |page| page.flow_first_topic_element.div_element(css: ".flow-topic-summary") end -- To view, visit https://gerrit.wikimedia.org/r/167398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I11b176564536be4971026a1f3c109579c3c90305 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Cmcmahon <[email protected]> Gerrit-Reviewer: Cmcmahon <[email protected]> Gerrit-Reviewer: Dduvall <[email protected]> Gerrit-Reviewer: SG <[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
