summaryrefslogtreecommitdiffstats
path: root/spec/unit
diff options
context:
space:
mode:
Diffstat (limited to 'spec/unit')
-rwxr-xr-x[-rw-r--r--]spec/unit/application/puppet.rb2
-rwxr-xr-xspec/unit/indirector/queue.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/spec/unit/application/puppet.rb b/spec/unit/application/puppet.rb
index ca1203405..00fe1ddea 100644..100755
--- a/spec/unit/application/puppet.rb
+++ b/spec/unit/application/puppet.rb
@@ -331,6 +331,8 @@ describe "Puppet" do
end
describe "the 'apply' command" do
+ confine "JSON library is missing; cannot test applying catalogs" => Puppet.features.json?
+
before do
#Puppet::Resource::Catalog.stubs(:json_create).returns Puppet::Resource::Catalog.new
JSON.stubs(:parse).returns Puppet::Resource::Catalog.new
diff --git a/spec/unit/indirector/queue.rb b/spec/unit/indirector/queue.rb
index 3bc066873..c81cefec9 100755
--- a/spec/unit/indirector/queue.rb
+++ b/spec/unit/indirector/queue.rb
@@ -27,6 +27,8 @@ class FooExampleData
end
describe Puppet::Indirector::Queue do
+ confine "JSON library is missing; cannot test queueing" => Puppet.features.json?
+
before :each do
@model = mock 'model'
@indirection = stub 'indirection', :name => :my_queue, :register_terminus_type => nil, :model => @model