diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-01-31 18:03:45 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-01-31 18:03:45 -0800 |
commit | c79220368e8180141e9d796cf026d2b7da9f6384 (patch) | |
tree | f2a3ce155d5a467d7089cef54bb4ab5298542487 /activerecord/test/models | |
parent | aebba01f437d864baf7165f19737440002016413 (diff) | |
parent | 4ae59ebee8d404def8f9f7c716d1869fb7bb6f01 (diff) | |
download | rails-c79220368e8180141e9d796cf026d2b7da9f6384.tar.gz rails-c79220368e8180141e9d796cf026d2b7da9f6384.tar.bz2 rails-c79220368e8180141e9d796cf026d2b7da9f6384.zip |
Merge pull request #18512 from vipulnsward/18492-fixtures-with-sti
Fix STI for fixtures from multi-files
Diffstat (limited to 'activerecord/test/models')
-rw-r--r-- | activerecord/test/models/admin/randomly_named_c1.rb | 8 | ||||
-rw-r--r-- | activerecord/test/models/randomly_named_c1.rb | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/activerecord/test/models/admin/randomly_named_c1.rb b/activerecord/test/models/admin/randomly_named_c1.rb index 2f81d5b831..b64ae7fc41 100644 --- a/activerecord/test/models/admin/randomly_named_c1.rb +++ b/activerecord/test/models/admin/randomly_named_c1.rb @@ -1,3 +1,7 @@ -class Admin::ClassNameThatDoesNotFollowCONVENTIONS < ActiveRecord::Base
- self.table_name = :randomly_named_table
+class Admin::ClassNameThatDoesNotFollowCONVENTIONS1 < ActiveRecord::Base
+ self.table_name = :randomly_named_table2
+end
+
+class Admin::ClassNameThatDoesNotFollowCONVENTIONS2 < ActiveRecord::Base
+ self.table_name = :randomly_named_table3
end
diff --git a/activerecord/test/models/randomly_named_c1.rb b/activerecord/test/models/randomly_named_c1.rb index 18a86c4989..d4be1e13b4 100644 --- a/activerecord/test/models/randomly_named_c1.rb +++ b/activerecord/test/models/randomly_named_c1.rb @@ -1,3 +1,3 @@ class ClassNameThatDoesNotFollowCONVENTIONS < ActiveRecord::Base
- self.table_name = :randomly_named_table
+ self.table_name = :randomly_named_table1
end
|