summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schmitt <david.schmitt@puppetlabs.com>2015-05-05 13:30:54 +0100
committerDavid Schmitt <david.schmitt@puppetlabs.com>2015-05-05 13:30:54 +0100
commit24680aceec28df9e6dbe8c07a1136bfb78cad2fa (patch)
tree60a034e2d7f47432869f66d64e59bc5ed4aab506
parent29f09e2181a56ec801b39e56bd28119709495dd9 (diff)
spec_helper: use proper mocha import to avoid warning
-rw-r--r--Gemfile1
-rwxr-xr-xspec/spec_helper.rb4
2 files changed, 2 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 2d19594..82a5204 100644
--- 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 13014ab..d3c9847 100755
--- 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