diff options
| author | Luke Kanies <luke@madstop.com> | 2009-04-11 22:33:51 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2009-04-11 22:33:51 -0500 |
| commit | 39bd8af772d3b99fc83314d229a7d51bf3970a5f (patch) | |
| tree | 45b39220e9ed0fc8a3dac75e1e5b56ac747b159a | |
| parent | d8eaca88038fa0ef15fda0c4a11a7f08daebc8ef (diff) | |
| parent | 916dd60dc8392c1ee612028008a52926676e894b (diff) | |
| download | puppet-39bd8af772d3b99fc83314d229a7d51bf3970a5f.tar.gz puppet-39bd8af772d3b99fc83314d229a7d51bf3970a5f.tar.xz puppet-39bd8af772d3b99fc83314d229a7d51bf3970a5f.zip | |
Merge branch '0.24.x'
| -rw-r--r-- | spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb b/spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb index 27cd6b3df..e6b1bf9c7 100644 --- a/spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb +++ b/spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb @@ -19,7 +19,7 @@ module Spec warn "Skipping unsuitable example group %s: %s" % [example_group.description, example_group.messages.join(", ")] next end - success = success & example_group.run + success = success & example_group.run(@options) end return success ensure diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 41b5e7443..e3afd6f3e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -17,6 +17,7 @@ end require 'puppettest' require 'puppettest/runnable_test' require 'mocha' +gem 'rspec', '=1.2.2' require 'spec' # load any monkey-patches |