jenkins-bot has submitted this change and it was merged. Change subject: [Browser test] New test for multi-edit workflow ......................................................................
[Browser test] New test for multi-edit workflow 1) Per reviewer comments, moved some of the verbosity from feature to steps file in order to make the feature file a little more readable. 2) Using random strings for the text of each edit in order to make every edit unique. 3) Removing a commented line that wasn't needed. Bug: 57654 Change-Id: Ib8b15964436d9c24556fac32977a64e2d5f22044 --- A modules/ve-mw/test/browser/features/multiedit_workflow.feature A modules/ve-mw/test/browser/features/step_definitions/multiedit_worfklow_steps.rb M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb 3 files changed, 52 insertions(+), 0 deletions(-) Approvals: Cmcmahon: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/test/browser/features/multiedit_workflow.feature b/modules/ve-mw/test/browser/features/multiedit_workflow.feature new file mode 100644 index 0000000..dfa8e05 --- /dev/null +++ b/modules/ve-mw/test/browser/features/multiedit_workflow.feature @@ -0,0 +1,20 @@ +# encoding: UTF-8 +@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org @login +Feature: VisualEditor multi-edit workflow + + Goal of the test is to make sure the "Save" and "Review Changes" + workflows are consistent even where a user makes multiple page + edits in the same session. See this bug ticket: + https://bugzilla.wikimedia.org/show_bug.cgi?id=57654 + + Not implemented as a Scenario outline since the goal is + to test multiple page edits within a single session. + + Scenario: Make multiple edits to the same article + Given I am logged in + When I am at my user page + And I click Edit for VisualEditor + And I enter and save the first edit + And I enter and save a second edit + And I enter and save a third edit + Then the saved page should contain all three edits. \ No newline at end of file diff --git a/modules/ve-mw/test/browser/features/step_definitions/multiedit_worfklow_steps.rb b/modules/ve-mw/test/browser/features/step_definitions/multiedit_worfklow_steps.rb new file mode 100644 index 0000000..9a430f3 --- /dev/null +++ b/modules/ve-mw/test/browser/features/step_definitions/multiedit_worfklow_steps.rb @@ -0,0 +1,31 @@ +When(/^I enter and save the first edit$/) do + @first_edit_text = Random.rand.to_s + step "I insert the text #{@first_edit_text}" + step "I click Save page" + step "I click This is a minor edit" + step "I click Review your changes" + step "I click Return to save form" + step "I click Save page the second time" +end + +When(/^I enter and save a (.+) edit$/) do |count| + sleep 2 # Wait for the save confirmation to disappear + edit_text = Random.rand.to_s + instance_variable_set("@#{count}_edit_text", edit_text) + step "I click Edit for VisualEditor" + step "I insert the text #{edit_text}" + step "I click Save page" + step "I click Save page another time" +end + +When(/^I insert the text (.*?)$/) do |input_string| + on(VisualEditorPage).content_element.when_present.send_keys(input_string) +end + +When(/^I click Save page another time$/) do + on(VisualEditorPage).another_save_page_element.when_present.click +end + +Then(/^the saved page should contain all three edits\.$/) do + on(VisualEditorPage).page_text_element.when_present.text.should match(@third_edit_text + @second_edit_text + @first_edit_text) +end \ No newline at end of file diff --git a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb index b43ecd9..a0ffda5 100644 --- a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb +++ b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb @@ -53,6 +53,7 @@ div(:content_box, class: 've-ce-documentNode ve-ce-branchNode', frame: frame) span(:leftarrowclose, class: 'oo-ui-iconedElement-icon oo-ui-icon-previous', frame: frame) text_field(:link_textfield, index: 0, frame: frame) + span(:another_save_page, class: 'oo-ui-labeledElement-label', text: 'Save page', frame: frame) list_item(:template_list_item, text: 'S', frame: frame) div(:ve_link_ui, class: 'oo-ui-window-title', frame: frame) end -- To view, visit https://gerrit.wikimedia.org/r/102308 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib8b15964436d9c24556fac32977a64e2d5f22044 Gerrit-PatchSet: 9 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jhall <[email protected]> Gerrit-Reviewer: Cmcmahon <[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
