[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[James Turnbull]

The following commit has been merged in the upstream branch:
commit ea0a43f1acaf24842d9e8159ba7d5c86bf6e9c30
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Thu Dec 17 15:21:22 2009 -0800

    Fix 2948 Failing rests in spec/unit/rails.rb
    
    Specs didn't reflect some recent changes.
    
    Signed-off-by: Jesse Wolfe <jes5199 at gmail.com>

diff --git a/spec/unit/rails.rb b/spec/unit/rails.rb
index 6dee55b..c714a2a 100755
--- a/spec/unit/rails.rb
+++ b/spec/unit/rails.rb
@@ -42,7 +42,7 @@ describe Puppet::Rails, "when initializing any connection" do
         ActiveRecord::Base.stubs(:allow_concurrency=)
         ActiveRecord::Base.stubs(:verify_active_connections!)
         ActiveRecord::Base.stubs(:establish_connection)
-        Puppet::Rails.stubs(:database_arguments)
+        Puppet::Rails.stubs(:database_arguments).returns({})
 
         Puppet::Rails.connect
     end
@@ -64,7 +64,7 @@ describe Puppet::Rails, "when initializing any connection" do
     end
 
     it "should call ActiveRecord::Base.establish_connection with database_arguments" do
-        Puppet::Rails.expects(:database_arguments)
+        Puppet::Rails.expects(:database_arguments).returns({})
         ActiveRecord::Base.expects(:establish_connection)
 
         Puppet::Rails.connect
@@ -80,9 +80,9 @@ describe Puppet::Rails, "when initializing a sqlite3 connection" do
         Puppet.settings.expects(:value).with(:dblocation).returns("testlocation")
 
         Puppet::Rails.database_arguments.should == {
-            :adapter => "sqlite3",
+            :adapter   => "sqlite3",
             :log_level => "testlevel",
-            :dbfile => "testlocation"
+            :database  => "testlocation"
         }
     end
 end

-- 
Puppet packaging for Debian