1 files changed, 17 insertions, 14 deletions
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index 44c26e4f10..138b1d1bb9 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -1,5 +1,6 @@
-require 'active_model'
-require 'active_support/core_ext/string/access'
+# frozen_string_literal: true
+
+require "active_model"
 
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
@@ -7,18 +8,20 @@ ActiveSupport::Deprecation.debug = true
 # Disable available locale checks to avoid warnings running the test suite.
 I18n.enforce_available_locales = false
 
-require 'active_support/testing/autorun'
-require 'active_support/testing/method_call_assertions'
-
-# Skips the current run on Rubinius using Minitest::Assertions#skip
-def rubinius_skip(message = '')
-  skip message if RUBY_ENGINE == 'rbx'
-end
-# Skips the current run on JRuby using Minitest::Assertions#skip
-def jruby_skip(message = '')
-  skip message if defined?(JRUBY_VERSION)
-end
+require "active_support/testing/autorun"
+require "active_support/testing/method_call_assertions"
 
-class ActiveModel::TestCase
+class ActiveModel::TestCase < ActiveSupport::TestCase
   include ActiveSupport::Testing::MethodCallAssertions
+
+  private
+    # Skips the current run on Rubinius using Minitest::Assertions#skip
+    def rubinius_skip(message = "")
+      skip message if RUBY_ENGINE == "rbx"
+    end
+
+    # Skips the current run on JRuby using Minitest::Assertions#skip
+    def jruby_skip(message = "")
+      skip message if defined?(JRUBY_VERSION)
+    end
 end