Merge pull request #1398 from leereilly/my_new_branch

Corrected some typos and American vs. Queen's English issues

2 files changed, 6 insertions, 6 deletions

diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index 606b01893e..a2d639cd56 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -60,11 +60,11 @@ module ActionDispatch
         assert_response(:redirect, message)
         return true if options == @response.location
 
-        redirected_to_after_normalisation = normalize_argument_to_redirection(@response.location)
-        options_after_normalisation       = normalize_argument_to_redirection(options)
+        redirected_to_after_normalization = normalize_argument_to_redirection(@response.location)
+        options_after_normalization       = normalize_argument_to_redirection(options)
 
-        if redirected_to_after_normalisation != options_after_normalisation
-          flunk "Expected response to be a redirect to <#{options_after_normalisation}> but was a redirect to <#{redirected_to_after_normalisation}>"
+        if redirected_to_after_normalization != options_after_normalization
+          flunk "Expected response to be a redirect to <#{options_after_normalization}> but was a redirect to <#{redirected_to_after_normalization}>"
         end
       end
 
diff --git a/actionpack/test/controller/new_base/base_test.rb b/actionpack/test/controller/new_base/base_test.rb
index 8fa5d20372..ed244513a5 100644
--- a/actionpack/test/controller/new_base/base_test.rb
+++ b/actionpack/test/controller/new_base/base_test.rb
@@ -40,7 +40,7 @@ module Dispatching
     class ContainedEmptyController < ActionController::Base ; end
     class ContainedSubEmptyController < ContainedEmptyController ; end
     class ContainedNonDefaultPathController < ActionController::Base
-      def self.controller_path; "i_am_extremly_not_default"; end
+      def self.controller_path; "i_am_extremely_not_default"; end
     end
   end
 
@@ -89,7 +89,7 @@ module Dispatching
     end
 
     test "namespaced non-default controller path" do
-      assert_equal 'i_am_extremly_not_default', Submodule::ContainedNonDefaultPathController.controller_path
+      assert_equal 'i_am_extremely_not_default', Submodule::ContainedNonDefaultPathController.controller_path
       assert_equal Submodule::ContainedNonDefaultPathController.controller_path, Submodule::ContainedNonDefaultPathController.new.controller_path
     end