Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92900
Change subject: WIP: Refactoring of the textarea font tests
......................................................................
WIP: Refactoring of the textarea font tests
Started in a pairing session with Zeljko.
Change-Id: I30ef2b41cfdceda04818f16f06e0071c487b90b6
---
M tests/browser/features/step_definitions/cog_sidebar_user_steps.rb
M tests/browser/features/step_definitions/panel_steps.rb
M tests/browser/features/step_definitions/textarea_font_steps.rb
M tests/browser/features/support/pages/panel_page.rb
M tests/browser/features/support/pages/preferences_page.rb
M tests/browser/features/textarea_font.feature
6 files changed, 35 insertions(+), 20 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/00/92900/1
diff --git a/tests/browser/features/step_definitions/cog_sidebar_user_steps.rb
b/tests/browser/features/step_definitions/cog_sidebar_user_steps.rb
index f3da883..fbc1145 100644
--- a/tests/browser/features/step_definitions/cog_sidebar_user_steps.rb
+++ b/tests/browser/features/step_definitions/cog_sidebar_user_steps.rb
@@ -50,7 +50,7 @@
end
When(/^in the language filter I type (.+)$/) do |language_abbreviation|
- on(RandomPage).language_filter=language_abbreviation
+ on(IMEPage).language_filter=language_abbreviation
end
Then(/^I can navigate back to Input Settings$/) do
diff --git a/tests/browser/features/step_definitions/panel_steps.rb
b/tests/browser/features/step_definitions/panel_steps.rb
index a939b81..9141f11 100644
--- a/tests/browser/features/step_definitions/panel_steps.rb
+++ b/tests/browser/features/step_definitions/panel_steps.rb
@@ -2,6 +2,22 @@
@browser.span(:text => "#{text}").should be_visible
end
+When(/^I open the Universal Language Selector$/) do
+ on(PanelPage).trigger_personal_element.when_visible.click
+end
+
+When(/^I open Display panel of language settings$/) do
+ on(PanelPage).panel_display_element.when_visible.click
+end
+
+When(/^I open Language panel of language settings$/) do
+ on(PanelPage).panel_language_element.click
+end
+
+When(/^I open Fonts panel of language settings$/) do
+ on(PanelPage).panel_fonts_element.click
+end
+
When(/^I open "(.*?)" panel of language settings$/) do |panel|
visit(PanelPage) do |page|
# Open the ULS panel if it's not open already
@@ -15,11 +31,6 @@
end
case panel
- when "Display"
- page.panel_display_element.when_visible.click
- when "Language"
- page.panel_display_element.when_visible.click
- page.panel_language_element.click
when "Fonts"
page.panel_display_element.when_visible.click
page.panel_fonts_element.click
@@ -32,11 +43,11 @@
end
When(/^I select "(.*?)" font for the interface language for the live
preview$/) do |font|
- on(PanelPage).select_font_for_interface = font
+ on(PanelPage).font_for_interface = font
end
When(/^I select "(.*?)" font for the content language for the live preview$/)
do |font|
- on(PanelPage).select_font_for_content = font
+ on(PanelPage).font_for_content = font
end
@@ -66,9 +77,11 @@
When(/^I use the panel to change my interface language to "(.*?)"$/) do
|language|
code = on(PanelPage).language_to_code(language)
- on(RandomPage).language_filter = code
- # Because one browser wants :enter and other :return -- sigh
- on(RandomPage).language_filter_element.send_keys [:enter, "\n"]
+ on(IMEPage) do |page|
+ page.language_filter = code
+ # Because one browser wants :enter and other :return -- sigh
+ page.language_filter_element.send_keys [:enter, "\n"]
+ end
end
Then(/^the panel is in English/) do
diff --git a/tests/browser/features/step_definitions/textarea_font_steps.rb
b/tests/browser/features/step_definitions/textarea_font_steps.rb
index 4a8fb25..6a05fe3 100644
--- a/tests/browser/features/step_definitions/textarea_font_steps.rb
+++ b/tests/browser/features/step_definitions/textarea_font_steps.rb
@@ -1,7 +1,7 @@
When(/^I set the editing fonts to "(.*?)"$/) do |editing_font|
visit(PreferencesPage) do |page|
- page.preftab_editing_element.click
- page.pref_editfont_element.select_value editing_font
+ page.editing_tab_element.click
+ page.editing_font_element.select_value editing_font
page.save_element.click
end
end
diff --git a/tests/browser/features/support/pages/panel_page.rb
b/tests/browser/features/support/pages/panel_page.rb
index d0a3cab..3e275d8 100644
--- a/tests/browser/features/support/pages/panel_page.rb
+++ b/tests/browser/features/support/pages/panel_page.rb
@@ -37,8 +37,8 @@
select(:selected_content_font, id: 'content-font-selector')
select(:selected_interface_font, id: 'ui-font-selector')
- select(:select_font_for_interface, id: 'ui-font-selector')
- select(:select_font_for_content, id: 'content-font-selector')
+ select(:font_for_interface, id: 'ui-font-selector')
+ select(:font_for_content, id: 'content-font-selector')
div(:uls_display_settings, class: 'uls-display-settings')
diff --git a/tests/browser/features/support/pages/preferences_page.rb
b/tests/browser/features/support/pages/preferences_page.rb
index 78245d9..50d26c4 100644
--- a/tests/browser/features/support/pages/preferences_page.rb
+++ b/tests/browser/features/support/pages/preferences_page.rb
@@ -7,6 +7,6 @@
select(:set_interface_language, id: 'mw-input-wplanguage')
button(:save, id: 'prefcontrol')
- a(:preftab_editing, id: 'preftab-editing')
- select(:pref_editfont, id: 'mw-input-wpeditfont')
+ a(:editing_tab, id: 'preftab-editing')
+ select(:editing_font, id: 'mw-input-wpeditfont')
end
diff --git a/tests/browser/features/textarea_font.feature
b/tests/browser/features/textarea_font.feature
index 28d8fb1..9c83070 100644
--- a/tests/browser/features/textarea_font.feature
+++ b/tests/browser/features/textarea_font.feature
@@ -11,14 +11,16 @@
# This is needed to reset the fonts for the relevant languages.
# There's no better way to reset ULS preferences.
Given I am logged in
- When I open "Language" panel of language settings
+ And I open the Universal Language Selector
+ And I open Display panel of language settings
+ And I open Language panel of language settings
And I click the button with the ellipsis
And I use the panel to change my interface language to "German"
- And I open "Fonts" panel of language settings
+ And I open Fonts panel of language settings
# This is the System font
And I select "Systemschriftart" font for the content language for the
live preview
And I select "Systemschriftart" font for the interface language for the
live preview
- And I open "Language" panel of language settings
+ And I open Language panel of language settings
And I click the button with the ellipsis
And I use the panel to change my interface language to "English"
And I apply the changes
--
To view, visit https://gerrit.wikimedia.org/r/92900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30ef2b41cfdceda04818f16f06e0071c487b90b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
