diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-01-05 17:22:30 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-01-06 15:19:42 -0800 |
| commit | b16e10dba6606b808ef195f4b57f2e8c66cf65ab (patch) | |
| tree | bdacf054c1e877166217336322050ee03f28d607 /spec/unit/rails/host_spec.rb | |
| parent | fb8509acbd947712cac094a49227d28a16a366aa (diff) | |
| parent | 19eb1e78e115d10bfb822e510213e4fab9cd2599 (diff) | |
| download | puppet-b16e10dba6606b808ef195f4b57f2e8c66cf65ab.tar.gz puppet-b16e10dba6606b808ef195f4b57f2e8c66cf65ab.tar.xz puppet-b16e10dba6606b808ef195f4b57f2e8c66cf65ab.zip | |
Merge branch '2.6.x' into next
Conflicts:
Rakefile
lib/puppet/resource/type_collection.rb
lib/puppet/simple_graph.rb
lib/puppet/transaction.rb
lib/puppet/transaction/report.rb
lib/puppet/util/metric.rb
spec/integration/indirector/report/rest_spec.rb
spec/spec_specs/runnable_spec.rb
spec/unit/configurer_spec.rb
spec/unit/indirector_spec.rb
spec/unit/transaction/change_spec.rb
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 9883a7db5..e83135c91 100755 --- a/spec/unit/rails/host_spec.rb +++ b/spec/unit/rails/host_spec.rb @@ -2,9 +2,7 @@ require File.expand_path(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 |