diff options
| -rw-r--r-- | railties/lib/rails/generators/test_case.rb | 6 | ||||
| -rw-r--r-- | railties/test/generators/generated_attribute_test.rb | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb index 24b57aabf9..952400e049 100644 --- a/railties/lib/rails/generators/test_case.rb +++ b/railties/lib/rails/generators/test_case.rb @@ -192,11 +192,11 @@ module Rails # Asserts the given field name gets translated to an attribute type # properly. # - # assert_attribute_type 'date', :date_select + # assert_field_type :date, :date_select # - def assert_attribute_type(name, attribute_type) + def assert_field_type(name, attribute_type) assert_equal( - Rails::Generators::GeneratedAttribute.new('test', name).field_type, + Rails::Generators::GeneratedAttribute.new('test', name.to_s).field_type, attribute_type ) end diff --git a/railties/test/generators/generated_attribute_test.rb b/railties/test/generators/generated_attribute_test.rb index ccd0c65905..dacb06fb13 100644 --- a/railties/test/generators/generated_attribute_test.rb +++ b/railties/test/generators/generated_attribute_test.rb @@ -6,35 +6,35 @@ class GeneratedAttributeTest < Rails::Generators::TestCase def test_field_type_returns_text_field %w(integer float decimal string).each do |name| - assert_attribute_type name, :text_field + assert_field_type name, :text_field end end def test_field_type_returns_datetime_select %w(datetime timestamp).each do |name| - assert_attribute_type name, :datetime_select + assert_field_type name, :datetime_select end end def test_field_type_returns_time_select - assert_attribute_type 'time', :time_select + assert_field_type 'time', :time_select end def test_field_type_returns_date_select - assert_attribute_type 'date', :date_select + assert_field_type 'date', :date_select end def test_field_type_returns_text_area - assert_attribute_type 'text', :text_area + assert_field_type 'text', :text_area end def test_field_type_returns_check_box - assert_attribute_type 'boolean', :check_box + assert_field_type 'boolean', :check_box end def test_field_type_with_unknown_type_returns_text_field %w(foo bar baz).each do |name| - assert_attribute_type name, :text_field + assert_field_type name, :text_field end end end |