aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-10 11:50:29 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-10 11:50:29 -0300
commit4d209b5daf0eba4c8d008e9d009d0576e04f40d1 (patch)
treea3e52286cc94b2eaf57beeed97a626f1bdcc42d8 /activerecord/test
parent4bd2a50f882065ab4113df4c5711dd1a156a465b (diff)
parent8a072fc07e5e486243e8a89db5a0add64013b72a (diff)
downloadrails-4d209b5daf0eba4c8d008e9d009d0576e04f40d1.tar.gz
rails-4d209b5daf0eba4c8d008e9d009d0576e04f40d1.tar.bz2
rails-4d209b5daf0eba4c8d008e9d009d0576e04f40d1.zip
Merge pull request #15610 from sgrif/silence-warnings
Fix warnings in tests
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/adapters/postgresql/range_test.rb2
-rw-r--r--activerecord/test/cases/finder_test.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/range_test.rb b/activerecord/test/cases/adapters/postgresql/range_test.rb
index 4d9cfe55f5..0f6e39322c 100644
--- a/activerecord/test/cases/adapters/postgresql/range_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/range_test.rb
@@ -156,7 +156,7 @@ _SQL
assert_equal 0.5..0.7, @first_range.float_range
assert_equal 0.5...0.7, @second_range.float_range
assert_equal 0.5...Float::INFINITY, @third_range.float_range
- assert_equal (-Float::INFINITY...Float::INFINITY), @fourth_range.float_range
+ assert_equal(-Float::INFINITY...Float::INFINITY, @fourth_range.float_range)
assert_nil @empty_range.float_range
end
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 0f52f2c0fc..bd77c412f6 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -34,10 +34,10 @@ class FinderTest < ActiveRecord::TestCase
end
def test_find_with_proc_parameter_and_block
- e = assert_raises(RuntimeError) do
+ exception = assert_raises(RuntimeError) do
Topic.all.find(-> { raise "should happen" }) { |e| e.title == "non-existing-title" }
end
- assert_equal "should happen", e.message
+ assert_equal "should happen", exception.message
assert_nothing_raised(RuntimeError) do
Topic.all.find(-> { raise "should not happen" }) { |e| e.title == topics(:first).title }