aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew White <andrew.white@unboxed.co>2016-11-02 20:16:26 +0000
committerAndrew White <andrew.white@unboxed.co>2016-11-02 20:16:26 +0000
commitddeabad059086ce76771962e71a9cdf24324db3d (patch)
tree8e4782463352382374d2ce765e42ef51e0fb190b
parentdb3374c428ec71fbcede2f8153c553ccbe0f1832 (diff)
downloadrails-ddeabad059086ce76771962e71a9cdf24324db3d.tar.gz
rails-ddeabad059086ce76771962e71a9cdf24324db3d.tar.bz2
rails-ddeabad059086ce76771962e71a9cdf24324db3d.zip
Fix indenting
-rw-r--r--activerecord/test/cases/relations_test.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 39632075e8..6d887ce123 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -669,11 +669,11 @@ class RelationTest < ActiveRecord::TestCase
end
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))
- )
- assert_equal [developers(:poor_jamis)], devs.to_a
- end
+ devs = Developer.where(Developer.arel_table[:salary].eq(80000)).merge(
+ Developer.where(Developer.arel_table[:salary].eq(9000))
+ )
+ assert_equal [developers(:poor_jamis)], devs.to_a
+ end
def test_relation_merging_with_arel_equalities_with_a_non_attribute_left_hand_ignores_non_attributes_when_discarding_equalities
salary_attr = Developer.arel_table[:salary]
@@ -681,7 +681,7 @@ class RelationTest < ActiveRecord::TestCase
Developer.where(salary_attr.eq(9000)).where(Arel::Nodes::NamedFunction.new('abs', [salary_attr]).eq(9000))
)
assert_equal [developers(:poor_jamis)], devs.to_a
- end
+ end
def test_relation_merging_with_eager_load
relations = []