Cmcmahon has submitted this change and it was merged.

Change subject: Less specific button selectors
......................................................................


Less specific button selectors

Leave presentation details out of "button in a flyout" and edit submit
actions.  Also move all the buttons in flyouts in one place.

All tests with this still pass on ee-flow!

Change-Id: Idf3ecb5e5e2f2dcd89c6cee04599195cffd0ec84
---
M tests/browser/features/support/pages/flow_page.rb
1 file changed, 11 insertions(+), 8 deletions(-)

Approvals:
  Cmcmahon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/browser/features/support/pages/flow_page.rb 
b/tests/browser/features/support/pages/flow_page.rb
index c97b60c..c0d692b 100644
--- a/tests/browser/features/support/pages/flow_page.rb
+++ b/tests/browser/features/support/pages/flow_page.rb
@@ -10,29 +10,32 @@
   a(:actions_link, text: "Actions", index: 1)
   span(:author_link, class: "flow-creator")
   a(:block_user, title: /Special:Block/)
-  button(:change_post_save, class: "mw-ui-button mw-ui-constructive 
flow-edit-post-submit")
-  button(:change_title_save, class: "flow-edit-title-submit mw-ui-button 
mw-ui-constructive")
   list_item(:collapsed_view, title: "Collapsed view")
+  button(:change_post_save, class: "flow-edit-post-submit")
+  button(:change_title_save, class: "flow-edit-title-submit")
   a(:contrib_link, text: "contribs")
-  button(:delete_button, css: "div.tipsy-inner > div.flow-tipsy-flyout > ul > 
li.flow-action-delete > form > input.flow-delete-post-link.mw-ui-button")
   a(:edit_post_icon, title: "Edit post")
   a(:edit_title_icon, title: "Edit title")
   div(:flow_body, class: "flow-container")
   list_item(:full_view, title: "Full view")
-  button(:hide_button, css: "div.tipsy-inner > div.flow-tipsy-flyout > ul > 
li.flow-action-hide > form > input.flow-hide-post-link.mw-ui-button")
+
+  # Buttons in a fly-out menu.
+  button(:delete_button,         css: "div.tipsy-inner 
input.flow-delete-post-link")
+  button(:hide_button,           css: "div.tipsy-inner 
input.flow-hide-post-link")
+  button(:suppress_button,       css: "div.tipsy-inner 
input.flow-suppress-post-link")
+  button(:topic_delete_button,   css: "div.tipsy-inner 
input.flow-delete-topic-link")
+  button(:topic_hide_button,     css: "div.tipsy-inner 
input.flow-hide-topic-link")
+  button(:topic_suppress_button, css: "div.tipsy-inner 
input.flow-suppress-topic-link")
+
   text_area(:new_topic_body, class: "flow-newtopic-content")
   button(:new_topic_save, class: "flow-newtopic-submit")
   text_field(:new_topic_title, name: "topic_list[topic]")
   text_field(:post_edit, class: "flow-edit-post-content flow-disabler")
   div(:small_spinner, class: "mw-spinner mw-spinner-small mw-spinner-inline")
   list_item(:small_view, title: "Small view")
-  button(:suppress_button, css: "div.tipsy-inner > div.flow-tipsy-flyout > ul 
> li.flow-action-suppress > form > input.flow-suppress-post-link.mw-ui-button")
   a(:talk_link, text: "Talk")
   text_field(:title_edit, class: "mw-ui-input flow-edit-title-textbox")
   a(:topic_actions_link, text: "Actions", index: 0)
-  button(:topic_delete_button, css: "div.tipsy-inner > div.flow-tipsy-flyout > 
ul > li.flow-action-delete > form > input.mw-ui-button.flow-delete-topic-link")
-  button(:topic_hide_button, css: "div.tipsy-inner > div.flow-tipsy-flyout > 
ul > li.flow-action-hide > form > input.mw-ui-button.flow-hide-topic-link")
   div(:topic_post, class: "flow-post-content")
-  button(:topic_suppress_button, css: "div.tipsy-inner > div.flow-tipsy-flyout 
> ul > li.flow-action-suppress > form > 
input.mw-ui-button.flow-suppress-topic-link")
   div(:topic_title, class: "flow-topic-title")
 end

-- 
To view, visit https://gerrit.wikimedia.org/r/102544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf3ecb5e5e2f2dcd89c6cee04599195cffd0ec84
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Spage <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: Spage <[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

Reply via email to