spec_helper: use proper mocha import to avoid warning

diff --git a/Gemfile b/Gemfile
index 2d19594db3dc7072f87bcf261ef7f8994fd69d36..82a5204276897c64798fadb3aa363802e0c637c9 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -14,6 +14,7 @@ group :development, :unit_tests do
   gem 'rake', '~> 10.1.0',       :require => false
   gem 'rspec', '~> 3.1.0',       :require => false
   gem 'rspec-puppet',            :require => false
+  gem 'mocha',                   :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'puppet-lint',             :require => false
   gem 'pry',                     :require => false

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 13014ab863695641664b756ad4d5339aa02cbc94..d3c98478d0d9a1c07a7b0f3900c3e11018fd3cb5 100755 (executable)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,9 +17,7 @@ require 'puppet_spec/fixtures'
 require 'puppet_spec/matchers'
 require 'puppet_spec/database'
 require 'monkey_patches/alias_should_to_must'
-require 'mocha/setup'
-
-
+require 'mocha/api'
 
 RSpec.configure do |config|
   config.before :each do