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/rails/host_spec.rb | |
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/rails/host_spec.rb')
-rwxr-xr-x | spec/unit/rails/host_spec.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/unit/rails/host_spec.rb b/spec/unit/rails/host_spec.rb index 324a673a9..4244f117f 100755 --- a/spec/unit/rails/host_spec.rb +++ b/spec/unit/rails/host_spec.rb @@ -2,9 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' -describe "Puppet::Rails::Host" do - confine "Cannot test without ActiveRecord" => Puppet.features.rails? - +describe "Puppet::Rails::Host", :if => Puppet.features.rails? do def column(name, type) ActiveRecord::ConnectionAdapters::Column.new(name, nil, type, false) end |