mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fix typos in AP: "overriden" => "overridden"
This commit is contained in:
parent
09c55dcc5d
commit
0c5552a3dd
5 changed files with 36 additions and 36 deletions
|
@ -106,7 +106,7 @@ module AbstractController
|
|||
# If a component extends the semantics of response_body
|
||||
# (as Action Controller extends it to be anything that
|
||||
# responds to the method each), this method needs to be
|
||||
# overriden in order to still return a string.
|
||||
# overridden in order to still return a string.
|
||||
# :api: plugin
|
||||
def render_to_string(*args, &block)
|
||||
options = _normalize_render(*args, &block)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ module ShowExceptions
|
|||
end
|
||||
end
|
||||
|
||||
class ShowExceptionsOverridenController < ShowExceptionsController
|
||||
class ShowExceptionsOverriddenController < ShowExceptionsController
|
||||
private
|
||||
|
||||
def show_detailed_exceptions?
|
||||
|
@ -55,15 +55,15 @@ module ShowExceptions
|
|||
end
|
||||
end
|
||||
|
||||
class ShowExceptionsOverridenTest < ActionDispatch::IntegrationTest
|
||||
class ShowExceptionsOverriddenTest < ActionDispatch::IntegrationTest
|
||||
test 'show error page' do
|
||||
@app = ShowExceptionsOverridenController.action(:boom)
|
||||
@app = ShowExceptionsOverriddenController.action(:boom)
|
||||
get '/', {'detailed' => '0'}
|
||||
assert_equal "500 error fixture\n", body
|
||||
end
|
||||
|
||||
test 'show diagnostics message' do
|
||||
@app = ShowExceptionsOverridenController.action(:boom)
|
||||
@app = ShowExceptionsOverriddenController.action(:boom)
|
||||
get '/', {'detailed' => '1'}
|
||||
assert_match(/boom/, body)
|
||||
end
|
||||
|
@ -71,7 +71,7 @@ module ShowExceptions
|
|||
|
||||
class ShowExceptionsFormatsTest < ActionDispatch::IntegrationTest
|
||||
def test_render_json_exception
|
||||
@app = ShowExceptionsOverridenController.action(:boom)
|
||||
@app = ShowExceptionsOverriddenController.action(:boom)
|
||||
get "/", {}, 'HTTP_ACCEPT' => 'application/json'
|
||||
assert_response :internal_server_error
|
||||
assert_equal 'application/json', response.content_type.to_s
|
||||
|
@ -79,7 +79,7 @@ module ShowExceptions
|
|||
end
|
||||
|
||||
def test_render_xml_exception
|
||||
@app = ShowExceptionsOverridenController.action(:boom)
|
||||
@app = ShowExceptionsOverriddenController.action(:boom)
|
||||
get "/", {}, 'HTTP_ACCEPT' => 'application/xml'
|
||||
assert_response :internal_server_error
|
||||
assert_equal 'application/xml', response.content_type.to_s
|
||||
|
@ -87,7 +87,7 @@ module ShowExceptions
|
|||
end
|
||||
|
||||
def test_render_fallback_exception
|
||||
@app = ShowExceptionsOverridenController.action(:boom)
|
||||
@app = ShowExceptionsOverriddenController.action(:boom)
|
||||
get "/", {}, 'HTTP_ACCEPT' => 'text/csv'
|
||||
assert_response :internal_server_error
|
||||
assert_equal 'text/html', response.content_type.to_s
|
||||
|
@ -96,7 +96,7 @@ module ShowExceptions
|
|||
|
||||
class ShowFailsafeExceptionsTest < ActionDispatch::IntegrationTest
|
||||
def test_render_failsafe_exception
|
||||
@app = ShowExceptionsOverridenController.action(:boom)
|
||||
@app = ShowExceptionsOverriddenController.action(:boom)
|
||||
@exceptions_app = @app.instance_variable_get(:@exceptions_app)
|
||||
@app.instance_variable_set(:@exceptions_app, nil)
|
||||
$stderr = StringIO.new
|
||||
|
|
|
@ -596,7 +596,7 @@ class UrlHelperControllerTest < ActionController::TestCase
|
|||
render inline: "<%= url_for controller: 'url_helper_controller_test/url_helper', action: 'show_url_for' %>"
|
||||
end
|
||||
|
||||
def show_overriden_url_for
|
||||
def show_overridden_url_for
|
||||
render inline: "<%= url_for params.merge(controller: 'url_helper_controller_test/url_helper', action: 'show_url_for') %>"
|
||||
end
|
||||
|
||||
|
@ -633,8 +633,8 @@ class UrlHelperControllerTest < ActionController::TestCase
|
|||
assert_equal '/url_helper_controller_test/url_helper/show_url_for', @response.body
|
||||
end
|
||||
|
||||
def test_overriden_url_for_shows_only_path
|
||||
get :show_overriden_url_for
|
||||
def test_overridden_url_for_shows_only_path
|
||||
get :show_overridden_url_for
|
||||
assert_equal '/url_helper_controller_test/url_helper/show_url_for', @response.body
|
||||
end
|
||||
|
||||
|
@ -684,7 +684,7 @@ class UrlHelperControllerTest < ActionController::TestCase
|
|||
assert_equal 'ok', @response.body
|
||||
end
|
||||
|
||||
def test_url_helper_can_be_overriden
|
||||
def test_url_helper_can_be_overridden
|
||||
get :override_url_helper
|
||||
assert_equal '/url_helper_controller_test/url_helper/override_url_helper/override', @response.body
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue