diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-29 14:54:08 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-29 14:54:08 -0700 |
| commit | 7475b43cdbbbf7456e798210cb97ef20f2225166 (patch) | |
| tree | 04ae517943ccc476ca0a8b9b3bdbb21949a558c1 /activerecord/test/cases/base_test.rb | |
| parent | 6a23bf0f4c33151e0cec0648e271dc6f5ab3f686 (diff) | |
| parent | 4445478df311a74797d8dc4945c40662f9c1442a (diff) | |
| download | rails-7475b43cdbbbf7456e798210cb97ef20f2225166.tar.gz rails-7475b43cdbbbf7456e798210cb97ef20f2225166.tar.bz2 rails-7475b43cdbbbf7456e798210cb97ef20f2225166.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activerecord/test/cases/base_test.rb')
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 4c0b0c868a..fb535e74fc 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1540,20 +1540,6 @@ class BasicsTest < ActiveRecord::TestCase assert_equal "", Company.new.description end - ["find_by", "find_by!"].each do |meth| - test "#{meth} delegates to scoped" do - record = stub - - scope = mock - scope.expects(meth).with(:foo, :bar).returns(record) - - klass = Class.new(ActiveRecord::Base) - klass.stubs(:all => scope) - - assert_equal record, klass.public_send(meth, :foo, :bar) - end - end - test "scoped can take a values hash" do klass = Class.new(ActiveRecord::Base) assert_equal ['foo'], klass.all.merge!(select: 'foo').select_values |