aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2016-10-04 08:48:21 -0400
committereileencodes <eileencodes@gmail.com>2017-02-20 15:07:33 -0500
commita21e18d5080a2c4808330271885f5664a725d3f3 (patch)
tree4b82d8843fdddf71263eecd72c676fe3d8902d6e
parentc83e6d36dd13baa8b8cb48ce1c628788a2456d21 (diff)
downloadrails-a21e18d5080a2c4808330271885f5664a725d3f3.tar.gz
rails-a21e18d5080a2c4808330271885f5664a725d3f3.tar.bz2
rails-a21e18d5080a2c4808330271885f5664a725d3f3.zip
Appease Rubocop
Rubocop / code climate don't like single quotes and prefer doubles.
-rw-r--r--actionpack/lib/system_test_case.rb4
-rw-r--r--actionpack/lib/system_testing/driver_adapter.rb2
-rw-r--r--actionpack/lib/system_testing/driver_adapters/capybara_driver.rb2
-rw-r--r--actionpack/lib/system_testing/driver_adapters/rails_selenium_driver.rb2
-rw-r--r--actionpack/lib/system_testing/driver_adapters/web_server.rb2
-rw-r--r--actionpack/lib/system_testing/railtie.rb2
-rw-r--r--actionpack/lib/system_testing/test_helper.rb4
-rw-r--r--actionpack/lib/system_testing/test_helpers/form_helper.rb2
-rw-r--r--actionpack/lib/system_testing/test_helpers/screenshot_helper.rb5
-rw-r--r--actionpack/test/system_testing/capybara_driver_test.rb2
-rw-r--r--actionpack/test/system_testing/driver_adapter_test.rb4
-rw-r--r--actionpack/test/system_testing/rails_selenium_driver_test.rb4
-rw-r--r--actionpack/test/system_testing/screenshot_helper_test.rb2
-rw-r--r--railties/lib/rails/generators/test_unit/system/system_generator.rb2
-rw-r--r--railties/lib/rails/test_help.rb2
15 files changed, 20 insertions, 21 deletions
diff --git a/actionpack/lib/system_test_case.rb b/actionpack/lib/system_test_case.rb
index 196798495f..373cb4f0d0 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 3d8545f3c6..ccd702e967 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 <tt>SystemTesting::DriverAdapter</tt> 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 487c2b3b88..7755b9616a 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 0e8fc00871..aa67ba8029 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 85bcaed8b2..65d719d1ab 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 @@ module SystemTesting
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 459a8e9623..d8af69e5d3 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 0ca4f792cb..8bd49b2f4c 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 4789694bbb..74a1516116 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 @@ module SystemTesting
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 a74ebb8cae..eeade229df 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 @@ module SystemTesting
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 @@ module SystemTesting
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 a6be63ba7f..129fe95f25 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 220a755bd3..035d018adf 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 c239444838..25fc6ca097 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 @@ class RailsSeleniumDriverTest < ActiveSupport::TestCase
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 8bf2d0c8d0..8060c499df 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 4d3b37e645..a05f0f924d 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 468b50c0f8..ab4d371b49 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -7,7 +7,7 @@ require "active_support/test_case"
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"