From 9a356ab289a64245cf59cd763dc953a93d71682b Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Mon, 10 Aug 2009 04:20:54 +0000 Subject: Fixing ActiveRecord Indirector tests to skip w/out Rails Signed-off-by: Luke Kanies --- spec/unit/indirector/active_record.rb | 1 + spec/unit/indirector/catalog/active_record.rb | 4 ++-- spec/unit/indirector/facts/active_record.rb | 4 ++-- spec/unit/indirector/node/active_record.rb | 6 ++++-- 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'spec/unit') diff --git a/spec/unit/indirector/active_record.rb b/spec/unit/indirector/active_record.rb index c3cdc07ed..f0bf07f07 100755 --- a/spec/unit/indirector/active_record.rb +++ b/spec/unit/indirector/active_record.rb @@ -1,6 +1,7 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../../spec_helper' + require 'puppet/indirector/active_record' describe Puppet::Indirector::ActiveRecord do diff --git a/spec/unit/indirector/catalog/active_record.rb b/spec/unit/indirector/catalog/active_record.rb index 4b02178cd..463552f55 100755 --- a/spec/unit/indirector/catalog/active_record.rb +++ b/spec/unit/indirector/catalog/active_record.rb @@ -2,12 +2,12 @@ require File.dirname(__FILE__) + '/../../../spec_helper' -require 'puppet/indirector/catalog/active_record' -describe Puppet::Resource::Catalog::ActiveRecord do +describe "Puppet::Resource::Catalog::ActiveRecord" do confine "Missing Rails" => Puppet.features.rails? before do + require 'puppet/indirector/catalog/active_record' Puppet.features.stubs(:rails?).returns true Puppet::Rails.stubs(:init) @terminus = Puppet::Resource::Catalog::ActiveRecord.new diff --git a/spec/unit/indirector/facts/active_record.rb b/spec/unit/indirector/facts/active_record.rb index 37a8f9d6b..1718311c5 100755 --- a/spec/unit/indirector/facts/active_record.rb +++ b/spec/unit/indirector/facts/active_record.rb @@ -3,12 +3,12 @@ require File.dirname(__FILE__) + '/../../../spec_helper' require 'puppet/node/facts' -require 'puppet/indirector/facts/active_record' -describe Puppet::Node::Facts::ActiveRecord do +describe "Puppet::Node::Facts::ActiveRecord" do confine "Missing Rails" => Puppet.features.rails? before do + require 'puppet/indirector/facts/active_record' Puppet.features.stubs(:rails?).returns true Puppet::Rails.stubs(:init) @terminus = Puppet::Node::Facts::ActiveRecord.new diff --git a/spec/unit/indirector/node/active_record.rb b/spec/unit/indirector/node/active_record.rb index 22a6bebaf..75a377230 100755 --- a/spec/unit/indirector/node/active_record.rb +++ b/spec/unit/indirector/node/active_record.rb @@ -3,10 +3,12 @@ require File.dirname(__FILE__) + '/../../../spec_helper' require 'puppet/node' -require 'puppet/indirector/node/active_record' -describe Puppet::Node::ActiveRecord do +describe "Puppet::Node::ActiveRecord" do confine "Missing Rails" => Puppet.features.rails? + before do + require 'puppet/indirector/node/active_record' + end it "should be a subclass of the ActiveRecord terminus class" do Puppet::Node::ActiveRecord.ancestors.should be_include(Puppet::Indirector::ActiveRecord) -- cgit