From 69ab3eb57e8387b0dd9d672b5e8d9185395baa03 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 6 Aug 2016 19:15:47 +0200
Subject: applies new string literal convention in railties/lib

The current code base is not uniform. After some discussion,
we have chosen to go with double quotes by default.
---
 railties/lib/rails/test_unit/line_filtering.rb  |  4 ++--
 railties/lib/rails/test_unit/minitest_plugin.rb |  6 +++---
 railties/lib/rails/test_unit/railtie.rb         |  4 ++--
 railties/lib/rails/test_unit/reporter.rb        |  2 +-
 railties/lib/rails/test_unit/test_requirer.rb   |  8 ++++----
 railties/lib/rails/test_unit/testing.rake       | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'railties/lib/rails/test_unit')

diff --git a/railties/lib/rails/test_unit/line_filtering.rb b/railties/lib/rails/test_unit/line_filtering.rb
index dd9732bb12..32ba744701 100644
--- a/railties/lib/rails/test_unit/line_filtering.rb
+++ b/railties/lib/rails/test_unit/line_filtering.rb
@@ -1,4 +1,4 @@
-require 'method_source'
+require "method_source"
 
 module Rails
   module LineFiltering # :nodoc:
@@ -39,7 +39,7 @@ module Rails
 
       def derive_line_filters(patterns)
         patterns.flat_map do |file_and_line|
-          file, *lines = file_and_line.split(':')
+          file, *lines = file_and_line.split(":")
 
           if lines.empty?
             Filter.new(@runnable, file, nil) if file
diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb
index 076ab536be..e15c6b3a38 100644
--- a/railties/lib/rails/test_unit/minitest_plugin.rb
+++ b/railties/lib/rails/test_unit/minitest_plugin.rb
@@ -1,7 +1,7 @@
 require "active_support/core_ext/module/attribute_accessors"
 require "rails/test_unit/reporter"
 require "rails/test_unit/test_requirer"
-require 'shellwords'
+require "shellwords"
 
 module Minitest
   class SuppressedSummaryReporter < SummaryReporter
@@ -61,7 +61,7 @@ module Minitest
   # as the patterns would also contain the other Rake tasks.
   def self.rake_run(patterns) # :nodoc:
     @rake_patterns = patterns
-    passed = run(Shellwords.split(ENV['TESTOPTS'] || ''))
+    passed = run(Shellwords.split(ENV["TESTOPTS"] || ""))
     exit passed unless passed
     passed
   end
@@ -95,4 +95,4 @@ end
 # Since minitest only loads plugins if its extensions are empty we have
 # to call `load_plugins` first.
 Minitest.load_plugins
-Minitest.extensions.unshift 'rails'
+Minitest.extensions.unshift "rails"
diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb
index 511cee33bd..d0fc795515 100644
--- a/railties/lib/rails/test_unit/railtie.rb
+++ b/railties/lib/rails/test_unit/railtie.rb
@@ -1,7 +1,7 @@
-require 'rails/test_unit/line_filtering'
+require "rails/test_unit/line_filtering"
 
 if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any?
-  ENV['RAILS_ENV'] ||= 'test'
+  ENV["RAILS_ENV"] ||= "test"
 end
 
 module Rails
diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb
index 4086d5b731..afcdd2e9fd 100644
--- a/railties/lib/rails/test_unit/reporter.rb
+++ b/railties/lib/rails/test_unit/reporter.rb
@@ -50,7 +50,7 @@ module Rails
     end
 
     def relative_path_for(file)
-      file.sub(/^#{app_root}\/?/, '')
+      file.sub(/^#{app_root}\/?/, "")
     end
 
     private
diff --git a/railties/lib/rails/test_unit/test_requirer.rb b/railties/lib/rails/test_unit/test_requirer.rb
index 8b211ce130..fe35934abc 100644
--- a/railties/lib/rails/test_unit/test_requirer.rb
+++ b/railties/lib/rails/test_unit/test_requirer.rb
@@ -1,5 +1,5 @@
-require 'active_support/core_ext/object/blank'
-require 'rake/file_list'
+require "active_support/core_ext/object/blank"
+require "rake/file_list"
 
 module Rails
   class TestRequirer # :nodoc:
@@ -7,7 +7,7 @@ module Rails
       def require_files(patterns)
         patterns = expand_patterns(patterns)
 
-        Rake::FileList[patterns.compact.presence || 'test/**/*_test.rb'].to_a.each do |file|
+        Rake::FileList[patterns.compact.presence || "test/**/*_test.rb"].to_a.each do |file|
           require File.expand_path(file)
         end
       end
@@ -15,7 +15,7 @@ module Rails
       private
         def expand_patterns(patterns)
           patterns.map do |arg|
-            arg = arg.gsub(/(:\d+)+?$/, '')
+            arg = arg.gsub(/(:\d+)+?$/, "")
             if Dir.exist?(arg)
               "#{arg}/**/*_test.rb"
             else
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 41921e43f3..0deca8dbcf 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -1,14 +1,14 @@
-gem 'minitest'
-require 'minitest'
-require 'rails/test_unit/minitest_plugin'
+gem "minitest"
+require "minitest"
+require "rails/test_unit/minitest_plugin"
 
 task default: :test
 
 desc "Runs all tests in test folder"
 task :test do
   $: << "test"
-  pattern = if ENV.key?('TEST')
-               ENV['TEST']
+  pattern = if ENV.key?("TEST")
+               ENV["TEST"]
              else
                "test"
              end
-- 
cgit v1.2.3