提交 36360e9b 编写于 作者: J José Valim

Merge pull request #7917 from dfens/master

Cosmetic changes: remove trailing whitespaces from tests
......@@ -3,7 +3,7 @@
class ParametersPermitTest < ActiveSupport::TestCase
setup do
@params = ActionController::Parameters.new({ person: {
@params = ActionController::Parameters.new({ person: {
age: "32", name: { first: "David", last: "Heinemeier Hansson" }
}})
end
......
......@@ -55,7 +55,7 @@ class SecurePasswordTest < ActiveModel::TestCase
end
test "User should not be created with blank digest" do
assert_raise RuntimeError do
assert_raise RuntimeError do
@user.run_callbacks :create
end
@user.password = "supersecretpassword"
......
......@@ -97,7 +97,7 @@ def test_raise_create_schema_with_existing_schema
def test_drop_schema
begin
@connection.create_schema "test_schema3"
@connection.create_schema "test_schema3"
ensure
@connection.drop_schema "test_schema3"
end
......
......@@ -59,7 +59,7 @@ def test_copy_table_with_id_col_that_is_not_primary_key
def test_copy_table_with_unconventional_primary_key
test_copy_table('owners', 'owners_unconventional') do |from, to, options|
original_pk = @connection.primary_key('owners')
original_pk = @connection.primary_key('owners')
copied_pk = @connection.primary_key('owners_unconventional')
assert_equal original_pk, copied_pk
end
......
......@@ -293,7 +293,7 @@ def test_column_exists_with_definition
connection.create_table :testings do |t|
t.column :foo, :string, limit: 100
t.column :bar, :decimal, precision: 8, scale: 2
t.column :taggable_id, :integer, null: false
t.column :taggable_id, :integer, null: false
t.column :taggable_type, :string, default: 'Photo'
end
......
......@@ -48,7 +48,7 @@ def test_exceptional_middleware_assigns_original_connection_id_on_error
}
assert_raises(RuntimeError) { mw.call({}) }
assert_equal connection_id, ActiveRecord::Base.connection_id
assert_equal connection_id, ActiveRecord::Base.connection_id
end
def test_middleware_delegates
......
......@@ -13,7 +13,7 @@ def reset_i18n_load_path
I18n.load_path.clear
I18n.backend = I18n::Backend::Simple.new
yield
ensure
ensure
I18n.load_path.replace @old_load_path
I18n.backend = @old_backend
end
......
......@@ -120,7 +120,7 @@ def dispatch
end
class Child < ParentController
skip_callback :dispatch, :before, :log, :if => proc {|c| c.action_name == :update}
skip_callback :dispatch, :before, :log, :if => proc {|c| c.action_name == :update}
skip_callback :dispatch, :after, :log2
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册