2 files changed, 23 insertions, 23 deletions
diff --git a/actionpack/test/controller/new_base/render_partial_test.rb b/actionpack/test/controller/new_base/render_partial_test.rb
index 2f1aa22208..9e5022c9f4 100644
--- a/actionpack/test/controller/new_base/render_partial_test.rb
+++ b/actionpack/test/controller/new_base/render_partial_test.rb
@@ -5,14 +5,14 @@ module RenderPartial
   class BasicController < ActionController::Base
 
     self.view_paths = [ActionView::FixtureResolver.new(
-      "render_partial/basic/_basic.html.erb"     => "BasicPartial!",
-      "render_partial/basic/basic.html.erb"      => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'basic' %><%= @test_unchanged %>",
-      "render_partial/basic/with_json.html.erb"  => "<%= render :partial => 'with_json', :formats => [:json] %>",
-      "render_partial/basic/_with_json.json.erb" => "<%= render :partial => 'final', :formats => [:json] %>",
-      "render_partial/basic/_final.json.erb"     => "{ final: json }",
-      "render_partial/basic/overriden.html.erb"  => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'overriden' %><%= @test_unchanged %>",
-      "render_partial/basic/_overriden.html.erb" => "ParentPartial!",
-      "render_partial/child/_overriden.html.erb" => "OverridenPartial!"
+      "render_partial/basic/_basic.html.erb"      => "BasicPartial!",
+      "render_partial/basic/basic.html.erb"       => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'basic' %><%= @test_unchanged %>",
+      "render_partial/basic/with_json.html.erb"   => "<%= render :partial => 'with_json', :formats => [:json] %>",
+      "render_partial/basic/_with_json.json.erb"  => "<%= render :partial => 'final', :formats => [:json] %>",
+      "render_partial/basic/_final.json.erb"      => "{ final: json }",
+      "render_partial/basic/overridden.html.erb"  => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'overridden' %><%= @test_unchanged %>",
+      "render_partial/basic/_overridden.html.erb" => "ParentPartial!",
+      "render_partial/child/_overridden.html.erb" => "OverriddenPartial!"
     )]
 
     def html_with_json_inside_json
@@ -24,7 +24,7 @@ module RenderPartial
       render :action => "basic"
     end
 
-    def overriden
+    def overridden
       @test_unchanged = 'hello'
     end
   end
@@ -55,8 +55,8 @@ module RenderPartial
     end
 
     test "partial from child controller gets picked" do
-      get :overriden
-      assert_response("goodbyeOverridenPartial!goodbye")
+      get :overridden
+      assert_response("goodbyeOverriddenPartial!goodbye")
     end
   end
 
diff --git a/actionpack/test/controller/new_base/render_test.rb b/actionpack/test/controller/new_base/render_test.rb
index cc7f12ac6d..5635e16234 100644
--- a/actionpack/test/controller/new_base/render_test.rb
+++ b/actionpack/test/controller/new_base/render_test.rb
@@ -7,10 +7,10 @@ module Render
       "render/blank_render/access_request.html.erb"         => "The request: <%= request.method.to_s.upcase %>",
       "render/blank_render/access_action_name.html.erb"     => "Action Name: <%= action_name %>",
       "render/blank_render/access_controller_name.html.erb" => "Controller Name: <%= controller_name %>",
-      "render/blank_render/overriden_with_own_view_paths_appended.html.erb"              => "parent content",
-      "render/blank_render/overriden_with_own_view_paths_prepended.html.erb"              => "parent content",
-      "render/blank_render/overriden.html.erb"              => "parent content",
-      "render/child_render/overriden.html.erb"              => "child content"
+      "render/blank_render/overridden_with_own_view_paths_appended.html.erb"  => "parent content",
+      "render/blank_render/overridden_with_own_view_paths_prepended.html.erb" => "parent content",
+      "render/blank_render/overridden.html.erb"             => "parent content",
+      "render/child_render/overridden.html.erb"             => "child content"
     )]
 
     def index
@@ -25,13 +25,13 @@ module Render
       render :action => "access_action_name"
     end
 
-    def overriden_with_own_view_paths_appended
+    def overridden_with_own_view_paths_appended
     end
 
-    def overriden_with_own_view_paths_prepended
+    def overridden_with_own_view_paths_prepended
     end
 
-    def overriden
+    def overridden
     end
 
     private
@@ -49,8 +49,8 @@ module Render
   end
 
   class ChildRenderController < BlankRenderController
-    append_view_path ActionView::FixtureResolver.new("render/child_render/overriden_with_own_view_paths_appended.html.erb" => "child content")
-    prepend_view_path ActionView::FixtureResolver.new("render/child_render/overriden_with_own_view_paths_prepended.html.erb" => "child content")
+    append_view_path ActionView::FixtureResolver.new("render/child_render/overridden_with_own_view_paths_appended.html.erb" => "child content")
+    prepend_view_path ActionView::FixtureResolver.new("render/child_render/overridden_with_own_view_paths_prepended.html.erb" => "child content")
   end
 
   class RenderTest < Rack::TestCase
@@ -114,17 +114,17 @@ module Render
 
   class TestViewInheritance < Rack::TestCase
     test "Template from child controller gets picked over parent one" do
-      get "/render/child_render/overriden"
+      get "/render/child_render/overridden"
       assert_body "child content"
     end
 
     test "Template from child controller with custom view_paths prepended gets picked over parent one" do
-      get "/render/child_render/overriden_with_own_view_paths_prepended"
+      get "/render/child_render/overridden_with_own_view_paths_prepended"
       assert_body "child content"
     end
 
     test "Template from child controller with custom view_paths appended gets picked over parent one" do
-      get "/render/child_render/overriden_with_own_view_paths_appended"
+      get "/render/child_render/overridden_with_own_view_paths_appended"
       assert_body "child content"
     end