Fix force_skip patch

Author: rafaelfranca

activesupport/test/core_ext/object/json_gem_encoding_test.rb

@@ -40,7 +40,7 @@ def to_json(*)
 
   private
     def require_or_skip(file)
-      require(file) || force_skip("'#{file}' was already loaded")
+      force_skip("'#{file}' was already loaded")
     end
 
     def assert_same_with_or_without_active_support(subject)

tools/test_common.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+ActiveSupport::TestCase.alias_method :force_skip, :skip
+
 if ENV["BUILDKITE"]
   require "minitest-ci"
   ENV.delete("CI") # CI has affect on the applications, and we don't want it applied to the apps.
@@ -14,6 +16,5 @@ def skip(message = nil, *)
           "This should never happen on CI."
       end
   end
-  ActiveSupport::TestCase.alias_method :skip, :force_skip
   ActiveSupport::TestCase.include(DisableSkipping)
 end