Active Record integration deprecation tests
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4962 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
23d579b262
commit
c3a52523ce
|
@ -215,7 +215,7 @@ module ActionController #:nodoc:
|
|||
end
|
||||
|
||||
def find_record_in_template(key = nil)
|
||||
assert_template_has(key)
|
||||
assert_not_nil assigns(key)
|
||||
record = @response.template_objects[key]
|
||||
|
||||
assert_not_nil(record)
|
||||
|
|
|
@ -50,34 +50,43 @@ class ActiveRecordAssertionsControllerTest < ActiveRecordTestCase
|
|||
# test for 1 bad apple column
|
||||
def test_some_invalid_columns
|
||||
process :nasty_columns_1
|
||||
assert_success
|
||||
assert_invalid_record 'company'
|
||||
assert_invalid_column_on_record 'company', 'rating'
|
||||
assert_valid_column_on_record 'company', 'name'
|
||||
assert_valid_column_on_record 'company', %w(name id)
|
||||
assert_response :success
|
||||
|
||||
assert_deprecated_assertion { assert_invalid_record 'company' }
|
||||
assert_deprecated_assertion { assert_invalid_column_on_record 'company', 'rating' }
|
||||
assert_deprecated_assertion { assert_valid_column_on_record 'company', 'name' }
|
||||
assert_deprecated_assertion { assert_valid_column_on_record 'company', %w(name id) }
|
||||
end
|
||||
|
||||
# test for 2 bad apples columns
|
||||
def test_all_invalid_columns
|
||||
process :nasty_columns_2
|
||||
assert_success
|
||||
assert_invalid_record 'company'
|
||||
assert_invalid_column_on_record 'company', 'rating'
|
||||
assert_invalid_column_on_record 'company', 'name'
|
||||
assert_invalid_column_on_record 'company', %w(name rating)
|
||||
assert_response :success
|
||||
|
||||
assert_deprecated_assertion { assert_invalid_record 'company' }
|
||||
assert_deprecated_assertion { assert_invalid_column_on_record 'company', 'rating' }
|
||||
assert_deprecated_assertion { assert_invalid_column_on_record 'company', 'name' }
|
||||
assert_deprecated_assertion { assert_invalid_column_on_record 'company', %w(name rating) }
|
||||
end
|
||||
|
||||
# ensure we have no problems with an ActiveRecord
|
||||
def test_valid_record
|
||||
process :good_company
|
||||
assert_success
|
||||
assert_valid_record 'company'
|
||||
assert_response :success
|
||||
|
||||
assert_deprecated_assertion { assert_valid_record 'company' }
|
||||
end
|
||||
|
||||
# ensure we have problems with an ActiveRecord
|
||||
def test_invalid_record
|
||||
process :bad_company
|
||||
assert_success
|
||||
assert_invalid_record 'company'
|
||||
assert_response :success
|
||||
|
||||
assert_deprecated_assertion { assert_invalid_record 'company' }
|
||||
end
|
||||
|
||||
protected
|
||||
def assert_deprecated_assertion(message = nil, &block)
|
||||
assert_deprecated(/assert_.*from test_/, &block)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue