diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-01-04 16:04:34 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-01-04 16:04:34 -0800 |
| commit | a05df9fec9040a908f28e4c324845ec80daa54eb (patch) | |
| tree | 489df98ee50d6ac6cf01fb905e78bd4864cde2c0 /spec/unit/rails/host_spec.rb | |
| parent | ac114371fc161a48fc48bf68944846a1defbc6c4 (diff) | |
| parent | 52760a4fb2764d011609c82adb68cc61d0772dc4 (diff) | |
| download | puppet-a05df9fec9040a908f28e4c324845ec80daa54eb.tar.gz puppet-a05df9fec9040a908f28e4c324845ec80daa54eb.tar.xz puppet-a05df9fec9040a908f28e4c324845ec80daa54eb.zip | |
Merge branch 'ticket/2.6.next/upgrade_rspec' into 2.6.next
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 |