4 files changed, 55 insertions, 5 deletions
diff --git a/activerecord/.codeclimate.yml b/activerecord/.codeclimate.yml
new file mode 100644
index 0000000000..877c67873d
--- /dev/null
+++ b/activerecord/.codeclimate.yml
@@ -0,0 +1,27 @@
+engines:
+  rubocop:
+    enabled: true
+
+ratings:
+  paths:
+  - "**.rb"
+
+exclude_paths:
+  - actioncable/lib/rails/generators/
+  - actioncable/test/
+  - actionmailer/lib/rails/generators/
+  - actionmailer/test/
+  - actionpack/test/
+  - actionview/test/
+  - activejob/lib/rails/generators/
+  - activejob/test/
+  - activemodel/test/
+  - activerecord/lib/rails/generators/
+  - activerecord/test/
+  - activesupport/test/
+  - railties/lib/rails/generators/
+  - railties/test/
+  - ci/
+  - guides/
+  - tasks/
+  - tools/
diff --git a/activerecord/.rubocop.yml b/activerecord/.rubocop.yml
new file mode 100644
index 0000000000..dd8db6af3a
--- /dev/null
+++ b/activerecord/.rubocop.yml
@@ -0,0 +1,27 @@
+AllCops:
+  TargetRubyVersion: 2.3
+  DisabledByDefault: true
+
+# Two spaces, no tabs (for indentation).
+Style/IndentationWidth:
+  enabled: true
+
+# No trailing whitespace.
+Style/TrailingWhitespace:
+  enabled: true
+
+# Blank lines should not have any spaces.
+Style/TrailingBlankLines:
+  enabled: true
+
+# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
+Style/HashSyntax:
+  enabled: true
+
+# Prefer &&/|| over and/or.
+Style/AndOr:
+  enabled: true
+
+# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+Lint/RequireParentheses:
+  enabled: true
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