aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.rubocop.yml2
-rw-r--r--.rubocop_todo.yml12
-rw-r--r--Gemfile6
-rw-r--r--maintenance/jsduck/custom_tags.rb4
-rw-r--r--tests/browser/features/step_definitions/login_steps.rb8
-rw-r--r--tests/browser/features/support/pages/create_account_page.rb4
-rw-r--r--tests/browser/features/support/pages/edit_page.rb8
-rw-r--r--tests/browser/features/support/pages/file_does_not_exist_page.rb4
-rw-r--r--tests/browser/features/support/pages/login_error_page.rb2
-rw-r--r--tests/browser/features/support/pages/main_page.rb20
-rw-r--r--tests/browser/features/support/pages/preferences_appearance_page.rb44
-rw-r--r--tests/browser/features/support/pages/preferences_editing_page.rb22
-rw-r--r--tests/browser/features/support/pages/preferences_page.rb10
-rw-r--r--tests/browser/features/support/pages/preferences_user_profile_page.rb22
-rw-r--r--tests/browser/features/support/pages/ztargetpage.rb4
15 files changed, 79 insertions, 93 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 8b0f91abfeec..61ffc1a04425 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,3 @@
-inherit_from: .rubocop_todo.yml
-
AllCops:
Exclude:
- 'extensions/**/*'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
deleted file mode 100644
index 5b8c9651dc67..000000000000
--- a/.rubocop_todo.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-03-06 17:05:39 +0100 using RuboCop version 0.29.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 81
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
- Enabled: false
diff --git a/Gemfile b/Gemfile
index 4373b7f9de9a..6f9c0539e02c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
# ruby=ruby-2.1.2
# ruby-gemset=core
-source "https://rubygems.org"
+source 'https://rubygems.org'
-gem "mediawiki_selenium", "~> 1.0.1"
-gem "rubocop", require: false
+gem 'mediawiki_selenium', '~> 1.0.1'
+gem 'rubocop', require: false
diff --git a/maintenance/jsduck/custom_tags.rb b/maintenance/jsduck/custom_tags.rb
index c326704a21f5..39589a064150 100644
--- a/maintenance/jsduck/custom_tags.rb
+++ b/maintenance/jsduck/custom_tags.rb
@@ -34,7 +34,7 @@ end
class SourceTag < CommonTag
def initialize
@tagname = :source
- @pattern = "source"
+ @pattern = 'source'
super
end
@@ -51,7 +51,7 @@ end
class SeeTag < CommonTag
def initialize
@tagname = :see
- @pattern = "see"
+ @pattern = 'see'
super
end
diff --git a/tests/browser/features/step_definitions/login_steps.rb b/tests/browser/features/step_definitions/login_steps.rb
index f528eba223c8..67adb362134f 100644
--- a/tests/browser/features/step_definitions/login_steps.rb
+++ b/tests/browser/features/step_definitions/login_steps.rb
@@ -14,19 +14,19 @@ Given(/^I am at Log in page$/) do
end
When(/^I log in with incorrect password$/) do
- on(LoginPage).login_with(user, "incorrect password", false)
+ on(LoginPage).login_with(user, 'incorrect password', false)
end
When(/^I log in with incorrect username$/) do
- on(LoginPage).login_with("incorrect username", password, false)
+ on(LoginPage).login_with('incorrect username', password, false)
end
When(/^I log in without entering credentials$/) do
- on(LoginPage).login_with("", "", false)
+ on(LoginPage).login_with('', '', false)
end
When(/^I log in without entering password$/) do
- on(LoginPage).login_with(user, "", false)
+ on(LoginPage).login_with(user, '', false)
end
Then(/^error box should be visible$/) do
diff --git a/tests/browser/features/support/pages/create_account_page.rb b/tests/browser/features/support/pages/create_account_page.rb
index 6a8ca697896d..98b893a6bac0 100644
--- a/tests/browser/features/support/pages/create_account_page.rb
+++ b/tests/browser/features/support/pages/create_account_page.rb
@@ -12,7 +12,7 @@
class CreateAccountPage
include PageObject
- page_url "<%=params[:page_title]%>"
+ page_url '<%=params[:page_title]%>'
- button(:create_account, id: "wpCreateaccount")
+ button(:create_account, id: 'wpCreateaccount')
end
diff --git a/tests/browser/features/support/pages/edit_page.rb b/tests/browser/features/support/pages/edit_page.rb
index 237441edb489..b0f6bffe4fe7 100644
--- a/tests/browser/features/support/pages/edit_page.rb
+++ b/tests/browser/features/support/pages/edit_page.rb
@@ -1,8 +1,8 @@
class EditPage
include PageObject
- text_area(:edit_page_content, id: "wpTextbox1")
- button(:preview_button, id: "wpPreview")
- button(:show_changes_button, id: "wpDiff")
- button(:save_button, id: "wpSave")
+ text_area(:edit_page_content, id: 'wpTextbox1')
+ button(:preview_button, id: 'wpPreview')
+ button(:show_changes_button, id: 'wpDiff')
+ button(:save_button, id: 'wpSave')
end
diff --git a/tests/browser/features/support/pages/file_does_not_exist_page.rb b/tests/browser/features/support/pages/file_does_not_exist_page.rb
index 9aa34d3a0367..90762d22dab5 100644
--- a/tests/browser/features/support/pages/file_does_not_exist_page.rb
+++ b/tests/browser/features/support/pages/file_does_not_exist_page.rb
@@ -12,7 +12,7 @@
class FileDoesNotExistPage
include PageObject
- page_url "File:<%=params[:page_name]%>"
+ page_url 'File:<%=params[:page_name]%>'
- div(:file_does_not_exist_message, id: "mw-imagepage-nofile")
+ div(:file_does_not_exist_message, id: 'mw-imagepage-nofile')
end
diff --git a/tests/browser/features/support/pages/login_error_page.rb b/tests/browser/features/support/pages/login_error_page.rb
index fd000e64ca25..9a1805f377eb 100644
--- a/tests/browser/features/support/pages/login_error_page.rb
+++ b/tests/browser/features/support/pages/login_error_page.rb
@@ -1,5 +1,5 @@
class LoginErrorPage
include PageObject
- div(:error_box, class: "errorbox")
+ div(:error_box, class: 'errorbox')
end
diff --git a/tests/browser/features/support/pages/main_page.rb b/tests/browser/features/support/pages/main_page.rb
index ef58d91cab20..6d76b01c4ef7 100644
--- a/tests/browser/features/support/pages/main_page.rb
+++ b/tests/browser/features/support/pages/main_page.rb
@@ -1,18 +1,18 @@
class MainPage
include PageObject
- page_url ""
+ page_url ''
a(:edit_link, href: /action=edit/)
- li(:help_link, id: "n-help")
- div(:page_content, id: "content")
- li(:page_information_link, id: "t-info")
- li(:permanent_link_link, id: "t-permalink")
+ li(:help_link, id: 'n-help')
+ div(:page_content, id: 'content')
+ li(:page_information_link, id: 't-info')
+ li(:permanent_link_link, id: 't-permalink')
a(:printable_version_link, href: /printable=yes/)
- li(:random_page_link, id: "n-randompage")
- li(:recent_changes_link, id: "n-recentchanges")
- li(:related_changes_link, id: "t-recentchangeslinked")
- li(:special_pages_link, id: "t-specialpages")
+ li(:random_page_link, id: 'n-randompage')
+ li(:recent_changes_link, id: 'n-recentchanges')
+ li(:related_changes_link, id: 't-recentchangeslinked')
+ li(:special_pages_link, id: 't-specialpages')
a(:view_history_link, href: /action=history/)
- li(:what_links_here_link, id: "t-whatlinkshere")
+ li(:what_links_here_link, id: 't-whatlinkshere')
end
diff --git a/tests/browser/features/support/pages/preferences_appearance_page.rb b/tests/browser/features/support/pages/preferences_appearance_page.rb
index 0644f4cecda8..83c3952f6b39 100644
--- a/tests/browser/features/support/pages/preferences_appearance_page.rb
+++ b/tests/browser/features/support/pages/preferences_appearance_page.rb
@@ -12,28 +12,28 @@
class PreferencesAppearancePage
include PageObject
- page_url "Special:Preferences#mw-prefsection-rendering"
+ page_url 'Special:Preferences#mw-prefsection-rendering'
- checkbox(:auto_number_check, id: "mw-input-wpnumberheadings")
- radio_button(:cologne_blue, id: "mw-input-wpskin-cologneblue")
- radio_button(:day_mo_year_radio, id: "mw-input-wpdate-dmy")
- checkbox(:dont_show_aft_check, id: "mw-input-wparticlefeedback-disable")
- checkbox(:exclude_from_experiments_check, id: "mw-input-wpvector-noexperiments")
- checkbox(:hidden_categories_check, id: "mw-input-wpshowhiddencats")
- radio_button(:iso_8601_radio, id: "mw-input-wpdate-ISO_8601")
- span(:local_time_span, id: "wpLocalTime")
- radio_button(:mo_day_year_radio, id: "mw-input-wpdate-mdy")
- radio_button(:modern, id: "mw-input-wpskin-modern")
- radio_button(:monobook, id: "mw-input-wpskin-monobook")
- radio_button(:no_preference_radio, id: "mw-input-wpdate-default")
- text_field(:other_offset, id: "mw-input-wptimecorrection-other")
+ checkbox(:auto_number_check, id: 'mw-input-wpnumberheadings')
+ radio_button(:cologne_blue, id: 'mw-input-wpskin-cologneblue')
+ radio_button(:day_mo_year_radio, id: 'mw-input-wpdate-dmy')
+ checkbox(:dont_show_aft_check, id: 'mw-input-wparticlefeedback-disable')
+ checkbox(:exclude_from_experiments_check, id: 'mw-input-wpvector-noexperiments')
+ checkbox(:hidden_categories_check, id: 'mw-input-wpshowhiddencats')
+ radio_button(:iso_8601_radio, id: 'mw-input-wpdate-ISO_8601')
+ span(:local_time_span, id: 'wpLocalTime')
+ radio_button(:mo_day_year_radio, id: 'mw-input-wpdate-mdy')
+ radio_button(:modern, id: 'mw-input-wpskin-modern')
+ radio_button(:monobook, id: 'mw-input-wpskin-monobook')
+ radio_button(:no_preference_radio, id: 'mw-input-wpdate-default')
+ text_field(:other_offset, id: 'mw-input-wptimecorrection-other')
a(:restore_default_link, href: /reset/)
- select_list(:size_select, id: "mw-input-wpimagesize")
- select_list(:threshold_select, id: "mw-input-wpstubthreshold")
- select_list(:time_offset_select, id: "mw-input-wptimecorrection")
- table(:time_offset_table, id: "mw-htmlform-timeoffset")
- select_list(:thumb_select, id: "mw-input-wpthumbsize")
- select_list(:underline_select, id: "mw-input-wpunderline")
- radio_button(:vector, id: "mw-input-wpskin-vector")
- radio_button(:year_mo_day_radio, id: "mw-input-wpdate-ymd")
+ select_list(:size_select, id: 'mw-input-wpimagesize')
+ select_list(:threshold_select, id: 'mw-input-wpstubthreshold')
+ select_list(:time_offset_select, id: 'mw-input-wptimecorrection')
+ table(:time_offset_table, id: 'mw-htmlform-timeoffset')
+ select_list(:thumb_select, id: 'mw-input-wpthumbsize')
+ select_list(:underline_select, id: 'mw-input-wpunderline')
+ radio_button(:vector, id: 'mw-input-wpskin-vector')
+ radio_button(:year_mo_day_radio, id: 'mw-input-wpdate-ymd')
end
diff --git a/tests/browser/features/support/pages/preferences_editing_page.rb b/tests/browser/features/support/pages/preferences_editing_page.rb
index e8dcfae64478..25c384f7bd9e 100644
--- a/tests/browser/features/support/pages/preferences_editing_page.rb
+++ b/tests/browser/features/support/pages/preferences_editing_page.rb
@@ -12,16 +12,16 @@
class PreferencesEditingPage
include PageObject
- page_url "Special:Preferences#mw-prefsection-rendering"
+ page_url 'Special:Preferences#mw-prefsection-rendering'
- select_list(:edit_area_font_style_select, id: "mw-input-wpeditfont")
- checkbox(:edit_section_double_click_check, id: "mw-input-wpeditondblclick")
- checkbox(:edit_section_edit_link, id: "mw-input-wpeditsectiononrightclick")
- checkbox(:edit_section_right_click_check, id: "mw-input-wpeditsectiononrightclick")
- checkbox(:forced_edit_summary_check, id: "mw-input-wpforceeditsummary")
- checkbox(:live_preview_check, id: "mw-input-wpuselivepreview")
- checkbox(:preview_on_first_check, id: "mw-input-wppreviewonfirst")
- checkbox(:preview_on_top_check, id: "mw-input-wppreviewontop")
- checkbox(:show_edit_toolbar_check, id: "mw-input-wpshowtoolbar")
- checkbox(:unsaved_changes_check, id: "mw-input-wpuseeditwarning")
+ select_list(:edit_area_font_style_select, id: 'mw-input-wpeditfont')
+ checkbox(:edit_section_double_click_check, id: 'mw-input-wpeditondblclick')
+ checkbox(:edit_section_edit_link, id: 'mw-input-wpeditsectiononrightclick')
+ checkbox(:edit_section_right_click_check, id: 'mw-input-wpeditsectiononrightclick')
+ checkbox(:forced_edit_summary_check, id: 'mw-input-wpforceeditsummary')
+ checkbox(:live_preview_check, id: 'mw-input-wpuselivepreview')
+ checkbox(:preview_on_first_check, id: 'mw-input-wppreviewonfirst')
+ checkbox(:preview_on_top_check, id: 'mw-input-wppreviewontop')
+ checkbox(:show_edit_toolbar_check, id: 'mw-input-wpshowtoolbar')
+ checkbox(:unsaved_changes_check, id: 'mw-input-wpuseeditwarning')
end
diff --git a/tests/browser/features/support/pages/preferences_page.rb b/tests/browser/features/support/pages/preferences_page.rb
index aa6848c53899..b305ee2cfead 100644
--- a/tests/browser/features/support/pages/preferences_page.rb
+++ b/tests/browser/features/support/pages/preferences_page.rb
@@ -12,10 +12,10 @@
class PreferencesPage
include PageObject
- page_url "Special:Preferences"
+ page_url 'Special:Preferences'
- a(:appearance_link, id: "preftab-rendering")
- a(:editing_link, id: "preftab-editing")
- a(:user_profile_link, id: "preftab-personal")
- button(:save_button, id: "prefcontrol")
+ a(:appearance_link, id: 'preftab-rendering')
+ a(:editing_link, id: 'preftab-editing')
+ a(:user_profile_link, id: 'preftab-personal')
+ button(:save_button, id: 'prefcontrol')
end
diff --git a/tests/browser/features/support/pages/preferences_user_profile_page.rb b/tests/browser/features/support/pages/preferences_user_profile_page.rb
index 7688bba6f1f3..9e95eb5a7b46 100644
--- a/tests/browser/features/support/pages/preferences_user_profile_page.rb
+++ b/tests/browser/features/support/pages/preferences_user_profile_page.rb
@@ -12,16 +12,16 @@
class PreferencesUserProfilePage
include PageObject
- page_url "Special:Preferences#mw-prefsection-personal"
+ page_url 'Special:Preferences#mw-prefsection-personal'
- table(:basic_info_table, id: "mw-htmlform-info")
- link(:change_password_link, text: "Change password")
- table(:email_table, id: "mw-htmlform-email")
- radio_button(:gender_female_radio, id: "mw-input-wpgender-male")
- radio_button(:gender_male_radio, id: "mw-input-wpgender-female")
- radio_button(:gender_undefined_radio, id: "mw-input-wpgender-unknown")
- select_list(:lang_select, id: "mw-input-wplanguage")
- checkbox(:remember_password_check, id: "mw-input-wprememberpassword")
- text_field(:signature_field, id: "mw-input-wpnickname")
- table(:signature_table, id: "mw-htmlform-signature")
+ table(:basic_info_table, id: 'mw-htmlform-info')
+ link(:change_password_link, text: 'Change password')
+ table(:email_table, id: 'mw-htmlform-email')
+ radio_button(:gender_female_radio, id: 'mw-input-wpgender-male')
+ radio_button(:gender_male_radio, id: 'mw-input-wpgender-female')
+ radio_button(:gender_undefined_radio, id: 'mw-input-wpgender-unknown')
+ select_list(:lang_select, id: 'mw-input-wplanguage')
+ checkbox(:remember_password_check, id: 'mw-input-wprememberpassword')
+ text_field(:signature_field, id: 'mw-input-wpnickname')
+ table(:signature_table, id: 'mw-htmlform-signature')
end
diff --git a/tests/browser/features/support/pages/ztargetpage.rb b/tests/browser/features/support/pages/ztargetpage.rb
index 1e21b9e66200..da789e5e1dd2 100644
--- a/tests/browser/features/support/pages/ztargetpage.rb
+++ b/tests/browser/features/support/pages/ztargetpage.rb
@@ -1,7 +1,7 @@
class ZtargetPage < MainPage
include PageObject
- page_url "<%=params[:article_name]%>"
+ page_url '<%=params[:article_name]%>'
- a(:link_target_page_link, text: "link to the test target page")
+ a(:link_target_page_link, text: 'link to the test target page')
end