diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-17 15:00:08 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-17 15:00:08 -0700 |
| commit | 822dac1e6dd7baa8ba70ed52a3d8a26f6d31ee7c (patch) | |
| tree | d71b189e3b7a98bacbee164af68cb5bb4e91135c /activerecord/test/cases | |
| parent | c0cdd2e95902f8cb38bbae274709ed4541da84c2 (diff) | |
| parent | 2eecc0d8dccf7f12518e05a72192eb853e5ee474 (diff) | |
| download | rails-822dac1e6dd7baa8ba70ed52a3d8a26f6d31ee7c.tar.gz rails-822dac1e6dd7baa8ba70ed52a3d8a26f6d31ee7c.tar.bz2 rails-822dac1e6dd7baa8ba70ed52a3d8a26f6d31ee7c.zip | |
Merge branch 'master' into stmt
* master:
include bind values from the default scope
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/relation_test.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb index 482c1b3d48..03c7009568 100644 --- a/activerecord/test/cases/relation_test.rb +++ b/activerecord/test/cases/relation_test.rb @@ -12,10 +12,7 @@ module ActiveRecord end def test_construction - relation = nil - assert_nothing_raised do - relation = Relation.new FakeKlass, :b - end + relation = Relation.new FakeKlass, :b assert_equal FakeKlass, relation.klass assert_equal :b, relation.table assert !relation.loaded, 'relation is not loaded' |