Merge pull request #4821 from inspec/zenspider/mocha2

Found and fixed more mocha/setup deprecations.
2025-02-16 22:18:38 +00:00 · 2020-01-02 16:07:35 -08:00 · 2020-01-02 16:07:35 -08:00 · f09595c33d
commit f09595c33d
parent 8b5789004a c57a0e1f13
4 changed files with 4 additions and 4 deletions
--- a/lib/plugins/inspec-compliance/test/unit/api/login_test.rb
+++ b/lib/plugins/inspec-compliance/test/unit/api/login_test.rb
@ -1,5 +1,5 @@
 require "minitest/autorun"
-require "mocha/setup"
+require "mocha/minitest"
 require "webmock/minitest"
 require_relative "../../../lib/inspec-compliance/api.rb"

--- a/lib/plugins/inspec-compliance/test/unit/api_test.rb
+++ b/lib/plugins/inspec-compliance/test/unit/api_test.rb
@ -1,6 +1,6 @@
 require "minitest/autorun"
 require "webmock/minitest"
-require "mocha/setup"
+require "mocha/minitest"
 require_relative "../../lib/inspec-compliance/api.rb"

 describe InspecPlugins::Compliance::API do
--- a/lib/plugins/inspec-compliance/test/unit/target_test.rb
+++ b/lib/plugins/inspec-compliance/test/unit/target_test.rb
@ -1,5 +1,5 @@
 require "minitest/autorun"
-require "mocha/setup"
+require "mocha/minitest"
 require_relative "../../lib/inspec-compliance/api.rb"

 describe InspecPlugins::Compliance::Fetcher do
--- a/test/unit/plugin/v1/plugin_test.rb
+++ b/test/unit/plugin/v1/plugin_test.rb
@ -1,6 +1,6 @@
 # TODO: do not use helper, since all plugins are loaded statically
 require "minitest/autorun"
-require "mocha/setup"
+require "mocha/minitest"

 require "inspec/plugin/v1/plugin_types/cli"
 require "thor"