jenkins-bot has submitted this change and it was merged.
Change subject: Add classes to toolbar UI elements
......................................................................
Add classes to toolbar UI elements
This cleans up the selectors for the elements on the toolbar
so that they can be tested.
Class names in the form of ve-test-* are added to elements
that have words for labels: 'Paragraph', 'Cite', 'Insert'.
There is no other way to look up these elements in the DOM
except using the UI text, but it is different in different languages,
so this is unusable for the language_screenshots job,
which is multilingual by its nature.
Bug: T76143
Change-Id: Ib0cb67151d893a5d2efccf798d6b25d197ed34d2
---
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/tests/browser/features/language_screenshot.feature
M modules/ve-mw/tests/browser/features/step_definitions/headings_steps.rb
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
5 files changed, 15 insertions(+), 10 deletions(-)
Approvals:
Zfilipin: Looks good to me, but someone else must approve
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index c1a425f..4a1d5cc 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -192,6 +192,7 @@
{ include: [ 'undo', 'redo' ] },
// Format
{
+ classes: [ 've-test-toolbar-format' ],
type: 'menu',
indicator: 'down',
title: OO.ui.deferMsg( 'visualeditor-toolbar-format-tooltip' ),
@@ -214,6 +215,7 @@
{ include: [ 'link' ] },
// Cite
{
+ classes: [ 've-test-toolbar-cite' ],
type: 'list',
label: OO.ui.deferMsg( 'visualeditor-toolbar-cite-label' ),
indicator: 'down',
@@ -230,6 +232,7 @@
},
// Insert
{
+ classes: [ 've-test-toolbar-insert' ],
label: OO.ui.deferMsg( 'visualeditor-toolbar-insert' ),
indicator: 'down',
include: '*',
diff --git a/modules/ve-mw/tests/browser/features/language_screenshot.feature
b/modules/ve-mw/tests/browser/features/language_screenshot.feature
index b86bdb6..f7d13b0 100644
--- a/modules/ve-mw/tests/browser/features/language_screenshot.feature
+++ b/modules/ve-mw/tests/browser/features/language_screenshot.feature
@@ -96,6 +96,7 @@
And I select the image in VisualEditor
Then I should see media in VisualEditor
+ @language_screenshot
Scenario: VisualEditor_Cite_Pulldown
Given I am editing language screenshot page
When I click on Cite menu
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/headings_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/headings_steps.rb
index 127470d..ee634ea 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/headings_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/headings_steps.rb
@@ -31,5 +31,5 @@
end
When(/^I click the down arrow on Headings interface$/) do
- on(VisualEditorPage).downarrow_element.when_present.click
+ on(VisualEditorPage).toolbar_format_element.when_present.click
end
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index b2dd0cd..c47bcc1 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -132,7 +132,7 @@
end
Then(/^I take screenshot of pull-dowm menu$/) do
-
capture_screenshot("#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png",
[@current_page.downarrow_element, @current_page.heading_dropdown_menus_element])
+
capture_screenshot("#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png",
[@current_page.toolbar_format_element,
@current_page.heading_dropdown_menus_element])
end
Then(/^I should see Formatting pull-down menu$/) do
@@ -179,7 +179,7 @@
end
Then(/^I click on More in insert pull-down menu$/) do
- on(VisualEditorPage).ve_more_references_options_element.when_present.click
+ on(VisualEditorPage).insert_more_fewer_element.when_present.click
end
Then(/^I should see Special character Insertion window$/) do
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 8fb5db9..c77289b 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -22,15 +22,15 @@
div(:cite_basic_options_area, class: 'oo-ui-layout oo-ui-iconElement
oo-ui-labelElement oo-ui-fieldsetLayout')
span(:cite_basic_reference, css: '.oo-ui-icon-reference')
a(:cite_book, css: '.oo-ui-tool-name-cite-book > a:nth-child(1)')
- span(:cite_button, text: 'Cite')
+ span(:cite_button, css: '.ve-test-toolbar-cite .oo-ui-labelElement-label')
text_field(:cite_custom_field_name, css: '.oo-ui-searchWidget-query >
div:nth-child(1) > input:nth-child(1)')
div(:cite_group_name_textarea, class: 'oo-ui-widget oo-ui-widget-enabled
oo-ui-inputWidget oo-ui-indicatorElement oo-ui-textInputWidget')
a(:cite_journal, css: '.oo-ui-tool-name-cite-journal > a:nth-child(1)')
- span(:cite_menu, class: 'oo-ui-popupToolGroup-handle', index: 2)
+ span(:cite_menu, css: '.ve-test-toolbar-cite .oo-ui-indicator-down')
div(:cite_new_field_label, css: '.oo-ui-optionWidget')
text_area(:cite_new_website_field, css: 'div.oo-ui-layout:nth-child(10) >
div:nth-child(3) > div:nth-child(1) > textarea:nth-child(1)')
a(:cite_news, css: '.oo-ui-tool-name-cite-news > a:nth-child(1)')
- div(:cite_pull_down, class: 'oo-ui-toolGroup-tools
oo-ui-clippableElement-clippable', index: 2)
+ div(:cite_pull_down, css: '.ve-test-toolbar-cite
.oo-ui-clippableElement-clippable')
div(:cite_select, css: 'div.oo-ui-widget:nth-child(5) > div:nth-child(2)')
div(:cite_show_more_fields, class:
've-ui-mwMoreParametersResultWidget-label')
div(:cite_ui, class: 'oo-ui-window-frame')
@@ -48,7 +48,7 @@
div(:disabled_save_button, class: 'oo-ui-widget oo-ui-widget-disabled
oo-ui-buttonElement oo-ui-buttonElement-framed oo-ui-labelElement
oo-ui-flaggedElement-constructive oo-ui-flaggedElement-primary
oo-ui-buttonWidget ve-ui-toolbar-saveButton oo-ui-image-constructive')
text_field(:display_title_textbox, css:
'div.oo-ui-fieldLayout-align-inline:nth-child(4) > label:nth-child(1) >
div:nth-child(1) > div:nth-child(1) > input:nth-child(1)')
text_field(:redirect_page_name_textbox, css: '.oo-ui-flaggedElement-invalid
> input:nth-child(1)')
- span(:downarrow, class: 'oo-ui-indicatorElement-indicator
oo-ui-indicator-down')
+ span(:toolbar_format, css: '.ve-test-toolbar-format .oo-ui-indicator-down')
a(:edit_ve, title: /Edit this page with VisualEditor/)
a(:edit_wikitext, title: /You can edit this page\./)
span(:ex, text: 'Return to save form')
@@ -58,15 +58,16 @@
span(:formula_insert_menu, class: 'oo-ui-tool-name-math')
a(:formula_link, css: 'span.oo-ui-tool-name-math > a.oo-ui-tool-link')
a(:heading, text: /Heading/)
- span(:hamburger_menu, css: 'div.oo-ui-listToolGroup:nth-child(2) >
span:nth-child(1) > span:nth-child(3)')
+ span(:hamburger_menu, class: 'oo-ui-iconElement-icon oo-ui-icon-menu')
div(:heading_dropdown_menus, class: 'oo-ui-toolGroup-tools
oo-ui-clippableElement-clippable', index: 1)
div(:iframe, css: 'div.oo-ui-window-setup > div.oo-ui-window-frame')
span(:increase_indentation, class: 'oo-ui-iconElement-icon
oo-ui-icon-indent-list')
div(:indentation_pull_down, class: 'oo-ui-toolGroup-tools
oo-ui-clippableElement-clippable', index: 3)
span(:insert_citation, css: '.ve-ui-nodeDialog > div:nth-child(1) >
div:nth-child(1) > div:nth-child(3) > div:nth-child(1) > a:nth-child(1) >
span:nth-child(2)
')
- span(:insert_menu, class: 'oo-ui-popupToolGroup-handle', index: 5)
- div(:insert_pull_down, class: 'oo-ui-toolGroup-tools
oo-ui-clippableElement-clippable', index: 5)
+ span(:insert_menu, css: '.ve-test-toolbar-insert .oo-ui-indicator-down')
+ a(:insert_more_fewer, css: '.ve-test-toolbar-insert
.oo-ui-tool-name-more-fewer .oo-ui-tool-link')
+ div(:insert_pull_down, class: 've-test-toolbar-insert')
div(:insert_references, class: 'oo-ui-processDialog-location')
span(:insert, text: 'Insert')
a(:internal_link, class: 've-ce-linkAnnotation
ve-ce-mwInternalLinkAnnotation')
--
To view, visit https://gerrit.wikimedia.org/r/174666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0cb67151d893a5d2efccf798d6b25d197ed34d2
Gerrit-PatchSet: 16
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: Vikassy <[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
