From a21e18d5080a2c4808330271885f5664a725d3f3 Mon Sep 17 00:00:00 2001 From: eileencodes Date: Tue, 4 Oct 2016 08:48:21 -0400 Subject: [PATCH] Appease Rubocop Rubocop / code climate don't like single quotes and prefer doubles. --- actionpack/lib/system_test_case.rb | 4 ++-- actionpack/lib/system_testing/driver_adapter.rb | 2 +- .../lib/system_testing/driver_adapters/capybara_driver.rb | 2 +- .../system_testing/driver_adapters/rails_selenium_driver.rb | 2 +- actionpack/lib/system_testing/driver_adapters/web_server.rb | 2 +- actionpack/lib/system_testing/railtie.rb | 2 +- actionpack/lib/system_testing/test_helper.rb | 4 ++-- actionpack/lib/system_testing/test_helpers/form_helper.rb | 2 +- .../lib/system_testing/test_helpers/screenshot_helper.rb | 5 ++--- actionpack/test/system_testing/capybara_driver_test.rb | 2 +- actionpack/test/system_testing/driver_adapter_test.rb | 4 ++-- actionpack/test/system_testing/rails_selenium_driver_test.rb | 4 ++-- actionpack/test/system_testing/screenshot_helper_test.rb | 2 +- .../rails/generators/test_unit/system/system_generator.rb | 2 +- railties/lib/rails/test_help.rb | 2 +- 15 files changed, 20 insertions(+), 21 deletions(-) diff --git a/actionpack/lib/system_test_case.rb b/actionpack/lib/system_test_case.rb index 196798495fa8a..373cb4f0d059e 100644 --- a/actionpack/lib/system_test_case.rb +++ b/actionpack/lib/system_test_case.rb @@ -1,5 +1,5 @@ -require 'system_testing/test_helper' -require 'system_testing/driver_adapter' +require "system_testing/test_helper" +require "system_testing/driver_adapter" module Rails # System tests are similar to Integration tests in that they incorporate multiple diff --git a/actionpack/lib/system_testing/driver_adapter.rb b/actionpack/lib/system_testing/driver_adapter.rb index 3d8545f3c65d6..ccd702e967669 100644 --- a/actionpack/lib/system_testing/driver_adapter.rb +++ b/actionpack/lib/system_testing/driver_adapter.rb @@ -1,4 +1,4 @@ -require 'system_testing/driver_adapters' +require "system_testing/driver_adapters" module SystemTesting # The SystemTesting::DriverAdapter module is used to load the driver diff --git a/actionpack/lib/system_testing/driver_adapters/capybara_driver.rb b/actionpack/lib/system_testing/driver_adapters/capybara_driver.rb index 487c2b3b886e0..7755b9616a7b0 100644 --- a/actionpack/lib/system_testing/driver_adapters/capybara_driver.rb +++ b/actionpack/lib/system_testing/driver_adapters/capybara_driver.rb @@ -1,4 +1,4 @@ -require 'system_testing/driver_adapters/web_server' +require "system_testing/driver_adapters/web_server" module SystemTesting module DriverAdapters diff --git a/actionpack/lib/system_testing/driver_adapters/rails_selenium_driver.rb b/actionpack/lib/system_testing/driver_adapters/rails_selenium_driver.rb index 0e8fc00871009..aa67ba8029488 100644 --- a/actionpack/lib/system_testing/driver_adapters/rails_selenium_driver.rb +++ b/actionpack/lib/system_testing/driver_adapters/rails_selenium_driver.rb @@ -1,4 +1,4 @@ -require 'system_testing/driver_adapters/web_server' +require "system_testing/driver_adapters/web_server" module SystemTesting module DriverAdapters diff --git a/actionpack/lib/system_testing/driver_adapters/web_server.rb b/actionpack/lib/system_testing/driver_adapters/web_server.rb index 85bcaed8b27cf..65d719d1ab91d 100644 --- a/actionpack/lib/system_testing/driver_adapters/web_server.rb +++ b/actionpack/lib/system_testing/driver_adapters/web_server.rb @@ -26,7 +26,7 @@ def register_default(app, port) end def register_puma(app, port) - Rack::Handler::Puma.run(app, Port: port, Threads: '0:4') + Rack::Handler::Puma.run(app, Port: port, Threads: "0:4") end def register_webrick(app, port) diff --git a/actionpack/lib/system_testing/railtie.rb b/actionpack/lib/system_testing/railtie.rb index 459a8e9623053..d8af69e5d340d 100644 --- a/actionpack/lib/system_testing/railtie.rb +++ b/actionpack/lib/system_testing/railtie.rb @@ -1,4 +1,4 @@ -require 'system_test_case' +require "system_test_case" module SystemTesting # = System Testing Railtie diff --git a/actionpack/lib/system_testing/test_helper.rb b/actionpack/lib/system_testing/test_helper.rb index 0ca4f792cb9e7..8bd49b2f4c25a 100644 --- a/actionpack/lib/system_testing/test_helper.rb +++ b/actionpack/lib/system_testing/test_helper.rb @@ -1,5 +1,5 @@ -require 'capybara/dsl' -require 'system_testing/test_helpers' +require "capybara/dsl" +require "system_testing/test_helpers" module SystemTesting module TestHelper # :nodoc: diff --git a/actionpack/lib/system_testing/test_helpers/form_helper.rb b/actionpack/lib/system_testing/test_helpers/form_helper.rb index 4789694bbbe50..74a151611673e 100644 --- a/actionpack/lib/system_testing/test_helpers/form_helper.rb +++ b/actionpack/lib/system_testing/test_helpers/form_helper.rb @@ -50,7 +50,7 @@ def find_checkbox(name, checked) find(:field, name, visible: :all, checked: checked) end - def find_label_wrapper(field, location: './ancestor::label') + def find_label_wrapper(field, location: "./ancestor::label") field.find :xpath, location end end diff --git a/actionpack/lib/system_testing/test_helpers/screenshot_helper.rb b/actionpack/lib/system_testing/test_helpers/screenshot_helper.rb index a74ebb8caead7..eeade229df34f 100644 --- a/actionpack/lib/system_testing/test_helpers/screenshot_helper.rb +++ b/actionpack/lib/system_testing/test_helpers/screenshot_helper.rb @@ -30,7 +30,7 @@ def image_path end def find_image - if ENV['CAPYBARA_INLINE_SCREENSHOT'] == 'artifact' + if ENV["CAPYBARA_INLINE_SCREENSHOT"] == "artifact" "\e]1338;url=artifact://#{image_path}\a" else name = inline_base64(File.basename(image_path)) @@ -40,9 +40,8 @@ def find_image end def inline_base64(path) - Base64.encode64(path).gsub("\n",'') + Base64.encode64(path).gsub("\n", "") end end end end - diff --git a/actionpack/test/system_testing/capybara_driver_test.rb b/actionpack/test/system_testing/capybara_driver_test.rb index a6be63ba7fa1d..129fe95f25dfb 100644 --- a/actionpack/test/system_testing/capybara_driver_test.rb +++ b/actionpack/test/system_testing/capybara_driver_test.rb @@ -1,4 +1,4 @@ -require 'abstract_unit' +require "abstract_unit" class CapybaraDriverTest < ActiveSupport::TestCase def setup diff --git a/actionpack/test/system_testing/driver_adapter_test.rb b/actionpack/test/system_testing/driver_adapter_test.rb index 220a755bd38fd..035d018adf3b6 100644 --- a/actionpack/test/system_testing/driver_adapter_test.rb +++ b/actionpack/test/system_testing/driver_adapter_test.rb @@ -1,7 +1,7 @@ -require 'abstract_unit' +require "abstract_unit" class DriverAdapterTest < ActiveSupport::TestCase - test 'only registered adapters are accepted' do + test "only registered adapters are accepted" do assert_raises(NameError) do Rails::SystemTestCase.driver = :whatever end diff --git a/actionpack/test/system_testing/rails_selenium_driver_test.rb b/actionpack/test/system_testing/rails_selenium_driver_test.rb index c239444838a08..25fc6ca097c01 100644 --- a/actionpack/test/system_testing/rails_selenium_driver_test.rb +++ b/actionpack/test/system_testing/rails_selenium_driver_test.rb @@ -1,4 +1,4 @@ -require 'abstract_unit' +require "abstract_unit" class RailsSeleniumDriverTest < ActiveSupport::TestCase def setup @@ -51,7 +51,7 @@ def test_setting_screen_size def test_does_not_accept_nonsense_kwargs assert_raises ArgumentError do Rails::SystemTestCase.driver = SystemTesting::DriverAdapters::RailsSeleniumDriver.new( - made_up_arg: 'x' + made_up_arg: "x" ) end end diff --git a/actionpack/test/system_testing/screenshot_helper_test.rb b/actionpack/test/system_testing/screenshot_helper_test.rb index 8bf2d0c8d0f16..8060c499dfa7f 100644 --- a/actionpack/test/system_testing/screenshot_helper_test.rb +++ b/actionpack/test/system_testing/screenshot_helper_test.rb @@ -1,4 +1,4 @@ -require 'abstract_unit' +require "abstract_unit" class ScreenshotHelperTest < ActiveSupport::TestCase def test_driver_support_for_screenshots diff --git a/railties/lib/rails/generators/test_unit/system/system_generator.rb b/railties/lib/rails/generators/test_unit/system/system_generator.rb index 4d3b37e6451d0..a05f0f924d159 100644 --- a/railties/lib/rails/generators/test_unit/system/system_generator.rb +++ b/railties/lib/rails/generators/test_unit/system/system_generator.rb @@ -1,4 +1,4 @@ -require 'rails/generators/test_unit' +require "rails/generators/test_unit" module TestUnit # :nodoc: module Generators # :nodoc: diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index 468b50c0f86bb..ab4d371b49ba0 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -7,7 +7,7 @@ require "action_controller" require "action_controller/test_case" require "action_dispatch/testing/integration" -require 'system_test_case' +require "system_test_case" require "rails/generators/test_case" require "active_support/testing/autorun"