[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[James Turnbull]

The following commit has been merged in the upstream branch:
commit e4b3aacd7856c8221f08771c3b7066094b898a3f
Author: Rein Henrichs <rein at puppetlabs.com>
Date:   Wed Jun 23 14:03:00 2010 -0700

    [#4063] Add confine to describe block that depends on ActiveRecord
    
    confines are not inherited by inner define blocks. For instance:
    
    describe "something" do
      confine "can not has" => false
      describe "something else"
        ... this will still be run ..
      end
    end
    
    This fixes the specific describe block that is lacking the necessary
    confine, allowing specs to run again while we fix the bug in confine
    itself.

diff --git a/spec/unit/rails.rb b/spec/unit/rails.rb
index f61288f..f18a5a4 100755
--- a/spec/unit/rails.rb
+++ b/spec/unit/rails.rb
@@ -48,7 +48,7 @@ describe Puppet::Rails, "when initializing any connection" do
     end
 
     describe "on ActiveRecord 2.1.x" do
-        confine "ActiveRecord 2.1.x" => (::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR <= 1)
+        confine "ActiveRecord 2.1.x" => (Puppet.features.rails? and ::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR <= 1)
 
         it "should set ActiveRecord::Base.allow_concurrency" do
             ActiveRecord::Base.expects(:allow_concurrency=).with(true)

-- 
Puppet packaging for Debian