Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92283
Change subject: Refactoring Applying the live preview of interface font
......................................................................
Refactoring Applying the live preview of interface font
We renamed get*font to just *font
Change-Id: Ib6992849a2bf927d2e2d465231df58857e506a62
---
M tests/browser/features/font_selection.feature
M tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/step_definitions/font_selection_steps.rb
M tests/browser/features/step_definitions/panel_steps.rb
M tests/browser/features/support/pages/panel_page.rb
5 files changed, 18 insertions(+), 19 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/83/92283/1
diff --git a/tests/browser/features/font_selection.feature
b/tests/browser/features/font_selection.feature
index 84ef1c7..2bf77dd 100644
--- a/tests/browser/features/font_selection.feature
+++ b/tests/browser/features/font_selection.feature
@@ -35,6 +35,6 @@
And the selected interface font must be "Systemschriftart"
Scenario: Applying the live preview of interface font
- And I select "OpenDyslexic" font for the interface language for the live
preview
+ When I select "OpenDyslexic" font for the interface language for the live
preview
And I apply the changes
Then the interface font must be changed to the "OpenDyslexic" font
diff --git a/tests/browser/features/step_definitions/common_steps.rb
b/tests/browser/features/step_definitions/common_steps.rb
index 9624288..5c1becf 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -12,8 +12,8 @@
Given(/^I set "(.*?)" as the interface language$/) do |language|
code = on(PanelPage).language_to_code(language)
visit(PanelPage, :using_params => {:extra => "setlang=#{code}"})
- @original_content_font = on(PanelPage).get_content_font
- @original_interface_font = on(PanelPage).get_interface_font
+ @original_content_font = on(PanelPage).content_font
+ @original_interface_font = on(PanelPage).interface_font
end
Given(/^I temporarily use "(.*?)" as the interface language$/) do |language|
diff --git a/tests/browser/features/step_definitions/font_selection_steps.rb
b/tests/browser/features/step_definitions/font_selection_steps.rb
index 469900a..69902d0 100644
--- a/tests/browser/features/step_definitions/font_selection_steps.rb
+++ b/tests/browser/features/step_definitions/font_selection_steps.rb
@@ -12,12 +12,12 @@
Then(/^the active content font must be the same as font prior to the
preview$/) do
pending('bug #56081') do
- on(PanelPage).get_content_font.should == @original_content_font
+ on(PanelPage).content_font.should == @original_content_font
end
end
Then(/^the active interface font must be the same as font prior to the
preview$/) do
- on(PanelPage).get_interface_font.should == @original_interface_font
+ on(PanelPage).interface_font.should == @original_interface_font
end
Then(/^the selected content font must be "(.*?)"$/) do |font|
@@ -31,3 +31,7 @@
step 'I open fonts panel of language settings'
on(PanelPage).selected_interface_font.should == font
end
+
+Then(/^the interface font must be changed to the "(.*?)" font$/) do |font|
+ on(PanelPage).interface_font.should match("^#{font}")
+end
diff --git a/tests/browser/features/step_definitions/panel_steps.rb
b/tests/browser/features/step_definitions/panel_steps.rb
index 5c37b2c..b449549 100644
--- a/tests/browser/features/step_definitions/panel_steps.rb
+++ b/tests/browser/features/step_definitions/panel_steps.rb
@@ -46,13 +46,6 @@
When(/^I apply the changes$/) do
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
-end
-
-Then(/^the interface font must be changed to the "(.*?)" font$/) do |font|
- on(PanelPage).get_interface_font.should match("^#{font}")
end
Then(/^I can disable input methods$/) do
diff --git a/tests/browser/features/support/pages/panel_page.rb
b/tests/browser/features/support/pages/panel_page.rb
index 99768da..7caa89f 100644
--- a/tests/browser/features/support/pages/panel_page.rb
+++ b/tests/browser/features/support/pages/panel_page.rb
@@ -42,14 +42,11 @@
# Is there way to access the html element?
div(:interface, id: 'footer')
- def get_content_font
- get_font('#mw-content-text')
+ def content_font
+ font('#mw-content-text')
end
- def get_font(selector)
- @browser.execute_script( "return $( '#{selector}' ).css(
'font-family' );" )
- end
- def get_interface_font
- get_font('body')
+ def interface_font
+ font('body')
end
def language_to_code(language)
case language
@@ -67,4 +64,9 @@
pending
end
end
+
+ private
+ def font(selector)
+ @browser.execute_script( "return $( '#{selector}' ).css(
'font-family' );" )
+ end
end
--
To view, visit https://gerrit.wikimedia.org/r/92283
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6992849a2bf927d2e2d465231df58857e506a62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
