1 files changed, 51 insertions, 52 deletions

diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index 577a3d5800..42a5157010 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -1,6 +1,6 @@
-require 'abstract_unit'
-require 'active_support/logger'
-require 'controller/fake_models'
+require "abstract_unit"
+require "active_support/logger"
+require "controller/fake_models"
 
 # Provide some controller to run the tests on.
 module Submodule
@@ -19,11 +19,11 @@ end
 
 class DefaultUrlOptionsController < ActionController::Base
   def from_view
-    render :inline => "<%= #{params[:route]} %>"
+    render inline: "<%= #{params[:route]} %>"
   end
 
   def default_url_options
-    { :host => 'www.override.com', :action => 'new', :locale => 'en' }
+    { host: "www.override.com", action: "new", locale: "en" }
   end
 end
 
@@ -33,17 +33,17 @@ class OptionalDefaultUrlOptionsController < ActionController::Base
   end
 
   def default_url_options
-    { format: 'atom', id: 'default-id' }
+    { format: "atom", id: "default-id" }
   end
 end
 
 class UrlOptionsController < ActionController::Base
   def from_view
-    render :inline => "<%= #{params[:route]} %>"
+    render inline: "<%= #{params[:route]} %>"
   end
 
   def url_options
-    super.merge(:host => 'www.override.com')
+    super.merge(host: "www.override.com")
   end
 end
 
@@ -58,17 +58,16 @@ class ActionMissingController < ActionController::Base
 end
 
 class ControllerClassTests < ActiveSupport::TestCase
-
   def test_controller_path
-    assert_equal 'empty', EmptyController.controller_path
+    assert_equal "empty", EmptyController.controller_path
     assert_equal EmptyController.controller_path, EmptyController.new.controller_path
-    assert_equal 'submodule/contained_empty', Submodule::ContainedEmptyController.controller_path
+    assert_equal "submodule/contained_empty", Submodule::ContainedEmptyController.controller_path
     assert_equal Submodule::ContainedEmptyController.controller_path, Submodule::ContainedEmptyController.new.controller_path
   end
 
   def test_controller_name
-    assert_equal 'empty', EmptyController.controller_name
-    assert_equal 'contained_empty', Submodule::ContainedEmptyController.controller_name
+    assert_equal "empty", EmptyController.controller_name
+    assert_equal "contained_empty", Submodule::ContainedEmptyController.controller_name
   end
 
   def test_no_deprecation_when_action_view_record_identifier_is_included
@@ -80,13 +79,13 @@ class ControllerClassTests < ActiveSupport::TestCase
       dom_id = RecordIdentifierIncludedController.new.dom_id(record)
     end
 
-    assert_equal 'comment_1', dom_id
+    assert_equal "comment_1", dom_id
 
     dom_class = nil
     assert_not_deprecated do
       dom_class = RecordIdentifierIncludedController.new.dom_class(record)
     end
-    assert_equal 'comment', dom_class
+    assert_equal "comment", dom_class
   end
 end
 
@@ -112,7 +111,7 @@ class ControllerInstanceTests < ActiveSupport::TestCase
   end
 
   def test_temporary_anonymous_controllers
-    name = 'ExamplesController'
+    name = "ExamplesController"
     klass = Class.new(ActionController::Base)
     Object.const_set(name, klass)
 
@@ -152,40 +151,40 @@ class UrlOptionsTest < ActionController::TestCase
 
   def setup
     super
-    @request.host = 'www.example.com'
+    @request.host = "www.example.com"
   end
 
   def test_url_for_query_params_included
     rs = ActionDispatch::Routing::RouteSet.new
     rs.draw do
-      get 'home' => 'pages#home'
+      get "home" => "pages#home"
     end
 
     options = {
-      :action     => "home",
-      :controller => "pages",
-      :only_path  => true,
-      :params     => { "token" => "secret" }
+      action: "home",
+      controller: "pages",
+      only_path: true,
+      params: { "token" => "secret" }
     }
 
-    assert_equal '/home?token=secret', rs.url_for(options)
+    assert_equal "/home?token=secret", rs.url_for(options)
   end
 
   def test_url_options_override
     with_routing do |set|
       set.draw do
-        get 'from_view', :to => 'url_options#from_view', :as => :from_view
+        get "from_view", to: "url_options#from_view", as: :from_view
 
         ActiveSupport::Deprecation.silence do
-          get ':controller/:action'
+          get ":controller/:action"
         end
       end
 
       get :from_view, params: { route: "from_view_url" }
 
-      assert_equal 'http://www.override.com/from_view', @response.body
-      assert_equal 'http://www.override.com/from_view', @controller.send(:from_view_url)
-      assert_equal 'http://www.override.com/default_url_options/index', @controller.url_for(:controller => 'default_url_options')
+      assert_equal "http://www.override.com/from_view", @response.body
+      assert_equal "http://www.override.com/from_view", @controller.send(:from_view_url)
+      assert_equal "http://www.override.com/default_url_options/index", @controller.url_for(controller: "default_url_options")
     end
   end
 
@@ -195,7 +194,7 @@ class UrlOptionsTest < ActionController::TestCase
         get "account/overview"
       end
 
-      assert !@controller.class.action_methods.include?("account_overview_path")
+      assert_not_includes @controller.class.action_methods, "account_overview_path"
     end
   end
 end
@@ -205,24 +204,24 @@ class DefaultUrlOptionsTest < ActionController::TestCase
 
   def setup
     super
-    @request.host = 'www.example.com'
+    @request.host = "www.example.com"
   end
 
   def test_default_url_options_override
     with_routing do |set|
       set.draw do
-        get 'from_view', :to => 'default_url_options#from_view', :as => :from_view
+        get "from_view", to: "default_url_options#from_view", as: :from_view
 
         ActiveSupport::Deprecation.silence do
-          get ':controller/:action'
+          get ":controller/:action"
         end
       end
 
       get :from_view, params: { route: "from_view_url" }
 
-      assert_equal 'http://www.override.com/from_view?locale=en', @response.body
-      assert_equal 'http://www.override.com/from_view?locale=en', @controller.send(:from_view_url)
-      assert_equal 'http://www.override.com/default_url_options/new?locale=en', @controller.url_for(:controller => 'default_url_options')
+      assert_equal "http://www.override.com/from_view?locale=en", @response.body
+      assert_equal "http://www.override.com/from_view?locale=en", @controller.send(:from_view_url)
+      assert_equal "http://www.override.com/default_url_options/new?locale=en", @controller.url_for(controller: "default_url_options")
     end
   end
 
@@ -234,23 +233,23 @@ class DefaultUrlOptionsTest < ActionController::TestCase
         end
 
         ActiveSupport::Deprecation.silence do
-          get ':controller/:action'
+          get ":controller/:action"
         end
       end
 
       get :from_view, params: { route: "description_path(1)" }
 
-      assert_equal '/en/descriptions/1', @response.body
-      assert_equal '/en/descriptions', @controller.send(:descriptions_path)
-      assert_equal '/pl/descriptions', @controller.send(:descriptions_path, "pl")
-      assert_equal '/pl/descriptions', @controller.send(:descriptions_path, :locale => "pl")
-      assert_equal '/pl/descriptions.xml', @controller.send(:descriptions_path, "pl", "xml")
-      assert_equal '/en/descriptions.xml', @controller.send(:descriptions_path, :format => "xml")
-      assert_equal '/en/descriptions/1', @controller.send(:description_path, 1)
-      assert_equal '/pl/descriptions/1', @controller.send(:description_path, "pl", 1)
-      assert_equal '/pl/descriptions/1', @controller.send(:description_path, 1, :locale => "pl")
-      assert_equal '/pl/descriptions/1.xml', @controller.send(:description_path, "pl", 1, "xml")
-      assert_equal '/en/descriptions/1.xml', @controller.send(:description_path, 1, :format => "xml")
+      assert_equal "/en/descriptions/1", @response.body
+      assert_equal "/en/descriptions", @controller.send(:descriptions_path)
+      assert_equal "/pl/descriptions", @controller.send(:descriptions_path, "pl")
+      assert_equal "/pl/descriptions", @controller.send(:descriptions_path, locale: "pl")
+      assert_equal "/pl/descriptions.xml", @controller.send(:descriptions_path, "pl", "xml")
+      assert_equal "/en/descriptions.xml", @controller.send(:descriptions_path, format: "xml")
+      assert_equal "/en/descriptions/1", @controller.send(:description_path, 1)
+      assert_equal "/pl/descriptions/1", @controller.send(:description_path, "pl", 1)
+      assert_equal "/pl/descriptions/1", @controller.send(:description_path, 1, locale: "pl")
+      assert_equal "/pl/descriptions/1.xml", @controller.send(:description_path, "pl", 1, "xml")
+      assert_equal "/en/descriptions/1.xml", @controller.send(:description_path, 1, format: "xml")
     end
   end
 end
@@ -259,10 +258,10 @@ class OptionalDefaultUrlOptionsControllerTest < ActionController::TestCase
   def test_default_url_options_override_missing_positional_arguments
     with_routing do |set|
       set.draw do
-        get "/things/:id(.:format)" => 'things#show', :as => :thing
+        get "/things/:id(.:format)" => "things#show", :as => :thing
       end
-      assert_equal '/things/1.atom', thing_path('1')
-      assert_equal '/things/default-id.atom', thing_path
+      assert_equal "/things/1.atom", thing_path("1")
+      assert_equal "/things/default-id.atom", thing_path
     end
   end
 end
@@ -272,7 +271,7 @@ class EmptyUrlOptionsTest < ActionController::TestCase
 
   def setup
     super
-    @request.host = 'www.example.com'
+    @request.host = "www.example.com"
   end
 
   def test_ensure_url_for_works_as_expected_when_called_with_no_options_if_default_url_options_is_not_set
@@ -289,7 +288,7 @@ class EmptyUrlOptionsTest < ActionController::TestCase
         resources :things
       end
 
-      assert_equal '/things', @controller.send(:things_path)
+      assert_equal "/things", @controller.send(:things_path)
     end
   end
 end