diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2017-01-04 16:27:27 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-04 16:27:27 -0500 |
commit | 98a3d647f1329c556f977678a08143cac914253a (patch) | |
tree | 481b8686ca7a17e40c0ce019d9b2c4dd4ae0633b | |
parent | b1df82e41275e781fee4dd79264c95c3f21fad6d (diff) | |
parent | cc3b114b42c49a7756c661ebb646d08348ccc655 (diff) | |
download | rails-98a3d647f1329c556f977678a08143cac914253a.tar.gz rails-98a3d647f1329c556f977678a08143cac914253a.tar.bz2 rails-98a3d647f1329c556f977678a08143cac914253a.zip |
Merge pull request #27575 from yahonda/diag_like_26370
Require "models/post" before "models/comment"
-rw-r--r-- | activerecord/test/cases/calculations_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/fixtures_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb index ffd5c1395d..b29733a676 100644 --- a/activerecord/test/cases/calculations_test.rb +++ b/activerecord/test/cases/calculations_test.rb @@ -13,9 +13,9 @@ require "models/speedometer" require "models/ship_part" require "models/treasure" require "models/developer" +require "models/post" require "models/comment" require "models/rating" -require "models/post" class NumericData < ActiveRecord::Base self.table_name = "numeric_data" diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb index dd48053823..1381678eef 100644 --- a/activerecord/test/cases/fixtures_test.rb +++ b/activerecord/test/cases/fixtures_test.rb @@ -7,6 +7,7 @@ require "models/binary" require "models/book" require "models/bulb" require "models/category" +require "models/post" require "models/comment" require "models/company" require "models/computer" @@ -19,7 +20,6 @@ require "models/matey" require "models/other_dog" require "models/parrot" require "models/pirate" -require "models/post" require "models/randomly_named_c1" require "models/reply" require "models/ship" |