Changeset 4962
- Timestamp:
- 09/04/06 03:07:17 (2 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/lib/action_controller/assertions/deprecated_assertions.rb
r4938 r4962 216 216 217 217 def find_record_in_template(key = nil) 218 assert_ template_has(key)218 assert_not_nil assigns(key) 219 219 record = @response.template_objects[key] 220 220 … … 223 223 224 224 return record 225 end 225 end 226 226 end 227 227 end trunk/actionpack/test/activerecord/active_record_assertions_test.rb
r4807 r4962 51 51 def test_some_invalid_columns 52 52 process :nasty_columns_1 53 assert_success 54 assert_invalid_record 'company' 55 assert_invalid_column_on_record 'company', 'rating' 56 assert_valid_column_on_record 'company', 'name' 57 assert_valid_column_on_record 'company', %w(name id) 53 assert_response :success 54 55 assert_deprecated_assertion { assert_invalid_record 'company' } 56 assert_deprecated_assertion { assert_invalid_column_on_record 'company', 'rating' } 57 assert_deprecated_assertion { assert_valid_column_on_record 'company', 'name' } 58 assert_deprecated_assertion { assert_valid_column_on_record 'company', %w(name id) } 58 59 end 59 60 … … 61 62 def test_all_invalid_columns 62 63 process :nasty_columns_2 63 assert_success 64 assert_invalid_record 'company' 65 assert_invalid_column_on_record 'company', 'rating' 66 assert_invalid_column_on_record 'company', 'name' 67 assert_invalid_column_on_record 'company', %w(name rating) 64 assert_response :success 65 66 assert_deprecated_assertion { assert_invalid_record 'company' } 67 assert_deprecated_assertion { assert_invalid_column_on_record 'company', 'rating' } 68 assert_deprecated_assertion { assert_invalid_column_on_record 'company', 'name' } 69 assert_deprecated_assertion { assert_invalid_column_on_record 'company', %w(name rating) } 68 70 end 69 71 … … 71 73 def test_valid_record 72 74 process :good_company 73 assert_success 74 assert_valid_record 'company' 75 assert_response :success 76 77 assert_deprecated_assertion { assert_valid_record 'company' } 75 78 end 76 79 … … 78 81 def test_invalid_record 79 82 process :bad_company 80 assert_success 81 assert_invalid_record 'company' 83 assert_response :success 84 85 assert_deprecated_assertion { assert_invalid_record 'company' } 82 86 end 87 88 protected 89 def assert_deprecated_assertion(message = nil, &block) 90 assert_deprecated(/assert_.*from test_/, &block) 91 end 83 92 end
