From 81e918780abed92b1413ef86eea76389c9026600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=BDeljko=20Filipin?= Date: Wed, 18 Nov 2015 11:59:32 +0100 Subject: [PATCH] Fixed Style/Tab RuboCop offense Bug: 117989 Change-Id: Ic4d9769df7c0ca459a7710b414d0738601107461 --- .rubocop_todo.yml | 20 ---- .../step_definitions/accept_language_steps.rb | 2 +- .../step_definitions/autonym_steps.rb | 8 +- .../features/step_definitions/common_steps.rb | 26 ++-- .../step_definitions/font_selection_steps.rb | 24 ++-- .../live_preview_of_display_language_steps.rb | 14 +-- .../features/step_definitions/panel_steps.rb | 60 +++++----- .../persistent_settings_steps.rb | 16 +-- .../step_definitions/textarea_font_steps.rb | 24 ++-- .../step_definitions/triggers_steps.rb | 10 +- .../support/modules/language_module.rb | 38 +++--- .../features/support/pages/edit_page.rb | 4 +- .../features/support/pages/ime_page.rb | 38 +++--- .../features/support/pages/main_page.rb | 36 +++--- .../features/support/pages/panel_page.rb | 112 +++++++++--------- .../support/pages/preferences_page.rb | 12 +- 16 files changed, 212 insertions(+), 232 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index a57255bd..a9d3f1b5 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -60,23 +60,3 @@ Style/SpaceInsideParens: # Configuration parameters: EnforcedStyle, SupportedStyles. Style/StringLiterals: Enabled: false - -# Offense count: 212 -# Cop supports --auto-correct. -Style/Tab: - Exclude: - - 'tests/browser/features/step_definitions/accept_language_steps.rb' - - 'tests/browser/features/step_definitions/autonym_steps.rb' - - 'tests/browser/features/step_definitions/common_steps.rb' - - 'tests/browser/features/step_definitions/font_selection_steps.rb' - - 'tests/browser/features/step_definitions/live_preview_of_display_language_steps.rb' - - 'tests/browser/features/step_definitions/panel_steps.rb' - - 'tests/browser/features/step_definitions/persistent_settings_steps.rb' - - 'tests/browser/features/step_definitions/textarea_font_steps.rb' - - 'tests/browser/features/step_definitions/triggers_steps.rb' - - 'tests/browser/features/support/modules/language_module.rb' - - 'tests/browser/features/support/pages/edit_page.rb' - - 'tests/browser/features/support/pages/ime_page.rb' - - 'tests/browser/features/support/pages/main_page.rb' - - 'tests/browser/features/support/pages/panel_page.rb' - - 'tests/browser/features/support/pages/preferences_page.rb' diff --git a/tests/browser/features/step_definitions/accept_language_steps.rb b/tests/browser/features/step_definitions/accept_language_steps.rb index ea7530be..08f1ca44 100644 --- a/tests/browser/features/step_definitions/accept_language_steps.rb +++ b/tests/browser/features/step_definitions/accept_language_steps.rb @@ -4,7 +4,7 @@ Given(/^that my browser's accept language is (.+)$/) do |language| end When(/^I am at the preferences page$/) do - visit PreferencesPage + visit PreferencesPage end Then(/^link to the main page has text (.+)$/) do |text| diff --git a/tests/browser/features/step_definitions/autonym_steps.rb b/tests/browser/features/step_definitions/autonym_steps.rb index 5dd2bb27..6bb615fd 100644 --- a/tests/browser/features/step_definitions/autonym_steps.rb +++ b/tests/browser/features/step_definitions/autonym_steps.rb @@ -1,15 +1,15 @@ When(/^I am on the main page$/) do - visit MainPage + visit MainPage end Then(/^I open Input side panel of language settings$/) do - on(PanelPage).panel_side_input_element.when_visible.click + on(PanelPage).panel_side_input_element.when_visible.click end Then(/^the Interlanguage links should use Autonym font$/) do - on(InterlanguagePage).interlang_link_element.style("font-family").should == "'Autonym',sans-serif" + on(InterlanguagePage).interlang_link_element.style("font-family").should == "'Autonym',sans-serif" end Then(/^elements that are not Interlanguage links should not use Autonym font$/) do - on(MainPage).non_interlanguage_links_use_autonym_font?.should == false + on(MainPage).non_interlanguage_links_use_autonym_font?.should == false end diff --git a/tests/browser/features/step_definitions/common_steps.rb b/tests/browser/features/step_definitions/common_steps.rb index 775e98da..854cbc88 100644 --- a/tests/browser/features/step_definitions/common_steps.rb +++ b/tests/browser/features/step_definitions/common_steps.rb @@ -1,39 +1,39 @@ Given(/^I am at the main page$/) do - visit MainPage + visit MainPage end Given(/^I am logged out$/) do end 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).content_font - @original_interface_font = on(PanelPage).interface_font + code = on(PanelPage).language_to_code(language) + visit(PanelPage, :using_params => {:extra => "setlang=#{code}"}) + @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| - code = on(PanelPage).language_to_code(language) - visit(PanelPage, :using_params => {:extra => "uselang=#{code}"}) + code = on(PanelPage).language_to_code(language) + visit(PanelPage, :using_params => {:extra => "uselang=#{code}"}) end Then(/^my interface language is "(.*?)"$/) do |language| - code = on(PanelPage).language_to_code(language) - on(PanelPage).interface_element.attribute("lang").should == code + code = on(PanelPage).language_to_code(language) + on(PanelPage).interface_element.attribute("lang").should == code end When(/^I click the button with the ellipsis$/) do - on(InterlanguagePage).ellipsis_button_element.click + on(InterlanguagePage).ellipsis_button_element.click end When(/^in the language filter I type (.+)$/) do |language_abbreviation| - on(IMEPage).language_filter = language_abbreviation + on(IMEPage).language_filter = language_abbreviation end When(/^I click Cancel$/) do - on(PanelPage).panel_button_cancel_element.click + on(PanelPage).panel_button_cancel_element.click end When(/^I click X$/) do - on(InterlanguagePage).x_element.click + on(InterlanguagePage).x_element.click end diff --git a/tests/browser/features/step_definitions/font_selection_steps.rb b/tests/browser/features/step_definitions/font_selection_steps.rb index bbaf48e0..cc3987ab 100644 --- a/tests/browser/features/step_definitions/font_selection_steps.rb +++ b/tests/browser/features/step_definitions/font_selection_steps.rb @@ -1,47 +1,47 @@ When(/^I click the checkbox to (?:enable|disable) fonts downloading$/) do - on(PanelPage).webfonts_enable_checkbox_element.click + on(PanelPage).webfonts_enable_checkbox_element.click end Then(/^the checkbox to enable fonts downloading appears$/) do - on(PanelPage).webfonts_enable_checkbox_element.should be_visible + on(PanelPage).webfonts_enable_checkbox_element.should be_visible end Then(/^the checkbox to enable fonts downloading is checked$/) do - on(PanelPage).webfonts_enable_checkbox_element.should be_checked + on(PanelPage).webfonts_enable_checkbox_element.should be_checked end Then(/^the checkbox to enable fonts downloading is not checked$/) do - on(PanelPage).webfonts_enable_checkbox_element.should_not be_checked + on(PanelPage).webfonts_enable_checkbox_element.should_not be_checked end Given(/^I open ULS$/) do - on(PanelPage).trigger_personal_element.when_visible.click + on(PanelPage).trigger_personal_element.when_visible.click end Then(/^the active content font must be the same as font prior to the preview$/) do - on(PanelPage).content_font.should == @original_content_font + on(PanelPage).content_font.should == @original_content_font end Then(/^the active interface font must be the same as font prior to the preview$/) do - on(PanelPage).interface_font.should == @original_interface_font + on(PanelPage).interface_font.should == @original_interface_font end Then(/^the selected content font must be (.*?)$/) do |font| - on(PanelPage).selected_content_font_element.when_visible.value.should == font + on(PanelPage).selected_content_font_element.when_visible.value.should == font end Then(/^the interface font is (.*?)$/) do |font| - on(PanelPage).interface_font.should match("^#{font}") + on(PanelPage).interface_font.should match("^#{font}") end Then(/^the content font is (.*?)$/) do |font| - on(PanelPage).content_font.should match("^#{font}") + on(PanelPage).content_font.should match("^#{font}") end Then(/^webfonts are applied to body$/) do - on(PanelPage).webfonts_library_loaded.should be_true + on(PanelPage).webfonts_library_loaded.should be_true end Then(/^webfonts are not applied to body$/) do - on(PanelPage).webfonts_library_loaded.should be_false + on(PanelPage).webfonts_library_loaded.should be_false end diff --git a/tests/browser/features/step_definitions/live_preview_of_display_language_steps.rb b/tests/browser/features/step_definitions/live_preview_of_display_language_steps.rb index 9f9e3b15..922ab69d 100644 --- a/tests/browser/features/step_definitions/live_preview_of_display_language_steps.rb +++ b/tests/browser/features/step_definitions/live_preview_of_display_language_steps.rb @@ -1,24 +1,24 @@ When(/^I set English font to System$/) do - on(PanelPage).select_font_for_content = "System font" + on(PanelPage).select_font_for_content = "System font" end When(/^I set English font to OpenDyslexic$/) do - on(PanelPage).select_font_for_content = "OpenDyslexic" + on(PanelPage).select_font_for_content = "OpenDyslexic" end Then(/^the selected content font must be OpenDyslexic$/) do - on(PanelPage).select_font_for_content.should == "OpenDyslexic" + on(PanelPage).select_font_for_content.should == "OpenDyslexic" end Given(/^I select a language different than English for display language$/) do - on(PanelPage).other_language_button_element.click + on(PanelPage).other_language_button_element.click end When(/^I click on the link to select Malayalam$/) do - on(MainPage).malayalam_element.click + on(MainPage).malayalam_element.click end Then(/^I should see the text in the language panel in (.+?)$/) do |language| - code = on(PanelPage).language_to_code(language) - on(PanelPage).uls_display_settings_element.attribute("lang").should == code + code = on(PanelPage).language_to_code(language) + on(PanelPage).uls_display_settings_element.attribute("lang").should == code end diff --git a/tests/browser/features/step_definitions/panel_steps.rb b/tests/browser/features/step_definitions/panel_steps.rb index cfbfdd7f..2f025d9f 100644 --- a/tests/browser/features/step_definitions/panel_steps.rb +++ b/tests/browser/features/step_definitions/panel_steps.rb @@ -1,89 +1,89 @@ Then(/^I see "(.*?)" as the name of the content language$/) do |text| - browser.span(:text => "#{text}").should be_visible + browser.span(:text => "#{text}").should be_visible end When(/^I open the Universal Language Selector$/) do - on(PanelPage) do |page| - page.trigger_personal_element.when_visible.click unless page.uls_element.visible? - end + on(PanelPage) do |page| + page.trigger_personal_element.when_visible.click unless page.uls_element.visible? + end end When(/^I open Display panel of language settings$/) do - on(PanelPage).panel_display_element.when_visible.click + on(PanelPage).panel_display_element.when_visible.click end When(/^I open Language panel of language settings$/) do - on(PanelPage).panel_language_element.click + on(PanelPage).panel_language_element.click end When(/^I open Fonts panel of language settings$/) do - on(PanelPage).panel_fonts_element.click + on(PanelPage).panel_fonts_element.click end When(/^I select (.*?) font for the interface language for the live preview$/) do |font| - on(PanelPage).selected_interface_font = font + on(PanelPage).selected_interface_font = font end When(/^I select (.*?) font for the content language for the live preview$/) do |font| - on(PanelPage).font_for_content = font + on(PanelPage).font_for_content = font end When(/^I close the panel to discard the changes$/) do - on(PanelPage).panel_button_close_element.click + on(PanelPage).panel_button_close_element.click end When(/^I apply the changes$/) do - on(PanelPage) do |page| - page.panel_button_apply_element.click - page.language_settings_dialog_element.when_not_present(10) - end + on(PanelPage) do |page| + page.panel_button_apply_element.click + page.language_settings_dialog_element.when_not_present(10) + end end Then(/^I can disable input methods$/) do - on(PanelPage).panel_disable_input_methods_element.click + on(PanelPage).panel_disable_input_methods_element.click end Then(/^I can enable input methods$/) do - on(PanelPage).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(PanelPage).panel_interface_font_selector_element.should be_visible + on(PanelPage).panel_interface_font_selector_element.should be_visible end Then(/^a font selector for interface language doesn't appear$/) do - on(PanelPage).panel_interface_font_selector_element.should_not be_visible + on(PanelPage).panel_interface_font_selector_element.should_not be_visible end Then(/^a font selector for content language appears$/) do - on(PanelPage).panel_content_font_selector_element.should be_visible + on(PanelPage).panel_content_font_selector_element.should be_visible end Then(/^a font selector for content language doesn't appear$/) do - on(PanelPage).panel_content_font_selector_element.should_not be_visible + on(PanelPage).panel_content_font_selector_element.should_not be_visible end When(/^I use the panel to change my (?:interface|input) language to "(.*?)"$/) do |language| - code = on(PanelPage).language_to_code(language) - 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 + code = on(PanelPage).language_to_code(language) + 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 - on(PanelPage).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(PanelPage).panel_side_input_element.click + on(PanelPage).panel_side_input_element.click end Then(/^the language list of ULS should use Autonym font$/) do - on(PanelPage).uls_language_name_item("en").style("font-family").should match /Autonym'?, ?sans-serif/ + on(PanelPage).uls_language_name_item("en").style("font-family").should match /Autonym'?, ?sans-serif/ end Then(/^I should see (.*) as the selected input language$/) do |language| - on(PanelPage).default_language_button_element.text.should == language + on(PanelPage).default_language_button_element.text.should == language end diff --git a/tests/browser/features/step_definitions/persistent_settings_steps.rb b/tests/browser/features/step_definitions/persistent_settings_steps.rb index 2014fbbb..026afd6e 100644 --- a/tests/browser/features/step_definitions/persistent_settings_steps.rb +++ b/tests/browser/features/step_definitions/persistent_settings_steps.rb @@ -1,16 +1,16 @@ Then(/^the selected interface font must be (.*?)$/) do |font| - step "I open the Universal Language Selector" - step "I open Display panel of language settings" - step "I open Fonts panel of language settings" - on(PanelPage).selected_interface_font.should == font + step "I open the Universal Language Selector" + step "I open Display panel of language settings" + step "I open Fonts panel of language settings" + on(PanelPage).selected_interface_font.should == font end Then(/^the selected input method for Malayalam is ml-inscript2$/) do - step "I click on an input box" - step "I should see the input method indicator" - step "in it there must be an element with Malayalam text" + step "I click on an input box" + step "I should see the input method indicator" + step "in it there must be an element with Malayalam text" end When(/^I select the ml-inscript2 input method in the panel$/) do - on(PanelPage).ml_inscript2_radio_element.click + on(PanelPage).ml_inscript2_radio_element.click end diff --git a/tests/browser/features/step_definitions/textarea_font_steps.rb b/tests/browser/features/step_definitions/textarea_font_steps.rb index 2cc2115a..6f421331 100644 --- a/tests/browser/features/step_definitions/textarea_font_steps.rb +++ b/tests/browser/features/step_definitions/textarea_font_steps.rb @@ -1,23 +1,23 @@ When(/^I set the editing fonts to "(.*?)"$/) do |editing_font| - visit(PreferencesPage) do |page| - page.editing_tab_element.click - page.editing_font_element.select_value editing_font - page.save_element.click - end + visit(PreferencesPage) do |page| + page.editing_tab_element.click + page.editing_font_element.select_value editing_font + page.save_element.click + end end When(/^I start editing a page$/) do - visit(NoInterlanguagePage).edit_link_element.click + visit(NoInterlanguagePage).edit_link_element.click end When(/^I select (.*?) font for the content language$/) do |font| - step "I open the Universal Language Selector" - step "I open Display panel of language settings" - step "I open Fonts panel of language settings" - step "I select #{font} font for the content language for the live preview" - step "I apply the changes" + step "I open the Universal Language Selector" + step "I open Display panel of language settings" + step "I open Fonts panel of language settings" + step "I select #{font} font for the content language for the live preview" + step "I apply the changes" end Then(/^I should see the edit area text being displayed using "(.*?)" font$/) do |font| - on(EditPage).editarea_element.style("font-family").should match(/^#{font}/) + on(EditPage).editarea_element.style("font-family").should match(/^#{font}/) end diff --git a/tests/browser/features/step_definitions/triggers_steps.rb b/tests/browser/features/step_definitions/triggers_steps.rb index 75a49ada..6ebb6209 100644 --- a/tests/browser/features/step_definitions/triggers_steps.rb +++ b/tests/browser/features/step_definitions/triggers_steps.rb @@ -1,10 +1,10 @@ When(/^I click language selector trigger element$/) do - on(PanelPage).trigger_personal + on(PanelPage).trigger_personal end Then(/^I should see the language selector$/) do - on(PanelPage) do |page| - page.uls_element.should be_visible - page.uls_onscreen?.should be_true - end + on(PanelPage) do |page| + page.uls_element.should be_visible + page.uls_onscreen?.should be_true + end end diff --git a/tests/browser/features/support/modules/language_module.rb b/tests/browser/features/support/modules/language_module.rb index 0a7eae77..0f52885f 100644 --- a/tests/browser/features/support/modules/language_module.rb +++ b/tests/browser/features/support/modules/language_module.rb @@ -1,22 +1,22 @@ module LanguageModule - include PageObject + include PageObject - def language_to_code(language) - case language - when "German" - "de" - when "English" - "en" - when "Finnish" - "fi" - when "Hebrew" - "he" - when "Hindi" - "hi" - when "Malayalam" - "ml" - else - p "Unknown language #{language}" - end - end + def language_to_code(language) + case language + when "German" + "de" + when "English" + "en" + when "Finnish" + "fi" + when "Hebrew" + "he" + when "Hindi" + "hi" + when "Malayalam" + "ml" + else + p "Unknown language #{language}" + end + end end diff --git a/tests/browser/features/support/pages/edit_page.rb b/tests/browser/features/support/pages/edit_page.rb index 43ce0c50..785e471b 100644 --- a/tests/browser/features/support/pages/edit_page.rb +++ b/tests/browser/features/support/pages/edit_page.rb @@ -1,5 +1,5 @@ class EditPage - include PageObject + include PageObject - textarea(:editarea, id: "wpTextbox1") + textarea(:editarea, id: "wpTextbox1") end diff --git a/tests/browser/features/support/pages/ime_page.rb b/tests/browser/features/support/pages/ime_page.rb index c1bd4549..37dd350a 100644 --- a/tests/browser/features/support/pages/ime_page.rb +++ b/tests/browser/features/support/pages/ime_page.rb @@ -1,25 +1,25 @@ class IMEPage - include PageObject - include LanguageModule + include PageObject + include LanguageModule - page_url "?<%=params[:extra]%>" + page_url "?<%=params[:extra]%>" - div(:input_method, class: "imeselector imeselector-toggle") - a(:input_method_enabled, class: "ime-name imeselector-toggle") - h3(:input_method_ime_list_title, class: "ime-list-title") - ul(:input_method_language_list, class: "ime-language-list") - div(:input_method_selector_menu, class: "imeselector-menu") - text_field(:language_filter, id: "uls-languagefilter") - li(:malayalam_inscript2, data_ime_inputmethod: "ml-inscript2") - a(:more_languages, class: "ime-selector-more-languages") - text_field(:search_input, id: "searchInput") + div(:input_method, class: "imeselector imeselector-toggle") + a(:input_method_enabled, class: "ime-name imeselector-toggle") + h3(:input_method_ime_list_title, class: "ime-list-title") + ul(:input_method_language_list, class: "ime-language-list") + div(:input_method_selector_menu, class: "imeselector-menu") + text_field(:language_filter, id: "uls-languagefilter") + li(:malayalam_inscript2, data_ime_inputmethod: "ml-inscript2") + a(:more_languages, class: "ime-selector-more-languages") + text_field(:search_input, id: "searchInput") - def ime_input_method_menu_onscreen? - browser.execute_script( " - var $selectorMenu = $( '.imeselector-menu' ), - menuLeft = $selectorMenu.offset().left, - menuRight = menuLeft + $selectorMenu.width(); + def ime_input_method_menu_onscreen? + browser.execute_script( " + var $selectorMenu = $( '.imeselector-menu' ), + menuLeft = $selectorMenu.offset().left, + menuRight = menuLeft + $selectorMenu.width(); - return ( menuLeft >= 0 && menuRight <= $( window ).width() );" ) - end + return ( menuLeft >= 0 && menuRight <= $( window ).width() );" ) + end end diff --git a/tests/browser/features/support/pages/main_page.rb b/tests/browser/features/support/pages/main_page.rb index 13d0cc8c..ec601338 100644 --- a/tests/browser/features/support/pages/main_page.rb +++ b/tests/browser/features/support/pages/main_page.rb @@ -1,24 +1,24 @@ class MainPage - include PageObject + include PageObject - page_url "Main_Page" + page_url "Main_Page" - span(:cog, title: "Language settings") - a(:create_a_book, text: "Create a book") - a(:download_as_pdf, text: "Download as PDF") - a(:download_the_file, text: "Download the file") - li(:main_page, id: "n-mainpage-description") - div(:asia, id: "AS") - a(:malayalam) do |page| - page.asia_element.element.li(lang: "ml") - end - a(:print_export, text: "Print/export") - a(:printable_version, text: "Printable version") - button(:search_button, id: "searchButton") + span(:cog, title: "Language settings") + a(:create_a_book, text: "Create a book") + a(:download_as_pdf, text: "Download as PDF") + a(:download_the_file, text: "Download the file") + li(:main_page, id: "n-mainpage-description") + div(:asia, id: "AS") + a(:malayalam) do |page| + page.asia_element.element.li(lang: "ml") + end + a(:print_export, text: "Print/export") + a(:printable_version, text: "Printable version") + button(:search_button, id: "searchButton") def non_interlanguage_links_use_autonym_font? - browser.elements(css: "#p-lang li:not(.interlanguage-link)").collect do |element| - element.style("font-family") - end.to_s.match(/Autonym/) != nil - end + browser.elements(css: "#p-lang li:not(.interlanguage-link)").collect do |element| + element.style("font-family") + end.to_s.match(/Autonym/) != nil + end end diff --git a/tests/browser/features/support/pages/panel_page.rb b/tests/browser/features/support/pages/panel_page.rb index eae2a764..035ecbbc 100644 --- a/tests/browser/features/support/pages/panel_page.rb +++ b/tests/browser/features/support/pages/panel_page.rb @@ -1,80 +1,80 @@ class PanelPage - include PageObject - include LanguageModule + include PageObject + include LanguageModule - page_url "?<%=params[:extra]%>" + page_url "?<%=params[:extra]%>" - div(:uls, class: "uls-menu") - span(:uls_button_close, id: "uls-close") + div(:uls, class: "uls-menu") + span(:uls_button_close, id: "uls-close") - div(:language_settings_dialog, id: "language-settings-dialog") - div(:panel_display, id: "display-settings-block") - button(:panel_fonts, id: "uls-display-settings-fonts-tab") - button(:panel_language, id: "uls-display-settings-language-tab") + div(:language_settings_dialog, id: "language-settings-dialog") + div(:panel_display, id: "display-settings-block") + button(:panel_fonts, id: "uls-display-settings-fonts-tab") + button(:panel_language, id: "uls-display-settings-language-tab") - div(:panel_side_display, id: "display-panel-trigger") - div(:panel_side_input, id: "input-panel-trigger") + div(:panel_side_display, id: "display-panel-trigger") + div(:panel_side_input, id: "input-panel-trigger") - span(:panel_button_close, id: "languagesettings-close") - button(:panel_button_apply, class: "uls-settings-apply") - button(:panel_button_cancel, class: "uls-settings-cancel") + span(:panel_button_close, id: "languagesettings-close") + button(:panel_button_apply, class: "uls-settings-apply") + button(:panel_button_cancel, class: "uls-settings-cancel") - button(:panel_disable_input_methods, class: "uls-input-toggle-button") - button(:panel_enable_input_methods, class: "uls-input-toggle-button") + button(:panel_disable_input_methods, class: "uls-input-toggle-button") + button(:panel_enable_input_methods, class: "uls-input-toggle-button") - checkbox(:webfonts_enable_checkbox, id: "webfonts-enable-checkbox") + checkbox(:webfonts_enable_checkbox, id: "webfonts-enable-checkbox") - select_list(:panel_content_font_selector, id: "content-font-selector") - select_list(:panel_interface_font_selector, id: "ui-font-selector") + select_list(:panel_content_font_selector, id: "content-font-selector") + select_list(:panel_interface_font_selector, id: "ui-font-selector") - button(:other_language_button, class: "button uls-language-button", index: 1) - button(:default_language_button, css: ".uls-language-button.down") + button(:other_language_button, class: "button uls-language-button", index: 1) + button(:default_language_button, css: ".uls-language-button.down") - # Triggers - span(:trigger_cog, class: "uls-settings-trigger") - a(:trigger_personal, class: "uls-trigger") + # Triggers + span(:trigger_cog, class: "uls-settings-trigger") + a(:trigger_personal, class: "uls-trigger") - select(:selected_content_font, id: "content-font-selector") - select(:selected_interface_font, id: "ui-font-selector") + select(:selected_content_font, id: "content-font-selector") + select(:selected_interface_font, id: "ui-font-selector") - select(:font_for_content, id: "content-font-selector") + select(:font_for_content, id: "content-font-selector") - div(:uls_display_settings, class: "uls-display-settings") + div(:uls_display_settings, class: "uls-display-settings") - radio_button(:ml_inscript2_radio, id: "ml-inscript2") + radio_button(:ml_inscript2_radio, id: "ml-inscript2") - # Is there way to access the html element? - div(:interface, id: "footer") + # Is there way to access the html element? + div(:interface, id: "footer") - def uls_language_name_item(language) - browser.element(css: ".uls-language-block li[lang=#{language}] a") - end + def uls_language_name_item(language) + browser.element(css: ".uls-language-block li[lang=#{language}] a") + end - def content_font - font("#mw-content-text") - end + def content_font + font("#mw-content-text") + end - def interface_font - font("body") - end + def interface_font + font("body") + end - def uls_onscreen? - browser.execute_script( " - var $menu = $( '.uls-menu' ), - $window = $( window ), - top = $menu.offset().top, - viewportTop = $window.scrollTop(), - viewportBottom = $window.scrollTop() + $window.height(); + def uls_onscreen? + browser.execute_script( " + var $menu = $( '.uls-menu' ), + $window = $( window ), + top = $menu.offset().top, + viewportTop = $window.scrollTop(), + viewportBottom = $window.scrollTop() + $window.height(); - return ( top < viewportBottom && top >= viewportTop )" ) - end + return ( top < viewportBottom && top >= viewportTop )" ) + end - def webfonts_library_loaded - browser.execute_script( "return ( $( 'body' ).data( 'webfonts' ) !== undefined )" ) - end + def webfonts_library_loaded + browser.execute_script( "return ( $( 'body' ).data( 'webfonts' ) !== undefined )" ) + end - private - def font(selector) - browser.execute_script( "return $( '#{selector}' ).css( 'font-family' );" ) - end + private + def font(selector) + browser.execute_script( "return $( '#{selector}' ).css( 'font-family' );" ) + end end diff --git a/tests/browser/features/support/pages/preferences_page.rb b/tests/browser/features/support/pages/preferences_page.rb index 569b8920..2b44208a 100644 --- a/tests/browser/features/support/pages/preferences_page.rb +++ b/tests/browser/features/support/pages/preferences_page.rb @@ -1,11 +1,11 @@ class PreferencesPage - include PageObject + include PageObject - page_url "Special:Preferences" + page_url "Special:Preferences" - select(:set_interface_language, id: "mw-input-wplanguage") - button(:save, id: "prefcontrol") + select(:set_interface_language, id: "mw-input-wplanguage") + button(:save, id: "prefcontrol") - a(:editing_tab, id: "preftab-editing") - select(:editing_font, id: "mw-input-wpeditfont") + a(:editing_tab, id: "preftab-editing") + select(:editing_font, id: "mw-input-wpeditfont") end