From 646fc8e94bf5b96b51b7e905ac5455015e3ef051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=BDeljko=20Filipin?= Date: Wed, 2 Sep 2015 17:21:17 +0200 Subject: [PATCH] Fixed Style/StringLiterals RuboCop offense Bug: T111184 Change-Id: Ia51f271b5e06d7bbd9896634b832003d57c30900 --- .rubocop.yml | 7 ++----- .rubocop_todo.yml | 13 ------------- Gemfile | 6 +++--- tests/browser/features/support/env.rb | 6 +++--- .../features/support/pages/does_not_exist_page.rb | 4 ++-- tests/browser/features/support/pages/edit_page.rb | 6 +++--- 6 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 .rubocop_todo.yml diff --git a/.rubocop.yml b/.rubocop.yml index 10a7cc0..84567a5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,3 @@ -inherit_from: .rubocop_todo.yml - AllCops: StyleGuideCopsOnly: true @@ -15,9 +13,8 @@ Style/Alias: Style/SignalException: Enabled: false -# TODO: uncomment when the time comes -# Style/StringLiterals: -# EnforcedStyle: single_quotes +Style/StringLiterals: + EnforcedStyle: single_quotes Style/TrivialAccessors: ExactNameMatch: true diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml deleted file mode 100644 index b572acb..0000000 --- a/.rubocop_todo.yml +++ /dev/null @@ -1,13 +0,0 @@ -# This configuration was generated by -# `rubocop --auto-gen-config` -# on 2015-09-02 17:15:05 +0200 using RuboCop version 0.33.0. -# 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: 13 -# Cop supports --auto-correct. -# Configuration parameters: SupportedStyles. -Style/StringLiterals: - EnforcedStyle: double_quotes diff --git a/Gemfile b/Gemfile index 6834e17..e678630 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source "https://rubygems.org" +source 'https://rubygems.org' -gem "mediawiki_selenium", "~> 1.5.0" -gem "rubocop", "~> 0.33.0", require: false +gem 'mediawiki_selenium', '~> 1.5.0' +gem 'rubocop', '~> 0.33.0', require: false diff --git a/tests/browser/features/support/env.rb b/tests/browser/features/support/env.rb index 57f3e6b..5eff4ce 100644 --- a/tests/browser/features/support/env.rb +++ b/tests/browser/features/support/env.rb @@ -1,4 +1,4 @@ -require "mediawiki_selenium" +require 'mediawiki_selenium' -require "mediawiki_selenium/support" -require "mediawiki_selenium/step_definitions" +require 'mediawiki_selenium/support' +require 'mediawiki_selenium/step_definitions' diff --git a/tests/browser/features/support/pages/does_not_exist_page.rb b/tests/browser/features/support/pages/does_not_exist_page.rb index e24b398..f3a58da 100644 --- a/tests/browser/features/support/pages/does_not_exist_page.rb +++ b/tests/browser/features/support/pages/does_not_exist_page.rb @@ -12,7 +12,7 @@ class DoesNotExistPage include PageObject - page_url "<%=params[:page_name]%>" + page_url '<%=params[:page_name]%>' - a(:create_source, text: "Create source") + a(:create_source, text: 'Create source') end diff --git a/tests/browser/features/support/pages/edit_page.rb b/tests/browser/features/support/pages/edit_page.rb index b0266bc..bfb6903 100644 --- a/tests/browser/features/support/pages/edit_page.rb +++ b/tests/browser/features/support/pages/edit_page.rb @@ -12,7 +12,7 @@ class EditPage include PageObject - text_area(:article_text, id: "wpTextbox1") - img(:math_image, class: "tex") - button(:preview, id: "wpPreview") + text_area(:article_text, id: 'wpTextbox1') + img(:math_image, class: 'tex') + button(:preview, id: 'wpPreview') end