diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-11-13 17:56:44 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-11-13 17:56:44 +0100 |
| commit | c994e1086270cdfe4e145ea206049f05ef5414d6 (patch) | |
| tree | 090378da5631af02faba5813f84bee084f64b4df /activerecord/test/cases/relation | |
| parent | f081edb1fe153129a148f844174f98e2577a1f86 (diff) | |
| download | rails-c994e1086270cdfe4e145ea206049f05ef5414d6.tar.gz rails-c994e1086270cdfe4e145ea206049f05ef5414d6.tar.bz2 rails-c994e1086270cdfe4e145ea206049f05ef5414d6.zip | |
fix weird Emacs auto indentation. [ci skip]
Diffstat (limited to 'activerecord/test/cases/relation')
| -rw-r--r-- | activerecord/test/cases/relation/merging_test.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb index 49c8d07026..782c8bc1fd 100644 --- a/activerecord/test/cases/relation/merging_test.rb +++ b/activerecord/test/cases/relation/merging_test.rb @@ -25,20 +25,20 @@ class RelationMergingTest < ActiveRecord::TestCase def test_relation_merging_with_arel_equalities_keeps_last_equality devs = Developer.where(Developer.arel_table[:salary].eq(80000)).merge( - Developer.where(Developer.arel_table[:salary].eq(9000)) - ) + Developer.where(Developer.arel_table[:salary].eq(9000)) + ) assert_equal [developers(:poor_jamis)], devs.to_a end def test_relation_merging_with_arel_equalities_keeps_last_equality_with_non_attribute_left_hand salary_attr = Developer.arel_table[:salary] devs = Developer.where( - Arel::Nodes::NamedFunction.new('abs', [salary_attr]).eq(80000) - ).merge( - Developer.where( - Arel::Nodes::NamedFunction.new('abs', [salary_attr]).eq(9000) - ) - ) + Arel::Nodes::NamedFunction.new('abs', [salary_attr]).eq(80000) + ).merge( + Developer.where( + Arel::Nodes::NamedFunction.new('abs', [salary_attr]).eq(9000) + ) + ) assert_equal [developers(:poor_jamis)], devs.to_a end |