Matthias Mullie has submitted this change and it was merged. Change subject: Board description browser tests ......................................................................
Board description browser tests Reworked from https://gerrit.wikimedia.org/r/#/c/171224 https://gerrit.wikimedia.org/r/#/c/171225 Change-Id: I13d38cd909a5f2f6fb80571313e21f12f3a8915f --- M handlebars/compiled/flow_block_header_edit.handlebars.php M handlebars/compiled/flow_block_topic.handlebars.php M handlebars/compiled/flow_block_topiclist.handlebars.php M handlebars/flow_block_header_edit.handlebars A tests/browser/features/description.feature A tests/browser/features/step_definitions/description_steps.rb M tests/browser/features/support/pages/flow_page.rb M tests/browser/features/support/pages/new_flow_page.rb 8 files changed, 48 insertions(+), 12 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/handlebars/compiled/flow_block_header_edit.handlebars.php b/handlebars/compiled/flow_block_header_edit.handlebars.php index ddea3b1..a7318c2 100644 --- a/handlebars/compiled/flow_block_header_edit.handlebars.php +++ b/handlebars/compiled/flow_block_header_edit.handlebars.php @@ -44,7 +44,7 @@ return '<div class="flow-board-header"> '.LCRun3::p($cx, 'flow_header_title', array(array($in),array()), ' ').' <div class="flow-board-header-edit-view"> - <form method="POST" action="'.htmlentities((string)((isset($in['revision']['actions']['edit']['url']) && is_array($in['revision']['actions']['edit'])) ? $in['revision']['actions']['edit']['url'] : null), ENT_QUOTES, 'UTF-8').'" flow-api-action="edit-header"> + <form method="POST" action="'.htmlentities((string)((isset($in['revision']['actions']['edit']['url']) && is_array($in['revision']['actions']['edit'])) ? $in['revision']['actions']['edit']['url'] : null), ENT_QUOTES, 'UTF-8').'" flow-api-action="edit-header" class="edit-header-form"> '.LCRun3::p($cx, 'flow_errors', array(array($in),array()), ' ').' <input type="hidden" name="wpEditToken" value="'.htmlentities((string)((isset($cx['sp_vars']['root']['editToken']) && is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['editToken'] : null), ENT_QUOTES, 'UTF-8').'" /> '.((LCRun3::ifvar($cx, ((isset($in['revision']['revisionId']) && is_array($in['revision'])) ? $in['revision']['revisionId'] : null))) ? ' <input type="hidden" name="header_prev_revision" value="'.htmlentities((string)((isset($in['revision']['revisionId']) && is_array($in['revision'])) ? $in['revision']['revisionId'] : null), ENT_QUOTES, 'UTF-8').'" /> ' : '').' diff --git a/handlebars/compiled/flow_block_topic.handlebars.php b/handlebars/compiled/flow_block_topic.handlebars.php index a344f54..6a04022 100644 --- a/handlebars/compiled/flow_block_topic.handlebars.php +++ b/handlebars/compiled/flow_block_topic.handlebars.php @@ -259,4 +259,4 @@ </div> '; } -?> \ No newline at end of file +?> diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php b/handlebars/compiled/flow_block_topiclist.handlebars.php index 248517d..b42e8eb 100644 --- a/handlebars/compiled/flow_block_topiclist.handlebars.php +++ b/handlebars/compiled/flow_block_topiclist.handlebars.php @@ -378,4 +378,4 @@ </div> '; } -?> \ No newline at end of file +?> diff --git a/handlebars/flow_block_header_edit.handlebars b/handlebars/flow_block_header_edit.handlebars index 583aa69..0df8655 100644 --- a/handlebars/flow_block_header_edit.handlebars +++ b/handlebars/flow_block_header_edit.handlebars @@ -1,7 +1,7 @@ <div class="flow-board-header"> {{> flow_header_title}} <div class="flow-board-header-edit-view"> - <form method="POST" action="{{revision.actions.edit.url}}" flow-api-action="edit-header"> + <form method="POST" action="{{revision.actions.edit.url}}" flow-api-action="edit-header" class="edit-header-form"> {{> flow_errors }} <input type="hidden" name="wpEditToken" value="{{@root.editToken}}" /> {{#if revision.revisionId}} diff --git a/tests/browser/features/description.feature b/tests/browser/features/description.feature new file mode 100644 index 0000000..2dbae1f --- /dev/null +++ b/tests/browser/features/description.feature @@ -0,0 +1,18 @@ +@chrome @firefox @internet_explorer_10 +@login +@en.wikipedia.beta.wmflabs.org +Feature: Board description + + Assumes Flow is enabled for the Flow_test_talk namespace. + + Background: + Given I am logged in + + Scenario: No description on a new board + When I am on a new board + Then the description should be " " + + Scenario: Edit description on a new board + Given I am on a new board + When I set the description to "test12345" + Then the description should be "test12345" diff --git a/tests/browser/features/step_definitions/description_steps.rb b/tests/browser/features/step_definitions/description_steps.rb new file mode 100644 index 0000000..9593dc9 --- /dev/null +++ b/tests/browser/features/step_definitions/description_steps.rb @@ -0,0 +1,16 @@ +Then(/^the description should be "(.*?)"$/) do |content| + on(FlowPage) do |page| + page.description_content_element.when_present + page.description_content.should match Regexp.escape(content) + end +end + +When(/^I set the description to "(.*?)"$/) do |description_text| + on(FlowPage) do |page| + page.edit_description_link_element.click + page.edit_description_form_element.when_visible + page.edit_description_textbox_element.when_present.clear + page.edit_description_textbox_element.when_present.send_keys description_text + page.edit_description_save_element.when_present.click + end +end diff --git a/tests/browser/features/support/pages/flow_page.rb b/tests/browser/features/support/pages/flow_page.rb index 85243a2..d2b382e 100644 --- a/tests/browser/features/support/pages/flow_page.rb +++ b/tests/browser/features/support/pages/flow_page.rb @@ -14,11 +14,13 @@ end end - # board header - a(:edit_header_link, title: "Edit header") - div(:header_content, css: ".flow-board-header-detail-view p", index: 0) - form(:edit_header_form, css: ".flow-board-header-edit-view form") - textarea(:edit_header_textbox, css: ".flow-board-header-edit-view textarea") + # board description + a(:edit_description_link, title: "Edit description") + div(:description_content, css: ".flow-board-header-detail-view") + form(:edit_description_form, css: ".edit-header-form") + def edit_description_textbox_element + visualeditor_or_textarea 'edit-header-form' + end a(:author_link, css: ".flow-author a", index: 0) a(:cancel_button, text: "Cancel") @@ -242,7 +244,7 @@ div(:small_spinner, class: "mw-spinner mw-spinner-small mw-spinner-inline") - button(:edit_header_save, text: "Save header") + button(:edit_description_save, text: "Save description") # No javascript elements button(:no_javascript_add_topic, text: "Add topic") diff --git a/tests/browser/features/support/pages/new_flow_page.rb b/tests/browser/features/support/pages/new_flow_page.rb index 16ed9c6..d88ae96 100644 --- a/tests/browser/features/support/pages/new_flow_page.rb +++ b/tests/browser/features/support/pages/new_flow_page.rb @@ -2,6 +2,6 @@ class NewFlowPage < FlowPage include URL - # MEDIAWIKI_URL must have User_talk in $wgFlowOccupyNamespaces. - page_url URL.url("User_talk:New page " + Array.new(8) { [*'0'..'9', *'a'..'z', *'A'..'Z'].sample }.join) + # MEDIAWIKI_URL must have Flow_test_talk in $wgFlowOccupyNamespaces. + page_url URL.url("Flow_test_talk:New page " + Random.srand.to_s) end -- To view, visit https://gerrit.wikimedia.org/r/220296 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I13d38cd909a5f2f6fb80571313e21f12f3a8915f Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Sbisson <sbis...@wikimedia.org> Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org> Gerrit-Reviewer: Matthias Mullie <mmul...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
