Fixed Style/StringLiterals RuboCop offense

Bug: 117989
Change-Id: I82086ebd56ace9f85c521ef53b67e5e4bae9d607
This commit is contained in:
Željko Filipin
2015-11-18 12:00:36 +01:00
parent 81e918780a
commit 22e8762cec
20 changed files with 128 additions and 134 deletions

View File

@@ -54,9 +54,3 @@ Style/SpaceInsideParens:
- 'tests/browser/features/step_definitions/ime_steps.rb' - 'tests/browser/features/step_definitions/ime_steps.rb'
- 'tests/browser/features/support/pages/ime_page.rb' - 'tests/browser/features/support/pages/ime_page.rb'
- 'tests/browser/features/support/pages/panel_page.rb' - 'tests/browser/features/support/pages/panel_page.rb'
# Offense count: 130
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/StringLiterals:
Enabled: false

View File

@@ -1,4 +1,4 @@
source "https://rubygems.org" source 'https://rubygems.org'
gem 'mediawiki_selenium', '~> 1.6.2' gem 'mediawiki_selenium', '~> 1.6.2'
gem "rubocop", "~> 0.35.1", require: false gem 'rubocop', '~> 0.35.1', require: false

View File

@@ -7,7 +7,7 @@ Then(/^I open Input side panel of language settings$/) do
end end
Then(/^the Interlanguage links should use Autonym font$/) do 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 end
Then(/^elements that are not Interlanguage links should not use Autonym font$/) do Then(/^elements that are not Interlanguage links should not use Autonym font$/) do

View File

@@ -16,15 +16,15 @@ Given(/^I am on a talk page without interlanguage links$/) do
end end
Given(/^I navigate to the anonymous Language Settings panel$/) do Given(/^I navigate to the anonymous Language Settings panel$/) do
step "I am on a page with interlanguage links" step 'I am on a page with interlanguage links'
step "I click the cog icon by Languages in the sidebar" step 'I click the cog icon by Languages in the sidebar'
step "I see the logged out language settings panel" step 'I see the logged out language settings panel'
end end
Given(/^I navigate to the Language Settings panel$/) do Given(/^I navigate to the Language Settings panel$/) do
step "I am on a page with interlanguage links" step 'I am on a page with interlanguage links'
step "I click the cog icon by Languages in the sidebar" step 'I click the cog icon by Languages in the sidebar'
step "I see the logged in language settings panel" step 'I see the logged in language settings panel'
end end
When(/^I click the cog icon by Languages in the sidebar$/) do When(/^I click the cog icon by Languages in the sidebar$/) do
@@ -61,7 +61,7 @@ Then(/^I do not see the Language Settings panel$/) do
end end
Then(/^I see Common Languages$/) do Then(/^I see Common Languages$/) do
on(InterlanguagePage).language_list.should match Regexp.escape("Common languages") on(InterlanguagePage).language_list.should match Regexp.escape('Common languages')
end end
Then(/^I see Language Search$/) do Then(/^I see Language Search$/) do
@@ -86,19 +86,19 @@ end
Then(/^I see Worldwide$/) do Then(/^I see Worldwide$/) do
on(InterlanguagePage) do |page| on(InterlanguagePage) do |page|
page.language_list.should match Regexp.escape("Worldwide") page.language_list.should match Regexp.escape('Worldwide')
page.english_link_element.should be_visible page.english_link_element.should be_visible
end end
end end
Then(/^I click the cog icon to open language settings again$/) do Then(/^I click the cog icon to open language settings again$/) do
step "I click the cog icon by Languages in the sidebar" step 'I click the cog icon by Languages in the sidebar'
step "I see the logged out language settings panel" step 'I see the logged out language settings panel'
end end
Then(/^the cog icon brings up Language Settings again$/) do Then(/^the cog icon brings up Language Settings again$/) do
step "I click the cog icon by Languages in the sidebar" step 'I click the cog icon by Languages in the sidebar'
step "I see the Language Settings panel" step 'I see the Language Settings panel'
end end
Then(/^I should see the How to use link near the Malayalam transliteration item$/) do Then(/^I should see the How to use link near the Malayalam transliteration item$/) do

View File

@@ -19,7 +19,7 @@ end
Then(/^my interface language is "(.*?)"$/) do |language| Then(/^my interface language is "(.*?)"$/) do |language|
code = on(PanelPage).language_to_code(language) code = on(PanelPage).language_to_code(language)
on(PanelPage).interface_element.attribute("lang").should == code on(PanelPage).interface_element.attribute('lang').should == code
end end
When(/^I click the button with the ellipsis$/) do When(/^I click the button with the ellipsis$/) do

View File

@@ -1,7 +1,7 @@
# encoding: utf-8 # encoding: utf-8
Given(/^I am on a wiki in Kotava language$/) do Given(/^I am on a wiki in Kotava language$/) do
step "I am at the main page" step 'I am at the main page'
# Fake a Kotava Wiki # Fake a Kotava Wiki
browser.execute_script( "mw.config.set( 'wgContentLanguage', 'avk' )" ) browser.execute_script( "mw.config.set( 'wgContentLanguage', 'avk' )" )
end end
@@ -15,7 +15,7 @@ When(/^I click on the input method indicator$/) do
end end
When(/^I open the input method menu$/) do When(/^I open the input method menu$/) do
step "I click on an input box" step 'I click on an input box'
on(IMEPage).input_method_element.when_present.click on(IMEPage).input_method_element.when_present.click
end end
@@ -51,7 +51,7 @@ When(/^I click on the Malayalam InScript 2 menu item$/) do
end end
When(/^I press Control-M$/) do When(/^I press Control-M$/) do
on(IMEPage).search_input_element.send_keys [:control, "m"] on(IMEPage).search_input_element.send_keys [:control, 'm']
end end
When(/^I reload the page$/) do When(/^I reload the page$/) do
@@ -62,9 +62,9 @@ Then(/^in it there must be an element with Malayalam text$/) do
# 'input_method_enabled' alone only returns [] # 'input_method_enabled' alone only returns []
on(IMEPage) do |page| on(IMEPage) do |page|
page.wait_until do page.wait_until do
page.input_method_enabled_element.text != "" page.input_method_enabled_element.text != ''
end end
page.input_method_enabled_element.text.should == "ഇൻസ്ക്രിപ്റ്റ് 2" page.input_method_enabled_element.text.should == 'ഇൻസ്ക്രിപ്റ്റ് 2'
end end
end end

View File

@@ -1,13 +1,13 @@
When(/^I set English font to System$/) do 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 end
When(/^I set English font to OpenDyslexic$/) do When(/^I set English font to OpenDyslexic$/) do
on(PanelPage).select_font_for_content = "OpenDyslexic" on(PanelPage).select_font_for_content = 'OpenDyslexic'
end end
Then(/^the selected content font must be OpenDyslexic$/) do 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 end
Given(/^I select a language different than English for display language$/) do Given(/^I select a language different than English for display language$/) do
@@ -20,5 +20,5 @@ end
Then(/^I should see the text in the language panel in (.+?)$/) do |language| Then(/^I should see the text in the language panel in (.+?)$/) do |language|
code = on(PanelPage).language_to_code(language) code = on(PanelPage).language_to_code(language)
on(PanelPage).uls_display_settings_element.attribute("lang").should == code on(PanelPage).uls_display_settings_element.attribute('lang').should == code
end end

View File

@@ -73,7 +73,7 @@ When(/^I use the panel to change my (?:interface|input) language to "(.*?)"$/) d
end end
Then(/^the panel is in English/) do Then(/^the panel is in English/) do
on(PanelPage).panel_language_element.text.should == "Language" on(PanelPage).panel_language_element.text.should == 'Language'
end end
When(/^I switch to Input panel of language settings$/) do When(/^I switch to Input panel of language settings$/) do
@@ -81,7 +81,7 @@ When(/^I switch to Input panel of language settings$/) do
end end
Then(/^the language list of ULS should use Autonym font$/) do 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 end
Then(/^I should see (.*) as the selected input language$/) do |language| Then(/^I should see (.*) as the selected input language$/) do |language|

View File

@@ -1,14 +1,14 @@
Then(/^the selected interface font must be (.*?)$/) do |font| Then(/^the selected interface font must be (.*?)$/) do |font|
step "I open the Universal Language Selector" step 'I open the Universal Language Selector'
step "I open Display panel of language settings" step 'I open Display panel of language settings'
step "I open Fonts panel of language settings" step 'I open Fonts panel of language settings'
on(PanelPage).selected_interface_font.should == font on(PanelPage).selected_interface_font.should == font
end end
Then(/^the selected input method for Malayalam is ml-inscript2$/) do Then(/^the selected input method for Malayalam is ml-inscript2$/) do
step "I click on an input box" step 'I click on an input box'
step "I should see the input method indicator" step 'I should see the input method indicator'
step "in it there must be an element with Malayalam text" step 'in it there must be an element with Malayalam text'
end end
When(/^I select the ml-inscript2 input method in the panel$/) do When(/^I select the ml-inscript2 input method in the panel$/) do

View File

@@ -11,13 +11,13 @@ When(/^I start editing a page$/) do
end end
When(/^I select (.*?) font for the content language$/) do |font| When(/^I select (.*?) font for the content language$/) do |font|
step "I open the Universal Language Selector" step 'I open the Universal Language Selector'
step "I open Display panel of language settings" step 'I open Display panel of language settings'
step "I open Fonts 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 select #{font} font for the content language for the live preview"
step "I apply the changes" step 'I apply the changes'
end end
Then(/^I should see the edit area text being displayed using "(.*?)" font$/) do |font| 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 end

View File

@@ -1,3 +1,3 @@
After do After do
step "I have reset my preferences" step 'I have reset my preferences'
end end

View File

@@ -1,23 +1,23 @@
# encoding: utf-8 # encoding: utf-8
require "page-object" require 'page-object'
module InterlanguagePageModule module InterlanguagePageModule
include PageObject include PageObject
a(:add_links, id: "wbc-linkToItem-link") a(:add_links, id: 'wbc-linkToItem-link')
a(:back_to_display, text: "Back to display settings") a(:back_to_display, text: 'Back to display settings')
a(:back_to_input, text: "Back to input settings") a(:back_to_input, text: 'Back to input settings')
span(:cog, class: "uls-settings-trigger") span(:cog, class: 'uls-settings-trigger')
button(:ellipsis_button, class: "uls-more-languages button") button(:ellipsis_button, class: 'uls-more-languages button')
a(:english_link, text: "English") a(:english_link, text: 'English')
a(:hindi_link, title: "Hindi") a(:hindi_link, title: 'Hindi')
div(:input_settings, id: "input-settings-block") div(:input_settings, id: 'input-settings-block')
div(:language_list, class: "row uls-language-list lcd") div(:language_list, class: 'row uls-language-list lcd')
text_field(:language_search, id: "uls-languagefilter") text_field(:language_search, id: 'uls-languagefilter')
button(:non_default_language, class: "button uls-language-button", index: 1) button(:non_default_language, class: 'button uls-language-button', index: 1)
a(:talk, text: "Discussion") a(:talk, text: 'Discussion')
span(:x, id: "languagesettings-close") span(:x, id: 'languagesettings-close')
a(:how_to_use_ml_transliteration, href: "https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:UniversalLanguageSelector/Input_methods/ml-transliteration") a(:how_to_use_ml_transliteration, href: 'https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:UniversalLanguageSelector/Input_methods/ml-transliteration')
a(:edit_link, css: "#ca-edit a") a(:edit_link, css: '#ca-edit a')
a(:interlang_link, css: "#p-lang li.interlanguage-link") a(:interlang_link, css: '#p-lang li.interlanguage-link')
end end

View File

@@ -3,18 +3,18 @@ module LanguageModule
def language_to_code(language) def language_to_code(language)
case language case language
when "German" when 'German'
"de" 'de'
when "English" when 'English'
"en" 'en'
when "Finnish" when 'Finnish'
"fi" 'fi'
when "Hebrew" when 'Hebrew'
"he" 'he'
when "Hindi" when 'Hindi'
"hi" 'hi'
when "Malayalam" when 'Malayalam'
"ml" 'ml'
else else
p "Unknown language #{language}" p "Unknown language #{language}"
end end

View File

@@ -1,5 +1,5 @@
class EditPage class EditPage
include PageObject include PageObject
textarea(:editarea, id: "wpTextbox1") textarea(:editarea, id: 'wpTextbox1')
end end

View File

@@ -2,17 +2,17 @@ class IMEPage
include PageObject include PageObject
include LanguageModule include LanguageModule
page_url "?<%=params[:extra]%>" page_url '?<%=params[:extra]%>'
div(:input_method, class: "imeselector imeselector-toggle") div(:input_method, class: 'imeselector imeselector-toggle')
a(:input_method_enabled, class: "ime-name imeselector-toggle") a(:input_method_enabled, class: 'ime-name imeselector-toggle')
h3(:input_method_ime_list_title, class: "ime-list-title") h3(:input_method_ime_list_title, class: 'ime-list-title')
ul(:input_method_language_list, class: "ime-language-list") ul(:input_method_language_list, class: 'ime-language-list')
div(:input_method_selector_menu, class: "imeselector-menu") div(:input_method_selector_menu, class: 'imeselector-menu')
text_field(:language_filter, id: "uls-languagefilter") text_field(:language_filter, id: 'uls-languagefilter')
li(:malayalam_inscript2, data_ime_inputmethod: "ml-inscript2") li(:malayalam_inscript2, data_ime_inputmethod: 'ml-inscript2')
a(:more_languages, class: "ime-selector-more-languages") a(:more_languages, class: 'ime-selector-more-languages')
text_field(:search_input, id: "searchInput") text_field(:search_input, id: 'searchInput')
def ime_input_method_menu_onscreen? def ime_input_method_menu_onscreen?
browser.execute_script( " browser.execute_script( "

View File

@@ -2,5 +2,5 @@ class InterlanguagePage
include PageObject include PageObject
include InterlanguagePageModule include InterlanguagePageModule
page_url "Boleyn_family" page_url 'Boleyn_family'
end end

View File

@@ -1,24 +1,24 @@
class MainPage class MainPage
include PageObject include PageObject
page_url "Main_Page" page_url 'Main_Page'
span(:cog, title: "Language settings") span(:cog, title: 'Language settings')
a(:create_a_book, text: "Create a book") a(:create_a_book, text: 'Create a book')
a(:download_as_pdf, text: "Download as PDF") a(:download_as_pdf, text: 'Download as PDF')
a(:download_the_file, text: "Download the file") a(:download_the_file, text: 'Download the file')
li(:main_page, id: "n-mainpage-description") li(:main_page, id: 'n-mainpage-description')
div(:asia, id: "AS") div(:asia, id: 'AS')
a(:malayalam) do |page| a(:malayalam) do |page|
page.asia_element.element.li(lang: "ml") page.asia_element.element.li(lang: 'ml')
end end
a(:print_export, text: "Print/export") a(:print_export, text: 'Print/export')
a(:printable_version, text: "Printable version") a(:printable_version, text: 'Printable version')
button(:search_button, id: "searchButton") button(:search_button, id: 'searchButton')
def non_interlanguage_links_use_autonym_font? def non_interlanguage_links_use_autonym_font?
browser.elements(css: "#p-lang li:not(.interlanguage-link)").collect do |element| browser.elements(css: '#p-lang li:not(.interlanguage-link)').collect do |element|
element.style("font-family") element.style('font-family')
end.to_s.match(/Autonym/) != nil end.to_s.match(/Autonym/) != nil
end end
end end

View File

@@ -1,7 +1,7 @@
class NoInterlanguagePage class NoInterlanguagePage
include PageObject include PageObject
page_url "Think_Like_a_Cat" page_url 'Think_Like_a_Cat'
include InterlanguagePageModule include InterlanguagePageModule
end end

View File

@@ -2,60 +2,60 @@ class PanelPage
include PageObject include PageObject
include LanguageModule include LanguageModule
page_url "?<%=params[:extra]%>" page_url '?<%=params[:extra]%>'
div(:uls, class: "uls-menu") div(:uls, class: 'uls-menu')
span(:uls_button_close, id: "uls-close") span(:uls_button_close, id: 'uls-close')
div(:language_settings_dialog, id: "language-settings-dialog") div(:language_settings_dialog, id: 'language-settings-dialog')
div(:panel_display, id: "display-settings-block") div(:panel_display, id: 'display-settings-block')
button(:panel_fonts, id: "uls-display-settings-fonts-tab") button(:panel_fonts, id: 'uls-display-settings-fonts-tab')
button(:panel_language, id: "uls-display-settings-language-tab") button(:panel_language, id: 'uls-display-settings-language-tab')
div(:panel_side_display, id: "display-panel-trigger") div(:panel_side_display, id: 'display-panel-trigger')
div(:panel_side_input, id: "input-panel-trigger") div(:panel_side_input, id: 'input-panel-trigger')
span(:panel_button_close, id: "languagesettings-close") span(:panel_button_close, id: 'languagesettings-close')
button(:panel_button_apply, class: "uls-settings-apply") button(:panel_button_apply, class: 'uls-settings-apply')
button(:panel_button_cancel, class: "uls-settings-cancel") button(:panel_button_cancel, class: 'uls-settings-cancel')
button(:panel_disable_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") 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_content_font_selector, id: 'content-font-selector')
select_list(:panel_interface_font_selector, id: "ui-font-selector") select_list(:panel_interface_font_selector, id: 'ui-font-selector')
button(:other_language_button, class: "button uls-language-button", index: 1) button(:other_language_button, class: 'button uls-language-button', index: 1)
button(:default_language_button, css: ".uls-language-button.down") button(:default_language_button, css: '.uls-language-button.down')
# Triggers # Triggers
span(:trigger_cog, class: "uls-settings-trigger") span(:trigger_cog, class: 'uls-settings-trigger')
a(:trigger_personal, class: "uls-trigger") a(:trigger_personal, class: 'uls-trigger')
select(:selected_content_font, id: "content-font-selector") select(:selected_content_font, id: 'content-font-selector')
select(:selected_interface_font, id: "ui-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? # Is there way to access the html element?
div(:interface, id: "footer") div(:interface, id: 'footer')
def uls_language_name_item(language) def uls_language_name_item(language)
browser.element(css: ".uls-language-block li[lang=#{language}] a") browser.element(css: ".uls-language-block li[lang=#{language}] a")
end end
def content_font def content_font
font("#mw-content-text") font('#mw-content-text')
end end
def interface_font def interface_font
font("body") font('body')
end end
def uls_onscreen? def uls_onscreen?

View File

@@ -1,11 +1,11 @@
class PreferencesPage class PreferencesPage
include PageObject include PageObject
page_url "Special:Preferences" page_url 'Special:Preferences'
select(:set_interface_language, id: "mw-input-wplanguage") select(:set_interface_language, id: 'mw-input-wplanguage')
button(:save, id: "prefcontrol") button(:save, id: 'prefcontrol')
a(:editing_tab, id: "preftab-editing") a(:editing_tab, id: 'preftab-editing')
select(:editing_font, id: "mw-input-wpeditfont") select(:editing_font, id: 'mw-input-wpeditfont')
end end