diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-11-17 22:47:23 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-11-17 22:47:23 +0000 |
| commit | 5446d5cb05b50a9a3f317ded774be438e0eff909 (patch) | |
| tree | 6b0b87efe3e95783763208215a3159fb63217a6d /activerecord/test/cases/associations/eager_load_nested_include_test.rb | |
| parent | 9754debb9a72f9385950e5282f3642b995ab76d8 (diff) | |
| parent | f8877d4b2a2a6f68770b376f0b1391a6295f62f2 (diff) | |
| download | rails-5446d5cb05b50a9a3f317ded774be438e0eff909.tar.gz rails-5446d5cb05b50a9a3f317ded774be438e0eff909.tar.bz2 rails-5446d5cb05b50a9a3f317ded774be438e0eff909.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
activesupport/lib/active_support/core_ext/hash/conversions.rb
Diffstat (limited to 'activerecord/test/cases/associations/eager_load_nested_include_test.rb')
| -rw-r--r-- | activerecord/test/cases/associations/eager_load_nested_include_test.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/test/cases/associations/eager_load_nested_include_test.rb b/activerecord/test/cases/associations/eager_load_nested_include_test.rb index f313a75233..e8db6d5dab 100644 --- a/activerecord/test/cases/associations/eager_load_nested_include_test.rb +++ b/activerecord/test/cases/associations/eager_load_nested_include_test.rb @@ -72,10 +72,8 @@ class EagerLoadPolyAssocsTest < ActiveRecord::TestCase ShapeExpression, NonPolyOne, NonPolyTwo].each do |c| c.delete_all end - end - def generate_test_object_graphs 1.upto(NUM_SIMPLE_OBJS) do [Circle, Square, Triangle, NonPolyOne, NonPolyTwo].map(&:create!) |