aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-02-12 03:20:24 -0800
committerJosé Valim <jose.valim@plataformatec.com.br>2012-02-12 03:20:24 -0800
commit815e4453310858f9cfbccf4b41f943c9448aea07 (patch)
treec02f6c1b1376241ec44124670814ce0cccc16f08
parent8671802fe8153e82e54b11c64537f5177f8670a3 (diff)
parent33e37b89fba7187275c8211926131a120515cb21 (diff)
downloadrails-815e4453310858f9cfbccf4b41f943c9448aea07.tar.gz
rails-815e4453310858f9cfbccf4b41f943c9448aea07.tar.bz2
rails-815e4453310858f9cfbccf4b41f943c9448aea07.zip
Merge pull request #5015 from castlerock/revert_PR_5001_fix_isolated_test_run
TO make build green Revert PR#5001 "removed unuseful require for reply as we are not using require model"
-rw-r--r--activerecord/test/cases/attribute_methods_test.rb1
-rw-r--r--activerecord/test/cases/fixtures_test.rb1
-rw-r--r--activerecord/test/cases/identity_map_test.rb2
-rw-r--r--activerecord/test/cases/named_scope_test.rb1
4 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index 901aaa5f72..3ac2a76b96 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -8,6 +8,7 @@ require 'models/computer'
require 'models/topic'
require 'models/company'
require 'models/category'
+require 'models/reply'
require 'models/contact'
require 'models/keyboard'
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index 20c1a17cef..562b370c97 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -16,6 +16,7 @@ require 'models/parrot'
require 'models/pirate'
require 'models/post'
require 'models/randomly_named_c1'
+require 'models/reply'
require 'models/ship'
require 'models/task'
require 'models/topic'
diff --git a/activerecord/test/cases/identity_map_test.rb b/activerecord/test/cases/identity_map_test.rb
index 3d2aee3809..3efc8bf559 100644
--- a/activerecord/test/cases/identity_map_test.rb
+++ b/activerecord/test/cases/identity_map_test.rb
@@ -1,8 +1,10 @@
require "cases/helper"
+
require 'models/developer'
require 'models/project'
require 'models/company'
require 'models/topic'
+require 'models/reply'
require 'models/computer'
require 'models/customer'
require 'models/order'
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index cd787e40c6..e17ba76437 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -2,6 +2,7 @@ require "cases/helper"
require 'models/post'
require 'models/topic'
require 'models/comment'
+require 'models/reply'
require 'models/author'
require 'models/developer'