diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2015-11-17 09:47:30 +0000 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2015-11-17 09:47:30 +0000 |
| commit | 5e36c5057adf838368ab9268a1436bb9d5e41b88 (patch) | |
| tree | 8202437ddaa85e390c537500c2298dad64341217 /activerecord/test | |
| parent | 788d7bce3dc60fde5588df70b5131716b99680a1 (diff) | |
| parent | a98475c2df8ab7d7d353cb29bb3f201c4c7eb9d1 (diff) | |
| download | rails-5e36c5057adf838368ab9268a1436bb9d5e41b88.tar.gz rails-5e36c5057adf838368ab9268a1436bb9d5e41b88.tar.bz2 rails-5e36c5057adf838368ab9268a1436bb9d5e41b88.zip | |
Merge pull request #22257 from yui-knk/fix_merge_to_not_call_to_proc_for_hash
Make `AR::SpawnMethods#merge!` to check an arg is a Proc
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/relation_test.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb index 8794bc8043..b58052a962 100644 --- a/activerecord/test/cases/relation_test.rb +++ b/activerecord/test/cases/relation_test.rb @@ -24,6 +24,10 @@ module ActiveRecord def self.sanitize_sql_for_order(sql) sql end + + def self.arel_table + Post.arel_table + end end def test_construction |