Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86090
Change subject: Renamed ULSPage to PanelPage
......................................................................
Renamed ULSPage to PanelPage
To make class name consistent with file name
Change-Id: If4d0f0a24d2534c9b73cc6cbb0ee14ab8c124ed9
---
M tests/browser/features/step_definitions/cog_sidebar_user_steps.rb
M tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/step_definitions/ime_steps.rb
M tests/browser/features/step_definitions/panel_steps.rb
M tests/browser/features/step_definitions/persistent_steps.rb
M tests/browser/features/step_definitions/triggers_steps.rb
M tests/browser/features/support/pages/panel_page.rb
7 files changed, 26 insertions(+), 26 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/90/86090/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 77d525d..f3da883 100644
--- a/tests/browser/features/step_definitions/cog_sidebar_user_steps.rb
+++ b/tests/browser/features/step_definitions/cog_sidebar_user_steps.rb
@@ -28,7 +28,7 @@
end
When(/^I click Cancel$/) do
- on(ULSPage).panel_button_cancel_element.click
+ on(PanelPage).panel_button_cancel_element.click
end
When(/^I click on the link to select Malayalam$/) do
@@ -42,7 +42,7 @@
When(/^I click the cog icon by Languages in the sidebar$/) do
on(NoInterlanguagePage).cog_element.when_present.click
# Wait for the panel to open
- on(ULSPage).panel_display_element.when_visible
+ on(PanelPage).panel_display_element.when_visible
end
When(/^I click X$/) do
@@ -72,7 +72,7 @@
end
Then(/^I do not see the Language Settings panel$/) do
- on(ULSPage) do |page|
+ on(PanelPage) do |page|
page.panel_language_element.should_not be_visible
page.panel_fonts_element.should_not be_visible
page.default_language_button_element.should_not be_visible
@@ -89,14 +89,14 @@
end
Then(/^I see the logged out language settings panel$/) do
- on(ULSPage) do |page|
+ on(PanelPage) do |page|
page.panel_language_element.should be_visible
page.panel_fonts_element.should be_visible
end
end
Then(/^I see the logged in language settings panel$/) do
- on(ULSPage) do |page|
+ on(PanelPage) do |page|
page.panel_language_element.should be_visible
page.panel_fonts_element.should be_visible
page.default_language_button_element.should be_visible
diff --git a/tests/browser/features/step_definitions/common_steps.rb
b/tests/browser/features/step_definitions/common_steps.rb
index 07a9040..dd033e4 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -14,17 +14,17 @@
Given(/^I set "(.*?)" as the interface language$/) do |language|
code = language_to_code(language)
- visit(ULSPage, :using_params => {:extra => "setlang=#{code}"})
+ visit(PanelPage, :using_params => {:extra => "setlang=#{code}"})
end
Given(/^I temporarily use "(.*?)" as the interface language$/) do |language|
code = language_to_code(language)
- visit(ULSPage, :using_params => {:extra => "uselang=#{code}"})
+ visit(PanelPage, :using_params => {:extra => "uselang=#{code}"})
end
Then(/^my interface language is "(.*?)"$/) do |language|
code = language_to_code(language)
- on(ULSPage).interface_element.attribute('lang').should == code
+ on(PanelPage).interface_element.attribute('lang').should == code
end
def language_to_code(language)
@@ -61,7 +61,7 @@
def uls_position()
if !defined?($uls_position)
- visit(ULSPage)
+ visit(PanelPage)
$uls_position = @browser.execute_script( "return mw.config.get(
'wgULSPosition' )" );
else
$uls_position
diff --git a/tests/browser/features/step_definitions/ime_steps.rb
b/tests/browser/features/step_definitions/ime_steps.rb
index 519e1f9..725c9f7 100644
--- a/tests/browser/features/step_definitions/ime_steps.rb
+++ b/tests/browser/features/step_definitions/ime_steps.rb
@@ -72,11 +72,11 @@
end
When(/^I visit page in Vector skin$/) do
- visit(ULSPage, :using_params => {:extra => "useskin=vector"})
+ visit(PanelPage, :using_params => {:extra => "useskin=vector"})
end
When(/^I visit page in Monobook skin$/) do
- visit(ULSPage, :using_params => {:extra => "useskin=monobook"})
+ visit(PanelPage, :using_params => {:extra => "useskin=monobook"})
end
Then(/^I should see the input method menu is not offscreen$/) do
diff --git a/tests/browser/features/step_definitions/panel_steps.rb
b/tests/browser/features/step_definitions/panel_steps.rb
index 07627e9..4515321 100644
--- a/tests/browser/features/step_definitions/panel_steps.rb
+++ b/tests/browser/features/step_definitions/panel_steps.rb
@@ -8,7 +8,7 @@
end
When(/^I open "(.*?)" panel of language settings$/) do |panel|
- on(ULSPage) do |page|
+ on(PanelPage) do |page|
# These can be of two different type of elements, which
PageObjects do not like.
if uls_position() == 'interlanguage'
page.trigger_cog_element.when_visible.click
@@ -34,16 +34,16 @@
end
When(/^I select "(.*?)" font for the interface language for the live
preview$/) do |font|
- on(ULSPage).select_font_for_interface = font
+ on(PanelPage).select_font_for_interface = font
end
When(/^I select "(.*?)" font for the content language for the live preview$/)
do |font|
- on(ULSPage).select_font_for_content = font
+ on(PanelPage).select_font_for_content = font
end
When(/^I close the panel to discard the changes$/) do
- on(ULSPage) do |page|
+ on(PanelPage) do |page|
page.panel_button_close_element.click
# Also close the ULS language selection if open
if uls_position() == 'personal'
@@ -74,7 +74,7 @@
end
When(/^I apply the changes$/) do
- on(ULSPage).panel_button_apply_element.click
+ on(PanelPage).panel_button_apply_element.click
# Leave a little time for the settings to be saved. The settings window
closes
# immediately, so it is not enough to wait for it to disappear.
sleep 4
@@ -92,19 +92,19 @@
end
Then(/^I can disable input methods$/) do
- on(ULSPage).panel_disable_input_methods_element.click
+ on(PanelPage).panel_disable_input_methods_element.click
end
Then(/^I can enable input methods$/) do
- on(ULSPage).panel_enable_input_methods_element.click
+ on(PanelPage).panel_enable_input_methods_element.click
end
Then(/^a font selector for interface language appears$/) do
- on(ULSPage).panel_interface_font_selector_element.should be_visible
+ on(PanelPage).panel_interface_font_selector_element.should be_visible
end
Then(/^a font selector for content language appears$/) do
- on(ULSPage).panel_content_font_selector_element.should be_visible
+ on(PanelPage).panel_content_font_selector_element.should be_visible
end
When(/^I use the panel to change my interface language to "(.*?)"$/) do
|language|
@@ -115,9 +115,9 @@
end
Then(/^the panel is in English/) do
- on(ULSPage).panel_language_element.text.should == 'Language'
+ on(PanelPage).panel_language_element.text.should == 'Language'
end
When(/^I switch to "Input" panel of language settings/) do
- on(ULSPage).panel_input_element.when_visible.click
+ on(PanelPage).panel_input_element.when_visible.click
end
diff --git a/tests/browser/features/step_definitions/persistent_steps.rb
b/tests/browser/features/step_definitions/persistent_steps.rb
index 0f568d8..79580cd 100644
--- a/tests/browser/features/step_definitions/persistent_steps.rb
+++ b/tests/browser/features/step_definitions/persistent_steps.rb
@@ -6,9 +6,9 @@
end
When(/^I select a font for the interface language$/) do
- on(ULSPage).select_font_for_interface = 'OpenDyslexic'
+ on(PanelPage).select_font_for_interface = 'OpenDyslexic'
end
Then(/^the selected interface font must be what I previously selected$/) do
- on(ULSPage).select_font_for_interface.should == 'OpenDyslexic'
+ on(PanelPage).select_font_for_interface.should == 'OpenDyslexic'
end
diff --git a/tests/browser/features/step_definitions/triggers_steps.rb
b/tests/browser/features/step_definitions/triggers_steps.rb
index 7f4cf1d..2e8bd24 100644
--- a/tests/browser/features/step_definitions/triggers_steps.rb
+++ b/tests/browser/features/step_definitions/triggers_steps.rb
@@ -3,5 +3,5 @@
end
Then(/^I should see the language selector$/) do
- on(ULSPage).uls_element.should be_visible
+ on(PanelPage).uls_element.should be_visible
end
diff --git a/tests/browser/features/support/pages/panel_page.rb
b/tests/browser/features/support/pages/panel_page.rb
index 774eca5..fcb04d0 100644
--- a/tests/browser/features/support/pages/panel_page.rb
+++ b/tests/browser/features/support/pages/panel_page.rb
@@ -1,4 +1,4 @@
-class ULSPage
+class PanelPage
include PageObject
include URL
--
To view, visit https://gerrit.wikimedia.org/r/86090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4d0f0a24d2534c9b73cc6cbb0ee14ab8c124ed9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
