diff options
author | Jesse Wolfe <jes5199@gmail.com> | 2009-12-17 15:21:22 -0800 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2009-12-18 14:07:30 +1100 |
commit | ea0a43f1acaf24842d9e8159ba7d5c86bf6e9c30 (patch) | |
tree | 59dbbfc5aa37ae535cae07d02ef88324c97e2506 | |
parent | b6f4291cf4be7fd06839415e818796d47e89cf35 (diff) | |
download | puppet-ea0a43f1acaf24842d9e8159ba7d5c86bf6e9c30.tar.gz puppet-ea0a43f1acaf24842d9e8159ba7d5c86bf6e9c30.tar.xz puppet-ea0a43f1acaf24842d9e8159ba7d5c86bf6e9c30.zip |
Fix 2948 Failing rests in spec/unit/rails.rb
Specs didn't reflect some recent changes.
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
-rwxr-xr-x | spec/unit/rails.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/unit/rails.rb b/spec/unit/rails.rb index 6dee55b0e..c714a2ac4 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 |