summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Stone <aaron@serendipity.cx>2013-07-13 14:58:17 -0700
committerAaron Stone <aaron@serendipity.cx>2013-07-13 14:58:17 -0700
commit1e6102fe4acd182a61b79f53bc6128243650e2a2 (patch)
treef69d530d6d685e454a6c907528c1a825fe07d05d
parentc9d573022dae6fdc6002b5914938c903a3a3dcb8 (diff)
And now specs do run
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock14
-rw-r--r--spec/spec_helper.rb2
3 files changed, 10 insertions, 10 deletions
diff --git a/Gemfile b/Gemfile
index 87f6387..9b6706d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
gem 'rake', '~> 0.8.7'
-gem 'rspec', '~> 1.2.9'
-gem 'mocha', '~> 0.14.0', :require => false
+gem 'rspec', '~> 1.3'
+gem 'mocha', '~> 0.12.9', :require => false
gem 'puppet', '~> 2.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index 210a2dd..ce22804 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,20 +1,20 @@
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
- facter (1.6.13)
+ facter (1.7.2)
metaclass (0.0.1)
- mocha (0.12.7)
+ mocha (0.12.10)
metaclass (~> 0.0.1)
- puppet (2.7.19)
+ puppet (2.7.22)
facter (~> 1.5)
rake (0.8.7)
- rspec (1.2.9)
+ rspec (1.3.2)
PLATFORMS
ruby
DEPENDENCIES
- mocha (~> 0.12.7)
+ mocha (~> 0.12.9)
puppet (~> 2.7)
rake (~> 0.8.7)
- rspec (~> 1.2.9)
+ rspec (~> 1.3)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 396c6a4..3bac650 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,7 +3,7 @@ dir = Pathname.new(__FILE__).parent
$LOAD_PATH.unshift(dir, dir + 'lib', dir + '../lib')
require 'test/unit'
-require 'mocha/setup'
+require 'mocha'
require 'puppet'
gem 'rspec', '>= 1.2.9'
require 'spec/autorun'