Merge pull request #1398 from leereilly/my_new_branch

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

1 files changed, 4 insertions, 4 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