diff options
| -rwxr-xr-x | spec/unit/parser/collector.rb | 4 | ||||
| -rwxr-xr-x | spec/unit/parser/compiler.rb | 1 | ||||
| -rwxr-xr-x | spec/unit/rails.rb | 4 |
3 files changed, 5 insertions, 4 deletions
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) diff --git a/spec/unit/rails.rb b/spec/unit/rails.rb index 533236772..f0ba2b942 100755 --- a/spec/unit/rails.rb +++ b/spec/unit/rails.rb @@ -66,7 +66,7 @@ describe Puppet::Rails, "when initializing any connection" do end describe Puppet::Rails, "when initializing a sqlite3 connection" do - confine Puppet.features.rails? => "Cannot test without ActiveRecord" + confine "Cannot test without ActiveRecord" => Puppet.features.rails? it "should provide the adapter, log_level, and dbfile arguments" do Puppet.settings.expects(:value).with(:dbadapter).returns("sqlite3") @@ -82,7 +82,7 @@ describe Puppet::Rails, "when initializing a sqlite3 connection" do end describe Puppet::Rails, "when initializing a mysql or postgresql connection" do - confine Puppet.features.rails? => "Cannot test without ActiveRecord" + confine "Cannot test without ActiveRecord" => Puppet.features.rails? it "should provide the adapter, log_level, and host, username, password, and database arguments" do Puppet.settings.stubs(:value).with(:dbadapter).returns("mysql") |