[MediaWiki-commits] [Gerrit] Fixed Style/StringLiterals RuboCop offense - change (mediawiki...PageTriage)
jenkins-bot has submitted this change and it was merged. Change subject: Fixed Style/StringLiterals RuboCop offense .. Fixed Style/StringLiterals RuboCop offense See: https://github.com/bbatsov/ruby-style-guide#consistent-string-literals Bug: T117985 Change-Id: I812b9a02d615dd32aa81a57d97f79f116d7b1a89 --- M .rubocop.yml M .rubocop_todo.yml M Gemfile M Rakefile M tests/browser/features/support/env.rb M tests/browser/features/support/pages/page_triage_page.rb 6 files changed, 30 insertions(+), 37 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.rubocop.yml b/.rubocop.yml index f5b99e8..3c8a650 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -15,9 +15,8 @@ Style/SignalException: Enabled: false -# uncomment when the offense is fixed -# Style/StringLiterals: -# EnforcedStyle: single_quotes +Style/StringLiterals: + EnforcedStyle: single_quotes Style/TrivialAccessors: ExactNameMatch: true diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 5464b70..56c3c7f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -12,9 +12,3 @@ Style/RegexpLiteral: Exclude: - 'tests/browser/features/support/pages/page_triage_page.rb' - -# Offense count: 31 -# Cop supports --auto-correct. -# Configuration parameters: SupportedStyles. -Style/StringLiterals: - EnforcedStyle: double_quotes diff --git a/Gemfile b/Gemfile index 429c07d..b87770d 100755 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source "https://rubygems.org; +source 'https://rubygems.org' -gem "mediawiki_selenium", "~> 1.6.2" -gem "rubocop", "~> 0.35.1", require: false +gem 'mediawiki_selenium', '~> 1.6.2' +gem 'rubocop', '~> 0.35.1', require: false diff --git a/Rakefile b/Rakefile index d5823fa..6eef121 100644 --- a/Rakefile +++ b/Rakefile @@ -1,14 +1,14 @@ -require "bundler/setup" +require 'bundler/setup' -require "rubocop/rake_task" +require 'rubocop/rake_task' RuboCop::RakeTask.new(:rubocop) do |task| # if you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml # the next line makes it explicit that you want .rubocop.yml from the directory # where `bundle exec rake` is executed - task.options = ["-c", ".rubocop.yml"] + task.options = ['-c', '.rubocop.yml'] end task default: [:test] -desc "Run all build/tests commands (CI entry point)" +desc 'Run all build/tests commands (CI entry point)' task test: [:rubocop] diff --git a/tests/browser/features/support/env.rb b/tests/browser/features/support/env.rb index 1760965..c1072b2 100644 --- a/tests/browser/features/support/env.rb +++ b/tests/browser/features/support/env.rb @@ -1,3 +1,3 @@ -require "mediawiki_selenium/cucumber" -require "mediawiki_selenium/pages" -require "mediawiki_selenium/step_definitions" +require 'mediawiki_selenium/cucumber' +require 'mediawiki_selenium/pages' +require 'mediawiki_selenium/step_definitions' diff --git a/tests/browser/features/support/pages/page_triage_page.rb b/tests/browser/features/support/pages/page_triage_page.rb index ff0fb34..3804fd3 100644 --- a/tests/browser/features/support/pages/page_triage_page.rb +++ b/tests/browser/features/support/pages/page_triage_page.rb @@ -12,23 +12,23 @@ class PageTriagePage include PageObject - page_url "Special:NewPagesFeed" + page_url 'Special:NewPagesFeed' - radio_button(:blocked, id: "mwe-pt-filter-blocked") - radio_button(:bots, id: "mwe-pt-filter-bot-edits") - checkbox(:deletion, id: "mwe-pt-filter-nominated-for-deletion") - a(:learn_more, href: /Wikipedia:Page_Curation\/Help/, text: "Learn more") - a(:leave_feedback, href: /Wikipedia_talk:Page_Curation/, text: "Leave feedback") - select(:namespace, id: "mwe-pt-filter-namespace") - radio_button(:new_editors, id: "mwe-pt-filter-non-autoconfirmed") - radio_button(:no_categories, id: "mwe-pt-filter-no-categories") - radio_button(:orphan, id: "mwe-pt-filter-orphan") - checkbox(:redirects, id: "mwe-pt-filter-redirects") - a(:review, text: "Review") - checkbox(:reviewed_pages, id: "mwe-pt-filter-reviewed-edits") - span(:set_filters, id: "mwe-pt-filter-dropdown-control") - div(:status, class: "mwe-pt-status-icon") - checkbox(:unreviewed_pages, id: "mwe-pt-filter-unreviewed-edits") - radio_button(:user_selected, id: "mwe-pt-filter-user-selected") - text_field(:username, id: "mwe-pt-filter-user") + radio_button(:blocked, id: 'mwe-pt-filter-blocked') + radio_button(:bots, id: 'mwe-pt-filter-bot-edits') + checkbox(:deletion, id: 'mwe-pt-filter-nominated-for-deletion') + a(:learn_more, href: /Wikipedia:Page_Curation\/Help/, text: 'Learn more') + a(:leave_feedback, href: /Wikipedia_talk:Page_Curation/, text: 'Leave feedback') + select(:namespace, id: 'mwe-pt-filter-namespace') + radio_button(:new_editors, id: 'mwe-pt-filter-non-autoconfirmed') + radio_button(:no_categories, id: 'mwe-pt-filter-no-categories') + radio_button(:orphan, id: 'mwe-pt-filter-orphan') +
[MediaWiki-commits] [Gerrit] Fixed Style/StringLiterals RuboCop offense - change (mediawiki...PageTriage)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/255388 Change subject: Fixed Style/StringLiterals RuboCop offense .. Fixed Style/StringLiterals RuboCop offense See: https://github.com/bbatsov/ruby-style-guide#consistent-string-literals Bug: T117985 Change-Id: I812b9a02d615dd32aa81a57d97f79f116d7b1a89 --- M .rubocop.yml M .rubocop_todo.yml M Gemfile M Rakefile M tests/browser/features/support/env.rb M tests/browser/features/support/pages/page_triage_page.rb 6 files changed, 30 insertions(+), 37 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage refs/changes/88/255388/1 diff --git a/.rubocop.yml b/.rubocop.yml index f5b99e8..3c8a650 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -15,9 +15,8 @@ Style/SignalException: Enabled: false -# uncomment when the offense is fixed -# Style/StringLiterals: -# EnforcedStyle: single_quotes +Style/StringLiterals: + EnforcedStyle: single_quotes Style/TrivialAccessors: ExactNameMatch: true diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 5464b70..56c3c7f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -12,9 +12,3 @@ Style/RegexpLiteral: Exclude: - 'tests/browser/features/support/pages/page_triage_page.rb' - -# Offense count: 31 -# Cop supports --auto-correct. -# Configuration parameters: SupportedStyles. -Style/StringLiterals: - EnforcedStyle: double_quotes diff --git a/Gemfile b/Gemfile index 429c07d..b87770d 100755 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source "https://rubygems.org; +source 'https://rubygems.org' -gem "mediawiki_selenium", "~> 1.6.2" -gem "rubocop", "~> 0.35.1", require: false +gem 'mediawiki_selenium', '~> 1.6.2' +gem 'rubocop', '~> 0.35.1', require: false diff --git a/Rakefile b/Rakefile index d5823fa..6eef121 100644 --- a/Rakefile +++ b/Rakefile @@ -1,14 +1,14 @@ -require "bundler/setup" +require 'bundler/setup' -require "rubocop/rake_task" +require 'rubocop/rake_task' RuboCop::RakeTask.new(:rubocop) do |task| # if you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml # the next line makes it explicit that you want .rubocop.yml from the directory # where `bundle exec rake` is executed - task.options = ["-c", ".rubocop.yml"] + task.options = ['-c', '.rubocop.yml'] end task default: [:test] -desc "Run all build/tests commands (CI entry point)" +desc 'Run all build/tests commands (CI entry point)' task test: [:rubocop] diff --git a/tests/browser/features/support/env.rb b/tests/browser/features/support/env.rb index 1760965..c1072b2 100644 --- a/tests/browser/features/support/env.rb +++ b/tests/browser/features/support/env.rb @@ -1,3 +1,3 @@ -require "mediawiki_selenium/cucumber" -require "mediawiki_selenium/pages" -require "mediawiki_selenium/step_definitions" +require 'mediawiki_selenium/cucumber' +require 'mediawiki_selenium/pages' +require 'mediawiki_selenium/step_definitions' diff --git a/tests/browser/features/support/pages/page_triage_page.rb b/tests/browser/features/support/pages/page_triage_page.rb index ff0fb34..3804fd3 100644 --- a/tests/browser/features/support/pages/page_triage_page.rb +++ b/tests/browser/features/support/pages/page_triage_page.rb @@ -12,23 +12,23 @@ class PageTriagePage include PageObject - page_url "Special:NewPagesFeed" + page_url 'Special:NewPagesFeed' - radio_button(:blocked, id: "mwe-pt-filter-blocked") - radio_button(:bots, id: "mwe-pt-filter-bot-edits") - checkbox(:deletion, id: "mwe-pt-filter-nominated-for-deletion") - a(:learn_more, href: /Wikipedia:Page_Curation\/Help/, text: "Learn more") - a(:leave_feedback, href: /Wikipedia_talk:Page_Curation/, text: "Leave feedback") - select(:namespace, id: "mwe-pt-filter-namespace") - radio_button(:new_editors, id: "mwe-pt-filter-non-autoconfirmed") - radio_button(:no_categories, id: "mwe-pt-filter-no-categories") - radio_button(:orphan, id: "mwe-pt-filter-orphan") - checkbox(:redirects, id: "mwe-pt-filter-redirects") - a(:review, text: "Review") - checkbox(:reviewed_pages, id: "mwe-pt-filter-reviewed-edits") - span(:set_filters, id: "mwe-pt-filter-dropdown-control") - div(:status, class: "mwe-pt-status-icon") - checkbox(:unreviewed_pages, id: "mwe-pt-filter-unreviewed-edits") - radio_button(:user_selected, id: "mwe-pt-filter-user-selected") - text_field(:username, id: "mwe-pt-filter-user") + radio_button(:blocked, id: 'mwe-pt-filter-blocked') + radio_button(:bots, id: 'mwe-pt-filter-bot-edits') + checkbox(:deletion, id: 'mwe-pt-filter-nominated-for-deletion') + a(:learn_more, href: /Wikipedia:Page_Curation\/Help/, text: 'Learn more') + a(:leave_feedback, href: /Wikipedia_talk:Page_Curation/, text: 'Leave feedback') + select(:namespace, id: 'mwe-pt-filter-namespace') + radio_button(:new_editors, id: 'mwe-pt-filter-non-autoconfirmed') + radio_button(:no_categories, id: 'mwe-pt-filter-no-categories') +
