Merge pull request #1398 from leereilly/my_new_branch

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

1 files changed, 2 insertions, 2 deletions

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