5737: Merge branch 'master' into 5737-ruby231

[arvados.git] / services / api / test / test_helper.rb

diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb
index d998c92cadf85cd5dc80364e15a88611b7f5346c..86bc2397c5309e98310f659d4077d7d0f8a33184 100644 (file)
--- a/services/api/test/test_helper.rb
+++ b/services/api/test/test_helper.rb
@@ -21,10 +21,7 @@ unless ENV["NO_COVERAGE_TEST"]
 end
 
 require File.expand_path('../../config/environment', __FILE__)
-gem 'minitest'
 require 'rails/test_help'
-require 'minitest-rails'
-require 'minitest/autorun'
 require 'mocha'
 
 module ArvadosTestSupport
@@ -87,7 +84,7 @@ class ActiveSupport::TestCase
   def restore_configuration
     # Restore configuration settings changed during tests
     $application_config.each do |k,v|
-      if k.match /^[^.]*$/
+      if k.match(/^[^.]*$/)
         Rails.configuration.send (k + '='), v
       end
     end