aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/relation/delegation_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-05 13:22:24 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-05 13:22:24 -0300
commit69a379242e653f1f1e6968c3f0905d841145ae61 (patch)
treedbf5652edefbfa60bb8cfc64f40ddf2aec3dc69e /activerecord/test/cases/relation/delegation_test.rb
parenta8d85c4d518e8ed73ac8a5685bfb2a2a842900fd (diff)
parent7e20bdc20dd91e1195086a5f54178a01b74ebb31 (diff)
downloadrails-69a379242e653f1f1e6968c3f0905d841145ae61.tar.gz
rails-69a379242e653f1f1e6968c3f0905d841145ae61.tar.bz2
rails-69a379242e653f1f1e6968c3f0905d841145ae61.zip
Merge pull request #14978 from bogdan/relation-join
[Regression 4.0 -> 4.1] Put back Relation#join method as a delegate to Array
Diffstat (limited to 'activerecord/test/cases/relation/delegation_test.rb')
-rw-r--r--activerecord/test/cases/relation/delegation_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation/delegation_test.rb b/activerecord/test/cases/relation/delegation_test.rb
index 9b2bfed039..29c9d0e2af 100644
--- a/activerecord/test/cases/relation/delegation_test.rb
+++ b/activerecord/test/cases/relation/delegation_test.rb
@@ -32,7 +32,7 @@ module ActiveRecord
:exclude?, :find_all, :flat_map, :group_by, :include?, :length,
:map, :none?, :one?, :partition, :reject, :reverse,
:sample, :second, :sort, :sort_by, :third,
- :to_ary, :to_set, :to_xml, :to_yaml
+ :to_ary, :to_set, :to_xml, :to_yaml, :join
]
ARRAY_DELEGATES.each do |method|