diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-04-12 21:56:00 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-04-12 21:56:00 -0500 |
| commit | ed24595647374885cebc1d43badc174c0991e93a (patch) | |
| tree | 020a8c856c264ed34deb872e54cf447e2fd872a3 /activerecord/test/cases/relation_test.rb | |
| parent | d7b521db1297c1b95a441b3928fc31ab3abd5ed5 (diff) | |
| parent | f0e198bfa1e3f9689e0cde1d194a44027fc90b3c (diff) | |
| download | rails-ed24595647374885cebc1d43badc174c0991e93a.tar.gz rails-ed24595647374885cebc1d43badc174c0991e93a.tar.bz2 rails-ed24595647374885cebc1d43badc174c0991e93a.zip | |
Merge branch 'master' into sprockets
Diffstat (limited to 'activerecord/test/cases/relation_test.rb')
| -rw-r--r-- | activerecord/test/cases/relation_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb index 7bdbd773b6..6874bd18f8 100644 --- a/activerecord/test/cases/relation_test.rb +++ b/activerecord/test/cases/relation_test.rb @@ -20,7 +20,7 @@ module ActiveRecord end def test_single_values - assert_equal [:limit, :offset, :lock, :readonly, :create_with, :from].map(&:to_s).sort, + assert_equal [:limit, :offset, :lock, :readonly, :create_with, :from, :reorder].map(&:to_s).sort, Relation::SINGLE_VALUE_METHODS.map(&:to_s).sort end |