diff options
| author | Yves Senn <yves.senn@gmail.com> | 2012-09-03 20:38:14 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2012-09-03 20:38:14 +0200 |
| commit | 9f494a9a3489cf03b0d6d3c87cb8638c3b867c86 (patch) | |
| tree | 8ae1fa856de7ed814d02cfd25d5e28cded80daa6 /activerecord/test/cases | |
| parent | 77ca2815f5c5fc20a9ca7fa4cdd16d0c4b908682 (diff) | |
| download | rails-9f494a9a3489cf03b0d6d3c87cb8638c3b867c86.tar.gz rails-9f494a9a3489cf03b0d6d3c87cb8638c3b867c86.tar.bz2 rails-9f494a9a3489cf03b0d6d3c87cb8638c3b867c86.zip | |
test cleanup, remove ruby_type because it's no longer needed
All tests with a custom inheritance_column use the `Vegtable` model.
The field ruby_type on the Company models is no longer needed
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/attribute_methods_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/inheritance_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/schema_dumper_test.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb index ea58a624a1..d08b157011 100644 --- a/activerecord/test/cases/attribute_methods_test.rb +++ b/activerecord/test/cases/attribute_methods_test.rb @@ -395,7 +395,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase def test_query_attribute_with_custom_fields object = Company.find_by_sql(<<-SQL).first - SELECT c1.*, c2.ruby_type as string_value, c2.rating as int_value + SELECT c1.*, c2.type as string_value, c2.rating as int_value FROM companies c1, companies c2 WHERE c1.firm_id = c2.id AND c1.id = 2 diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index c6f7e8cf0f..9fcee99222 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1735,7 +1735,7 @@ class BasicsTest < ActiveRecord::TestCase end def test_attribute_names - assert_equal ["id", "type", "ruby_type", "firm_id", "firm_name", "name", "client_of", "rating", "account_id", "description"], + assert_equal ["id", "type", "firm_id", "firm_name", "name", "client_of", "rating", "account_id", "description"], Company.attribute_names end diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb index ca5b24b253..8fded9159f 100644 --- a/activerecord/test/cases/inheritance_test.rb +++ b/activerecord/test/cases/inheritance_test.rb @@ -288,7 +288,7 @@ class InheritanceComputeTypeTest < ActiveRecord::TestCase def test_instantiation_doesnt_try_to_require_corresponding_file ActiveRecord::Base.store_full_sti_class = false foo = Firm.first.clone - foo.ruby_type = foo.type = 'FirmOnTheFly' + foo.type = 'FirmOnTheFly' foo.save! # Should fail without FirmOnTheFly in the type condition. diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb index 01dd25a9df..92084d3eb6 100644 --- a/activerecord/test/cases/schema_dumper_test.rb +++ b/activerecord/test/cases/schema_dumper_test.rb @@ -182,7 +182,7 @@ class SchemaDumperTest < ActiveRecord::TestCase def test_schema_dumps_index_columns_in_right_order index_definition = standard_dump.split(/\n/).grep(/add_index.*companies/).first.strip - assert_equal 'add_index "companies", ["firm_id", "type", "rating", "ruby_type"], :name => "company_index"', index_definition + assert_equal 'add_index "companies", ["firm_id", "type", "rating"], :name => "company_index"', index_definition end def test_schema_dumps_partial_indices |