diff options
| author | Luke Kanies <luke@madstop.com> | 2009-08-10 04:31:26 +0000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-08-10 17:39:40 +1000 |
| commit | a88fc4d24c50d91aa764fa8f52797e86bb6d8965 (patch) | |
| tree | e4d77ea5dcdd29cf039788d5e37ac41e183bc644 /spec/integration/resource | |
| parent | 9a356ab289a64245cf59cd763dc953a93d71682b (diff) | |
| download | puppet-a88fc4d24c50d91aa764fa8f52797e86bb6d8965.tar.gz puppet-a88fc4d24c50d91aa764fa8f52797e86bb6d8965.tar.xz puppet-a88fc4d24c50d91aa764fa8f52797e86bb6d8965.zip | |
Fixing more tests broken from missing libraries
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'spec/integration/resource')
| -rwxr-xr-x | spec/integration/resource/catalog.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/integration/resource/catalog.rb b/spec/integration/resource/catalog.rb index 11bdb56f6..9c7c37d8e 100755 --- a/spec/integration/resource/catalog.rb +++ b/spec/integration/resource/catalog.rb @@ -6,8 +6,11 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe Puppet::Resource::Catalog do - it "should support json" do - Puppet::Resource::Catalog.supported_formats.should be_include(:json) + describe "when json is available" do + confine "JSON library is missing" => Puppet.features.json? + it "should support json" do + Puppet::Resource::Catalog.supported_formats.should be_include(:json) + end end describe "when using the indirector" do |
