diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2019-03-04 02:47:05 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-04 02:47:05 +0900 |
commit | 5ccf53056a44eda7379a2e74f88079582419c8e7 (patch) | |
tree | 520ab5bad11c4ba874ac6bf8518a10aaed56a7e7 /activerecord/test/cases | |
parent | ef25fbfc713d3dea833952599c921a389df0afa7 (diff) | |
parent | 82b0ff03b1d97c29472a65ef15103932d15ff75e (diff) | |
download | rails-5ccf53056a44eda7379a2e74f88079582419c8e7.tar.gz rails-5ccf53056a44eda7379a2e74f88079582419c8e7.tar.bz2 rails-5ccf53056a44eda7379a2e74f88079582419c8e7.zip |
Merge pull request #35460 from abhaynikam/33611-follow-up-on-add-reselect
Fixed reselect throwing NoMethodError on ActiveRecord.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/relation/delegation_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/relation/select_test.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation/delegation_test.rb b/activerecord/test/cases/relation/delegation_test.rb index 4de3b1300c..31e7a4b8f4 100644 --- a/activerecord/test/cases/relation/delegation_test.rb +++ b/activerecord/test/cases/relation/delegation_test.rb @@ -56,7 +56,7 @@ module ActiveRecord :where, :rewhere, :preload, :eager_load, :includes, :from, :lock, :readonly, :extending, :having, :create_with, :distinct, :references, :none, :unscope, :merge, :count, :average, :minimum, :maximum, :sum, :calculate, - :pluck, :pick, :ids, + :pluck, :pick, :ids, :reselect, ] def test_delegate_querying_methods diff --git a/activerecord/test/cases/relation/select_test.rb b/activerecord/test/cases/relation/select_test.rb index 32e8f473ff..586aaadd0a 100644 --- a/activerecord/test/cases/relation/select_test.rb +++ b/activerecord/test/cases/relation/select_test.rb @@ -16,5 +16,12 @@ module ActiveRecord expected = Post.select(:title).to_sql assert_equal expected, Post.select(:title, :body).reselect(:title).to_sql end + + def test_reselect_with_default_scope_select + expected = Post.select(:title).to_sql + actual = PostWithDefaultSelect.reselect(:title).to_sql + + assert_equal expected, actual + end end end |