aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2016-06-13 10:53:15 -0400
committerGitHub <noreply@github.com>2016-06-13 10:53:15 -0400
commit2806203f10301d484ecc830131da476afe80779c (patch)
tree793626bf9c6be01ec147990079e820ca13ef5351 /activerecord
parent7d883b829307944f6d7c273f3915ee7059ee3771 (diff)
parent4e545d0e4369d7d23625f30646359cb4e156f3e7 (diff)
downloadrails-2806203f10301d484ecc830131da476afe80779c.tar.gz
rails-2806203f10301d484ecc830131da476afe80779c.tar.bz2
rails-2806203f10301d484ecc830131da476afe80779c.zip
Merge pull request #25372 from kamipo/remove_assert_date_from_db
Remove unnecessary `assert_date_from_db`
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/multiparameter_attributes_test.rb2
-rw-r--r--activerecord/test/cases/test_case.rb4
2 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/test/cases/multiparameter_attributes_test.rb b/activerecord/test/cases/multiparameter_attributes_test.rb
index 3304996f6c..d05cb22740 100644
--- a/activerecord/test/cases/multiparameter_attributes_test.rb
+++ b/activerecord/test/cases/multiparameter_attributes_test.rb
@@ -11,7 +11,7 @@ class MultiParameterAttributeTest < ActiveRecord::TestCase
topic.attributes = attributes
# note that extra #to_date call allows test to pass for Oracle, which
# treats dates/times the same
- assert_date_from_db Date.new(2004, 6, 24), topic.last_read.to_date
+ assert_equal Date.new(2004, 6, 24), topic.last_read.to_date
end
def test_multiparameter_attributes_on_date_with_empty_year
diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
index 87299c0dab..c8adc21bbc 100644
--- a/activerecord/test/cases/test_case.rb
+++ b/activerecord/test/cases/test_case.rb
@@ -12,10 +12,6 @@ module ActiveRecord
SQLCounter.clear_log
end
- def assert_date_from_db(expected, actual, message = nil)
- assert_equal expected.to_s, actual.to_s, message
- end
-
def capture_sql
SQLCounter.clear_log
yield