summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/rubygems/test_case.rb2
-rw-r--r--test/rubygems/test_bundled_ca.rb6
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
index c847023e18..b5c377f43a 100644
--- a/lib/rubygems/test_case.rb
+++ b/lib/rubygems/test_case.rb
@@ -98,7 +98,7 @@ end
# and uninstall gems, fetch remote gems through a stub fetcher and be assured
# your normal set of gems is not affected.
-class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase)
+class Gem::TestCase < Minitest::Test
extend Gem::Deprecate
diff --git a/test/rubygems/test_bundled_ca.rb b/test/rubygems/test_bundled_ca.rb
index ad66f3e616..e6761dd197 100644
--- a/test/rubygems/test_bundled_ca.rb
+++ b/test/rubygems/test_bundled_ca.rb
@@ -27,11 +27,7 @@ if ENV["CI"] || ENV["TEST_SSL"]
end
def assert_https(host)
- if self.respond_to? :_assertions # minitest <= 4
- self._assertions += 1
- else # minitest >= 5
- self.assertions += 1
- end
+ self.assertions += 1
http = Net::HTTP.new(host, 443)
http.use_ssl = true
http.verify_mode = OpenSSL::SSL::VERIFY_PEER