提交 f3807a8c 编写于 作者: R Rafael Mendonça França

Merge pull request #8043 from senny/remove_trailing_whitespace_in_actionpack

remove trailing whitespace within actionpack [ci skip]
...@@ -51,7 +51,7 @@ def view_context_class ...@@ -51,7 +51,7 @@ def view_context_class
@view_context_class ||= begin @view_context_class ||= begin
routes = respond_to?(:_routes) && _routes routes = respond_to?(:_routes) && _routes
helpers = respond_to?(:_helpers) && _helpers helpers = respond_to?(:_helpers) && _helpers
Class.new(ActionView::Base) do Class.new(ActionView::Base) do
if routes if routes
include routes.url_helpers include routes.url_helpers
......
...@@ -259,7 +259,7 @@ def respond_to(*mimes, &block) ...@@ -259,7 +259,7 @@ def respond_to(*mimes, &block)
# * for other requests - i.e. data formats such as xml, json, csv etc, if # * for other requests - i.e. data formats such as xml, json, csv etc, if
# the resource passed to +respond_with+ responds to <code>to_<format></code>, # the resource passed to +respond_with+ responds to <code>to_<format></code>,
# the method attempts to render the resource in the requested format # the method attempts to render the resource in the requested format
# directly, e.g. for an xml request, the response is equivalent to calling # directly, e.g. for an xml request, the response is equivalent to calling
# <code>render :xml => resource</code>. # <code>render :xml => resource</code>.
# #
# === Nested resources # === Nested resources
......
...@@ -15,7 +15,7 @@ def show ...@@ -15,7 +15,7 @@ def show
def zero def zero
render :inline => "Zero DB runtime" render :inline => "Zero DB runtime"
end end
def redirect def redirect
Project.all Project.all
redirect_to :action => 'show' redirect_to :action => 'show'
...@@ -63,18 +63,18 @@ def test_runtime_reset_before_requests ...@@ -63,18 +63,18 @@ def test_runtime_reset_before_requests
assert_equal 2, @logger.logged(:info).size assert_equal 2, @logger.logged(:info).size
assert_match(/\(Views: [\d.]+ms \| ActiveRecord: 0.0ms\)/, @logger.logged(:info)[1]) assert_match(/\(Views: [\d.]+ms \| ActiveRecord: 0.0ms\)/, @logger.logged(:info)[1])
end end
def test_log_with_active_record_when_redirecting def test_log_with_active_record_when_redirecting
get :redirect get :redirect
wait wait
assert_equal 3, @logger.logged(:info).size assert_equal 3, @logger.logged(:info).size
assert_match(/\(ActiveRecord: [\d.]+ms\)/, @logger.logged(:info)[2]) assert_match(/\(ActiveRecord: [\d.]+ms\)/, @logger.logged(:info)[2])
end end
def test_include_time_query_time_after_rendering def test_include_time_query_time_after_rendering
get :db_after_render get :db_after_render
wait wait
assert_equal 2, @logger.logged(:info).size assert_equal 2, @logger.logged(:info).size
assert_match(/\(Views: [\d.]+ms \| ActiveRecord: ([1-9][\d.]+)ms\)/, @logger.logged(:info)[1]) assert_match(/\(Views: [\d.]+ms \| ActiveRecord: ([1-9][\d.]+)ms\)/, @logger.logged(:info)[1])
end end
......
...@@ -16,7 +16,7 @@ def redirect ...@@ -16,7 +16,7 @@ def redirect
def default_url_options def default_url_options
{:locale => "de"} {:locale => "de"}
end end
end end
class ControllerWithBeforeFilterAndDefaultUrlOptionsTest < ActionController::TestCase class ControllerWithBeforeFilterAndDefaultUrlOptionsTest < ActionController::TestCase
......
...@@ -19,7 +19,7 @@ def display ...@@ -19,7 +19,7 @@ def display
def show def show
render :text => 'Only for loooooong credentials' render :text => 'Only for loooooong credentials'
end end
def search def search
render :text => 'All inline' render :text => 'All inline'
end end
...@@ -118,7 +118,7 @@ def test_encode_credentials_has_no_newline ...@@ -118,7 +118,7 @@ def test_encode_credentials_has_no_newline
assert assigns(:logged_in) assert assigns(:logged_in)
assert_equal 'Definitely Maybe', @response.body assert_equal 'Definitely Maybe', @response.body
end end
test "authenticate with class method" do test "authenticate with class method" do
@request.env['HTTP_AUTHORIZATION'] = encode_credentials('David', 'Goliath') @request.env['HTTP_AUTHORIZATION'] = encode_credentials('David', 'Goliath')
get :search get :search
......
...@@ -240,7 +240,7 @@ def test_js_or_html ...@@ -240,7 +240,7 @@ def test_js_or_html
assert_equal 'HTML', @response.body assert_equal 'HTML', @response.body
@request.accept = "text/javascript, text/html" @request.accept = "text/javascript, text/html"
assert_raises(ActionController::UnknownFormat) do assert_raises(ActionController::UnknownFormat) do
xhr :get, :just_xml xhr :get, :just_xml
end end
......
...@@ -25,14 +25,14 @@ def call(env) ...@@ -25,14 +25,14 @@ def call(env)
result result
end end
end end
class BlockMiddleware class BlockMiddleware
attr_accessor :configurable_message attr_accessor :configurable_message
def initialize(app, &block) def initialize(app, &block)
@app = app @app = app
yield(self) if block_given? yield(self) if block_given?
end end
def call(env) def call(env)
result = @app.call(env) result = @app.call(env)
result[1]["Configurable-Message"] = configurable_message result[1]["Configurable-Message"] = configurable_message
......
...@@ -28,7 +28,7 @@ def overriden ...@@ -28,7 +28,7 @@ def overriden
@test_unchanged = 'hello' @test_unchanged = 'hello'
end end
end end
class ChildController < BasicController; end class ChildController < BasicController; end
class TestPartial < Rack::TestCase class TestPartial < Rack::TestCase
......
...@@ -134,7 +134,7 @@ def test_send_file_headers_with_bad_symbol ...@@ -134,7 +134,7 @@ def test_send_file_headers_with_bad_symbol
@controller.headers = {} @controller.headers = {}
assert_raise(ArgumentError){ @controller.send(:send_file_headers!, options) } assert_raise(ArgumentError){ @controller.send(:send_file_headers!, options) }
end end
def test_send_file_headers_guess_type_from_extension def test_send_file_headers_guess_type_from_extension
{ {
'image.png' => 'image/png', 'image.png' => 'image/png',
......
...@@ -63,7 +63,7 @@ def test_third_level_dependency ...@@ -63,7 +63,7 @@ def test_third_level_dependency
change_template("comments/_comment") change_template("comments/_comment")
end end
end end
def test_directory_depth_dependency def test_directory_depth_dependency
assert_digest_difference("level/below/index") do assert_digest_difference("level/below/index") do
change_template("level/below/_header") change_template("level/below/_header")
......
...@@ -451,12 +451,12 @@ def test_render_layout_with_object ...@@ -451,12 +451,12 @@ def test_render_layout_with_object
assert_equal %(<title>David</title>), assert_equal %(<title>David</title>),
@view.render(:file => "test/layout_render_object") @view.render(:file => "test/layout_render_object")
end end
def test_render_with_passing_couple_extensions_to_one_register_template_handler_function_call def test_render_with_passing_couple_extensions_to_one_register_template_handler_function_call
ActionView::Template.register_template_handler :foo1, :foo2, CustomHandler ActionView::Template.register_template_handler :foo1, :foo2, CustomHandler
assert_equal @view.render(:inline => "Hello, World!", :type => :foo1), @view.render(:inline => "Hello, World!", :type => :foo2) assert_equal @view.render(:inline => "Hello, World!", :type => :foo1), @view.render(:inline => "Hello, World!", :type => :foo2)
end end
def test_render_throws_exception_when_no_extensions_passed_to_register_template_handler_function_call def test_render_throws_exception_when_no_extensions_passed_to_register_template_handler_function_call
assert_raises(ArgumentError) { ActionView::Template.register_template_handler CustomHandler } assert_raises(ArgumentError) { ActionView::Template.register_template_handler CustomHandler }
end end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册