From 3b8a77dfd97774c21156efb1553f3a5a0372c7fa Mon Sep 17 00:00:00 2001 From: Brice Figureau Date: Sat, 20 Dec 2008 15:30:22 +0100 Subject: Fix #1834 part2 - Fix tests when no rails Signed-off-by: Brice Figureau --- spec/unit/parser/collector.rb | 4 ++-- spec/unit/parser/compiler.rb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'spec/unit/parser') diff --git a/spec/unit/parser/collector.rb b/spec/unit/parser/collector.rb index ede583b96..edd74e25f 100755 --- a/spec/unit/parser/collector.rb +++ b/spec/unit/parser/collector.rb @@ -194,7 +194,7 @@ describe Puppet::Parser::Collector, "when collecting virtual resources" do end describe Puppet::Parser::Collector, "when collecting exported resources" do - confine Puppet.features.rails? => "Cannot test Rails integration without ActiveRecord" + confine "Cannot test Rails integration without ActiveRecord" => Puppet.features.rails? before do @scope = stub 'scope', :host => "myhost", :debug => nil @@ -364,7 +364,7 @@ describe Puppet::Parser::Collector, "when collecting exported resources" do end describe Puppet::Parser::Collector, "when building its ActiveRecord query for collecting exported resources" do - confine Puppet.features.rails? => "Cannot test Rails integration without ActiveRecord" + confine "Cannot test Rails integration without ActiveRecord" => Puppet.features.rails? before do @scope = stub 'scope', :host => "myhost", :debug => nil diff --git a/spec/unit/parser/compiler.rb b/spec/unit/parser/compiler.rb index 203105289..f36b6fd4f 100755 --- a/spec/unit/parser/compiler.rb +++ b/spec/unit/parser/compiler.rb @@ -478,6 +478,7 @@ describe Puppet::Parser::Compiler do end describe Puppet::Parser::Compiler, "when storing compiled resources" do + confine "Cannot test Rails integration without ActiveRecord" => Puppet.features.rails? it "should store the resources" do Puppet.features.expects(:rails?).returns(true) -- cgit