diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-01-03 22:19:41 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-01-04 16:01:41 -0800 |
| commit | 52760a4fb2764d011609c82adb68cc61d0772dc4 (patch) | |
| tree | 489df98ee50d6ac6cf01fb905e78bd4864cde2c0 /spec/unit/network/http/mongrel | |
| parent | ac114371fc161a48fc48bf68944846a1defbc6c4 (diff) | |
| download | puppet-52760a4fb2764d011609c82adb68cc61d0772dc4.tar.gz puppet-52760a4fb2764d011609c82adb68cc61d0772dc4.tar.xz puppet-52760a4fb2764d011609c82adb68cc61d0772dc4.zip | |
(#5771) Upgrade rspec to version 2
The biggest change is that we no longer need to monkey patch rspec to
get confine behavior. Describe blocks can now be conditional like
confine used to be. "describe" blocks with "shared => true" are now
"shared_examples_for".
Paired-With: Nick Lewis
Diffstat (limited to 'spec/unit/network/http/mongrel')
| -rwxr-xr-x | spec/unit/network/http/mongrel/rest_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/unit/network/http/mongrel/rest_spec.rb b/spec/unit/network/http/mongrel/rest_spec.rb index 92a81a10b..fb24521d5 100755 --- a/spec/unit/network/http/mongrel/rest_spec.rb +++ b/spec/unit/network/http/mongrel/rest_spec.rb @@ -4,8 +4,7 @@ require File.dirname(__FILE__) + '/../../../../spec_helper' require 'puppet/network/http' -describe "Puppet::Network::HTTP::MongrelREST" do - confine "Mongrel is not available" => Puppet.features.mongrel? +describe "Puppet::Network::HTTP::MongrelREST", :if => Puppet.features.mongrel? do before do require 'puppet/network/http/mongrel/rest' end |