applies new string literal convention in actionview/test

The current code base is not uniform. After some discussion,
we have chosen to go with double quotes by default.

4 files changed, 87 insertions, 87 deletions

diff --git a/actionview/test/actionpack/controller/capture_test.rb b/actionview/test/actionpack/controller/capture_test.rb
index 933456ce9d..eda604ec19 100644
--- a/actionview/test/actionpack/controller/capture_test.rb
+++ b/actionview/test/actionpack/controller/capture_test.rb
@@ -1,8 +1,8 @@
-require 'abstract_unit'
-require 'active_support/logger'
+require "abstract_unit"
+require "active_support/logger"
 
 class CaptureController < ActionController::Base
-  self.view_paths = [ File.dirname(__FILE__) + '/../../fixtures/actionpack' ]
+  self.view_paths = [ File.dirname(__FILE__) + "/../../fixtures/actionpack" ]
 
   def self.controller_name; "test"; end
   def self.controller_path; "test"; end
diff --git a/actionview/test/actionpack/controller/layout_test.rb b/actionview/test/actionpack/controller/layout_test.rb
index ecfef3dc8c..4eeb58f64f 100644
--- a/actionview/test/actionpack/controller/layout_test.rb
+++ b/actionview/test/actionpack/controller/layout_test.rb
@@ -1,16 +1,16 @@
-require 'abstract_unit'
-require 'active_support/core_ext/array/extract_options'
-require 'active_support/core_ext/regexp'
+require "abstract_unit"
+require "active_support/core_ext/array/extract_options"
+require "active_support/core_ext/regexp"
 
 # The view_paths array must be set on Base and not LayoutTest so that LayoutTest's inherited
 # method has access to the view_paths array when looking for a layout to automatically assign.
 old_load_paths = ActionController::Base.view_paths
 
-ActionController::Base.view_paths = [ File.dirname(__FILE__) + '/../../fixtures/actionpack/layout_tests/' ]
+ActionController::Base.view_paths = [ File.dirname(__FILE__) + "/../../fixtures/actionpack/layout_tests/" ]
 
 class LayoutTest < ActionController::Base
-  def self.controller_path; 'views' end
-  def self._implied_layout_name; to_s.underscore.gsub(/_controller$/, '') ; end
+  def self.controller_path; "views" end
+  def self._implied_layout_name; to_s.underscore.gsub(/_controller$/, "") ; end
   self.view_paths = ActionController::Base.view_paths.dup
 end
 
@@ -55,13 +55,13 @@ class LayoutAutoDiscoveryTest < ActionController::TestCase
   def test_application_layout_is_default_when_no_controller_match
     @controller = ProductController.new
     get :hello
-    assert_equal 'layout_test.erb hello.erb', @response.body
+    assert_equal "layout_test.erb hello.erb", @response.body
   end
 
   def test_controller_name_layout_name_match
     @controller = ItemController.new
     get :hello
-    assert_equal 'item.erb hello.erb', @response.body
+    assert_equal "item.erb hello.erb", @response.body
   end
 
   def test_third_party_template_library_auto_discovers_layout
@@ -69,20 +69,20 @@ class LayoutAutoDiscoveryTest < ActionController::TestCase
       @controller = ThirdPartyTemplateLibraryController.new
       get :hello
       assert_response :success
-      assert_equal 'layouts/third_party_template_library.mab', @response.body
+      assert_equal "layouts/third_party_template_library.mab", @response.body
     end
   end
 
   def test_namespaced_controllers_auto_detect_layouts1
     @controller = ControllerNameSpace::NestedController.new
     get :hello
-    assert_equal 'controller_name_space/nested.erb hello.erb', @response.body
+    assert_equal "controller_name_space/nested.erb hello.erb", @response.body
   end
 
   def test_namespaced_controllers_auto_detect_layouts2
     @controller = MultipleExtensions.new
     get :hello
-    assert_equal 'multiple_extensions.html.erb hello.erb', @response.body.strip
+    assert_equal "multiple_extensions.html.erb hello.erb", @response.body.strip
   end
 end
 
@@ -97,11 +97,11 @@ class StreamingLayoutController < LayoutTest
 end
 
 class AbsolutePathLayoutController < LayoutTest
-  layout File.expand_path(File.expand_path(__FILE__) + '/../../../fixtures/actionpack/layout_tests/layouts/layout_test')
+  layout File.expand_path(File.expand_path(__FILE__) + "/../../../fixtures/actionpack/layout_tests/layouts/layout_test")
 end
 
 class HasOwnLayoutController < LayoutTest
-  layout 'item'
+  layout "item"
 end
 
 class HasNilLayoutSymbol < LayoutTest
@@ -118,22 +118,22 @@ end
 
 class PrependsViewPathController < LayoutTest
   def hello
-    prepend_view_path File.dirname(__FILE__) + '/../../fixtures/actionpack/layout_tests/alt/'
-    render :layout => 'alt'
+    prepend_view_path File.dirname(__FILE__) + "/../../fixtures/actionpack/layout_tests/alt/"
+    render :layout => "alt"
   end
 end
 
 class OnlyLayoutController < LayoutTest
-  layout 'item', :only => "hello"
+  layout "item", :only => "hello"
 end
 
 class ExceptLayoutController < LayoutTest
-  layout 'item', :except => "goodbye"
+  layout "item", :except => "goodbye"
 end
 
 class SetsLayoutInRenderController < LayoutTest
   def hello
-    render :layout => 'third_party_template_library'
+    render :layout => "third_party_template_library"
   end
 end
 
@@ -150,75 +150,75 @@ class LayoutSetInResponseTest < ActionController::TestCase
   def test_layout_set_when_using_default_layout
     @controller = DefaultLayoutController.new
     get :hello
-    assert_includes @response.body, 'layout_test.erb'
+    assert_includes @response.body, "layout_test.erb"
   end
 
   def test_layout_set_when_using_streaming_layout
     @controller = StreamingLayoutController.new
     get :hello
-    assert_includes @response.body, 'layout_test.erb'
+    assert_includes @response.body, "layout_test.erb"
   end
 
   def test_layout_set_when_set_in_controller
     @controller = HasOwnLayoutController.new
     get :hello
-    assert_includes @response.body, 'item.erb'
+    assert_includes @response.body, "item.erb"
   end
 
   def test_layout_symbol_set_in_controller_returning_nil_falls_back_to_default
     @controller = HasNilLayoutSymbol.new
     get :hello
-    assert_includes @response.body, 'layout_test.erb'
+    assert_includes @response.body, "layout_test.erb"
   end
 
   def test_layout_proc_set_in_controller_returning_nil_falls_back_to_default
     @controller = HasNilLayoutProc.new
     get :hello
-    assert_includes @response.body, 'layout_test.erb'
+    assert_includes @response.body, "layout_test.erb"
   end
 
   def test_layout_only_exception_when_included
     @controller = OnlyLayoutController.new
     get :hello
-    assert_includes @response.body, 'item.erb'
+    assert_includes @response.body, "item.erb"
   end
 
   def test_layout_only_exception_when_excepted
     @controller = OnlyLayoutController.new
     get :goodbye
-    assert_not_includes @response.body, 'item.erb'
+    assert_not_includes @response.body, "item.erb"
   end
 
   def test_layout_except_exception_when_included
     @controller = ExceptLayoutController.new
     get :hello
-    assert_includes @response.body, 'item.erb'
+    assert_includes @response.body, "item.erb"
   end
 
   def test_layout_except_exception_when_excepted
     @controller = ExceptLayoutController.new
     get :goodbye
-    assert_not_includes @response.body, 'item.erb'
+    assert_not_includes @response.body, "item.erb"
   end
 
   def test_layout_set_when_using_render
     with_template_handler :mab, lambda { |template| template.source.inspect } do
       @controller = SetsLayoutInRenderController.new
       get :hello
-      assert_includes @response.body, 'layouts/third_party_template_library.mab'
+      assert_includes @response.body, "layouts/third_party_template_library.mab"
     end
   end
 
   def test_layout_is_not_set_when_none_rendered
     @controller = RendersNoLayoutController.new
     get :hello
-    assert_equal 'hello.erb', @response.body
+    assert_equal "hello.erb", @response.body
   end
 
   def test_layout_is_picked_from_the_controller_instances_view_path
     @controller = PrependsViewPathController.new
     get :hello
-    assert_includes @response.body, 'alt.erb'
+    assert_includes @response.body, "alt.erb"
   end
 
   def test_absolute_pathed_layout
@@ -253,7 +253,7 @@ class LayoutStatusIsRenderedTest < ActionController::TestCase
   end
 end
 
-unless /mswin|mingw/.match?(RbConfig::CONFIG['host_os'])
+unless /mswin|mingw/.match?(RbConfig::CONFIG["host_os"])
   class LayoutSymlinkedTest < LayoutTest
     layout "symlinked/symlinked_layout"
   end
@@ -263,7 +263,7 @@ unless /mswin|mingw/.match?(RbConfig::CONFIG['host_os'])
       @controller = LayoutSymlinkedTest.new
       get :hello
       assert_response 200
-      assert_includes @response.body, 'This is my layout'
+      assert_includes @response.body, "This is my layout"
     end
   end
 end
diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb
index 7b69ffc628..42326cbe03 100644
--- a/actionview/test/actionpack/controller/render_test.rb
+++ b/actionview/test/actionpack/controller/render_test.rb
@@ -1,5 +1,5 @@
-require 'abstract_unit'
-require 'active_model'
+require "abstract_unit"
+require "active_model"
 
 class ApplicationController < ActionController::Base
   self.view_paths = File.join(FIXTURE_LOAD_PATH, "actionpack")
@@ -110,12 +110,12 @@ class TestController < ApplicationController
 
   # :ported:
   def render_template_in_top_directory
-    render :template => 'shared'
+    render :template => "shared"
   end
 
   # :deprecated:
   def render_template_in_top_directory_with_slash
-    render '/shared'
+    render "/shared"
   end
 
   # :ported:
@@ -158,40 +158,40 @@ class TestController < ApplicationController
 
   # :ported:
   def render_file_with_instance_variables
-    @secret = 'in the sauce'
-    path = File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_ivar')
+    @secret = "in the sauce"
+    path = File.join(File.dirname(__FILE__), "../../fixtures/test/render_file_with_ivar")
     render :file => path
   end
 
   # :ported:
   def render_file_not_using_full_path
-    @secret = 'in the sauce'
-    render :file => 'test/render_file_with_ivar'
+    @secret = "in the sauce"
+    render :file => "test/render_file_with_ivar"
   end
 
   def render_file_not_using_full_path_with_dot_in_path
-    @secret = 'in the sauce'
-    render :file => 'test/dot.directory/render_file_with_ivar'
+    @secret = "in the sauce"
+    render :file => "test/dot.directory/render_file_with_ivar"
   end
 
   def render_file_using_pathname
-    @secret = 'in the sauce'
-    render :file => Pathname.new(File.dirname(__FILE__)).join('..', '..', 'fixtures', 'test', 'dot.directory', 'render_file_with_ivar')
+    @secret = "in the sauce"
+    render :file => Pathname.new(File.dirname(__FILE__)).join("..", "..", "fixtures", "test", "dot.directory", "render_file_with_ivar")
   end
 
   def render_file_from_template
-    @secret = 'in the sauce'
-    @path = File.expand_path(File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_ivar'))
+    @secret = "in the sauce"
+    @path = File.expand_path(File.join(File.dirname(__FILE__), "../../fixtures/test/render_file_with_ivar"))
   end
 
   def render_file_with_locals
-    path = File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_locals')
-    render :file => path, :locals => {:secret => 'in the sauce'}
+    path = File.join(File.dirname(__FILE__), "../../fixtures/test/render_file_with_locals")
+    render :file => path, :locals => {:secret => "in the sauce"}
   end
 
   def render_file_as_string_with_locals
-    path = File.expand_path(File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_locals'))
-    render file: path, :locals => {:secret => 'in the sauce'}
+    path = File.expand_path(File.join(File.dirname(__FILE__), "../../fixtures/test/render_file_with_locals"))
+    render file: path, :locals => {:secret => "in the sauce"}
   end
 
   def accessing_request_in_template
@@ -249,7 +249,7 @@ class TestController < ApplicationController
   end
 
   def render_line_offset
-    render :inline => '<% raise %>', :locals => {:foo => 'bar'}
+    render :inline => "<% raise %>", :locals => {:foo => "bar"}
   end
 
   def heading
@@ -262,7 +262,7 @@ class TestController < ApplicationController
 
   # :ported:
   def blank_response
-    render plain: ' '
+    render plain: " "
   end
 
   # :ported:
@@ -283,7 +283,7 @@ class TestController < ApplicationController
 
   # :ported:
   def partials_list
-    @test_unchanged = 'hello'
+    @test_unchanged = "hello"
     @customers = [ Customer.new("david"), Customer.new("mary") ]
     render :action => "list"
   end
@@ -404,7 +404,7 @@ class TestController < ApplicationController
 
   # :ported:
   def render_with_explicit_template_with_locals
-    render :template => "test/render_file_with_locals", :locals => { :secret => 'area51' }
+    render :template => "test/render_file_with_locals", :locals => { :secret => "area51" }
   end
 
   # :ported:
@@ -458,7 +458,7 @@ class TestController < ApplicationController
   end
 
   def render_with_assigns_option
-    render inline: '<%= @hello %>', assigns: { hello: "world" }
+    render inline: "<%= @hello %>", assigns: { hello: "world" }
   end
 
   def yield_content_for
@@ -479,15 +479,15 @@ class TestController < ApplicationController
   end
 
   def partial_formats_html
-    render :partial => 'partial', :formats => [:html]
+    render :partial => "partial", :formats => [:html]
   end
 
   def partial
-    render :partial => 'partial'
+    render :partial => "partial"
   end
 
   def partial_html_erb
-    render :partial => 'partial_html_erb'
+    render :partial => "partial_html_erb"
   end
 
   def render_to_string_with_partial
@@ -538,11 +538,11 @@ class TestController < ApplicationController
   end
 
   def partial_collection_with_iteration
-    render partial: "customer_iteration", collection: [ Customer.new("david"), Customer.new("mary"), Customer.new('christine') ]
+    render partial: "customer_iteration", collection: [ Customer.new("david"), Customer.new("mary"), Customer.new("christine") ]
   end
 
   def partial_collection_with_as_and_iteration
-    render partial: "customer_iteration_with_as", collection: [ Customer.new("david"), Customer.new("mary"), Customer.new('christine') ], as: :client
+    render partial: "customer_iteration_with_as", collection: [ Customer.new("david"), Customer.new("mary"), Customer.new("christine") ], as: :client
   end
 
   def partial_collection_with_counter
@@ -589,7 +589,7 @@ class TestController < ApplicationController
   end
 
   def missing_partial
-    render :partial => 'thisFileIsntHere'
+    render :partial => "thisFileIsntHere"
   end
 
   def partial_with_hash_object
@@ -656,7 +656,7 @@ class TestController < ApplicationController
         when "action_talk_to_layout", "layout_overriding_layout"
           "layouts/talk_from_action"
         when "render_implicit_html_template_from_xhr_request"
-          (request.xhr? ? 'layouts/xhr' : 'layouts/standard')
+          (request.xhr? ? "layouts/xhr" : "layouts/standard")
       end
     end
 end
@@ -771,7 +771,7 @@ class RenderTest < ActionController::TestCase
   # :ported:
   def test_do_with_render_action_and_layout_false
     get :hello_world_with_layout_false
-    assert_equal 'Hello world!', @response.body
+    assert_equal "Hello world!", @response.body
   end
 
   # :ported:
@@ -826,27 +826,27 @@ class RenderTest < ActionController::TestCase
     get :render_custom_code
     assert_response 404
     assert_response :missing
-    assert_equal 'hello world', @response.body
+    assert_equal "hello world", @response.body
   end
 
   # :ported:
   def test_render_text_with_nil
     get :render_text_with_nil
     assert_response 200
-    assert_equal '', @response.body
+    assert_equal "", @response.body
   end
 
   # :ported:
   def test_render_text_with_false
     get :render_text_with_false
-    assert_equal 'false', @response.body
+    assert_equal "false", @response.body
   end
 
   # :ported:
   def test_render_nothing_with_appendix
     get :render_nothing_with_appendix
     assert_response 200
-    assert_equal 'appended', @response.body
+    assert_equal "appended", @response.body
   end
 
   def test_render_text_with_resource
@@ -941,7 +941,7 @@ class RenderTest < ActionController::TestCase
 
   def test_render_to_string_inline
     get :render_to_string_with_inline_and_render
-    assert_equal 'Hello world!', @response.body
+    assert_equal "Hello world!", @response.body
   end
 
   # :ported:
@@ -974,24 +974,24 @@ class RenderTest < ActionController::TestCase
 
   def test_should_render_formatted_template
     get :formatted_html_erb
-    assert_equal 'formatted html erb', @response.body
+    assert_equal "formatted html erb", @response.body
   end
 
   def test_should_render_formatted_html_erb_template
     get :formatted_xml_erb
-    assert_equal '<test>passed formatted html erb</test>', @response.body
+    assert_equal "<test>passed formatted html erb</test>", @response.body
   end
 
   def test_should_render_formatted_html_erb_template_with_bad_accepts_header
     @request.env["HTTP_ACCEPT"] = "; a=dsf"
     get :formatted_xml_erb
-    assert_equal '<test>passed formatted html erb</test>', @response.body
+    assert_equal "<test>passed formatted html erb</test>", @response.body
   end
 
   def test_should_render_formatted_html_erb_template_with_faulty_accepts_header
     @request.accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, */*"
     get :formatted_xml_erb
-    assert_equal '<test>passed formatted html erb</test>', @response.body
+    assert_equal "<test>passed formatted html erb</test>", @response.body
   end
 
   def test_layout_test_with_different_layout
@@ -1021,7 +1021,7 @@ class RenderTest < ActionController::TestCase
 
   def test_rendering_nothing_on_layout
     get :rendering_nothing_on_layout
-    assert_equal '', @response.body
+    assert_equal "", @response.body
   end
 
   def test_render_to_string_doesnt_break_assigns
@@ -1103,7 +1103,7 @@ class RenderTest < ActionController::TestCase
 
   def test_render_text_with_assigns_option
     get :render_with_assigns_option
-    assert_equal 'world', response.body
+    assert_equal "world", response.body
   end
 
   # :ported:
diff --git a/actionview/test/actionpack/controller/view_paths_test.rb b/actionview/test/actionpack/controller/view_paths_test.rb
index e99659c802..cdfaab5979 100644
--- a/actionview/test/actionpack/controller/view_paths_test.rb
+++ b/actionview/test/actionpack/controller/view_paths_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "abstract_unit"
 
 class ViewLoadPathsTest < ActionController::TestCase
   class TestController < ActionController::Base
@@ -7,7 +7,7 @@ class ViewLoadPathsTest < ActionController::TestCase
     before_action :add_view_path, only: :hello_world_at_request_time
 
     def hello_world() end
-    def hello_world_at_request_time() render(:action => 'hello_world') end
+    def hello_world_at_request_time() render(:action => "hello_world") end
 
     private
       def add_view_path
@@ -17,8 +17,8 @@ class ViewLoadPathsTest < ActionController::TestCase
 
   module Test
     class SubController < ActionController::Base
-      layout 'test/sub'
-      def hello_world; render(:template => 'test/hello_world'); end
+      layout "test/sub"
+      def hello_world; render(:template => "test/hello_world"); end
     end
   end
 
@@ -47,7 +47,7 @@ class ViewLoadPathsTest < ActionController::TestCase
   end
 
   def test_controller_appends_view_path_correctly
-    @controller.append_view_path 'foo'
+    @controller.append_view_path "foo"
     assert_paths(FIXTURE_LOAD_PATH, "foo")
 
     @controller.append_view_path(%w(bar baz))
@@ -58,7 +58,7 @@ class ViewLoadPathsTest < ActionController::TestCase
   end
 
   def test_controller_prepends_view_path_correctly
-    @controller.prepend_view_path 'baz'
+    @controller.prepend_view_path "baz"
     assert_paths("baz", FIXTURE_LOAD_PATH)
 
     @controller.prepend_view_path(%w(foo bar))
@@ -72,7 +72,7 @@ class ViewLoadPathsTest < ActionController::TestCase
     @controller.instance_variable_set :@template, ActionView::Base.new(TestController.view_paths, {}, @controller)
     class_view_paths = TestController.view_paths
 
-    @controller.append_view_path 'foo'
+    @controller.append_view_path "foo"
     assert_paths FIXTURE_LOAD_PATH, "foo"
 
     @controller.append_view_path(%w(bar baz))
@@ -84,7 +84,7 @@ class ViewLoadPathsTest < ActionController::TestCase
     @controller.instance_variable_set :@template, ActionView::Base.new(TestController.view_paths, {}, @controller)
     class_view_paths = TestController.view_paths
 
-    @controller.prepend_view_path 'baz'
+    @controller.prepend_view_path "baz"
     assert_paths "baz", FIXTURE_LOAD_PATH
 
     @controller.prepend_view_path(%w(foo bar))
@@ -157,14 +157,14 @@ class ViewLoadPathsTest < ActionController::TestCase
       class C < ActionController::Base; end
     }
 
-    A.view_paths = ['a/path']
+    A.view_paths = ["a/path"]
 
     assert_paths A, "a/path"
     assert_paths A, *B.view_paths
     assert_paths C, *original_load_paths
 
     C.view_paths = []
-    assert_nothing_raised { C.append_view_path 'c/path' }
+    assert_nothing_raised { C.append_view_path "c/path" }
     assert_paths C, "c/path"
   end