diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-01-31 13:21:22 -0800 |
|---|---|---|
| committer | Daniel Pittman <daniel@rimspace.net> | 2011-01-31 13:21:22 -0800 |
| commit | fa06a388cd3fd91b62d4e65bbe4ff74bcfe46ad0 (patch) | |
| tree | 04369523bed9f9ce292ada8503e4183f0da84d31 /spec/spec_helper.rb | |
| parent | e717fed872f68c52fc0193bab2095a12f03433ac (diff) | |
| parent | d9b8f2ad68626b8655d98a8d9037283f671f86bb (diff) | |
| download | facter-fa06a388cd3fd91b62d4e65bbe4ff74bcfe46ad0.tar.gz facter-fa06a388cd3fd91b62d4e65bbe4ff74bcfe46ad0.tar.xz facter-fa06a388cd3fd91b62d4e65bbe4ff74bcfe46ad0.zip | |
Merge commit 'd9b8f2a'
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c8bd547..d9db445 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -7,12 +7,12 @@ $LOAD_PATH.unshift("#{dir}/../lib") require 'rubygems' require 'mocha' -require 'spec' +require 'rspec' require 'facter' # load any monkey-patches Dir["#{dir}/monkey_patches/*.rb"].map { |file| require file } -Spec::Runner.configure do |config| +RSpec.configure do |config| config.mock_with :mocha end |