summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-11-01 15:58:09 -0700
committerMarkus Roberts <Markus@reality.com>2010-11-10 15:29:13 -0800
commitba4d22bce3fbb7af3bef50088623605350a9891e (patch)
tree6d2179f9ac86d1d27c2bbaf20eb14d61e700fb65 /spec
parent4a3d5d7c11bea5efba6f8fa8074b52c7161fd1d3 (diff)
downloadpuppet-ba4d22bce3fbb7af3bef50088623605350a9891e.tar.gz
puppet-ba4d22bce3fbb7af3bef50088623605350a9891e.tar.xz
puppet-ba4d22bce3fbb7af3bef50088623605350a9891e.zip
Maint. Removing code for which no CLA has been signed
Multiple attemps were made to contact the author of this code in order to obtain a Contributor Licence Agreement, but we were unable to do so.
Diffstat (limited to 'spec')
-rwxr-xr-xspec/unit/rails_spec.rb30
1 files changed, 8 insertions, 22 deletions
diff --git a/spec/unit/rails_spec.rb b/spec/unit/rails_spec.rb
index 01e822ff3..8dfc09b4a 100755
--- a/spec/unit/rails_spec.rb
+++ b/spec/unit/rails_spec.rb
@@ -105,7 +105,6 @@ describe Puppet::Rails, "when initializing a mysql connection" do
Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
Puppet.settings.stubs(:value).with(:dbname).returns("testname")
Puppet.settings.stubs(:value).with(:dbsocket).returns("")
- Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
Puppet::Rails.database_arguments.should == {
:adapter => "mysql",
@@ -114,8 +113,7 @@ describe Puppet::Rails, "when initializing a mysql connection" do
:username => "testuser",
:password => "testpassword",
:database => "testname",
- :reconnect => true,
- :pool => 1
+ :reconnect => true
}
end
@@ -128,7 +126,6 @@ describe Puppet::Rails, "when initializing a mysql connection" do
Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
Puppet.settings.stubs(:value).with(:dbname).returns("testname")
Puppet.settings.stubs(:value).with(:dbsocket).returns("testsocket")
- Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
Puppet::Rails.database_arguments.should == {
:adapter => "mysql",
@@ -139,8 +136,7 @@ describe Puppet::Rails, "when initializing a mysql connection" do
:password => "testpassword",
:database => "testname",
:socket => "testsocket",
- :reconnect => true,
- :pool => 1
+ :reconnect => true
}
end
@@ -153,7 +149,6 @@ describe Puppet::Rails, "when initializing a mysql connection" do
Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
Puppet.settings.stubs(:value).with(:dbname).returns("testname")
Puppet.settings.stubs(:value).with(:dbsocket).returns("testsocket")
- Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
Puppet::Rails.database_arguments.should == {
:adapter => "mysql",
@@ -164,8 +159,7 @@ describe Puppet::Rails, "when initializing a mysql connection" do
:password => "testpassword",
:database => "testname",
:socket => "testsocket",
- :reconnect => true,
- :pool => 1
+ :reconnect => true
}
end
end
@@ -182,7 +176,6 @@ describe Puppet::Rails, "when initializing a postgresql connection" do
Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
Puppet.settings.stubs(:value).with(:dbname).returns("testname")
Puppet.settings.stubs(:value).with(:dbsocket).returns("")
- Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
Puppet::Rails.database_arguments.should == {
:adapter => "postgresql",
@@ -192,8 +185,7 @@ describe Puppet::Rails, "when initializing a postgresql connection" do
:username => "testuser",
:password => "testpassword",
:database => "testname",
- :reconnect => true,
- :pool => 1
+ :reconnect => true
}
end
@@ -206,7 +198,6 @@ describe Puppet::Rails, "when initializing a postgresql connection" do
Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
Puppet.settings.stubs(:value).with(:dbname).returns("testname")
Puppet.settings.stubs(:value).with(:dbsocket).returns("testsocket")
- Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
Puppet::Rails.database_arguments.should == {
:adapter => "postgresql",
@@ -217,7 +208,6 @@ describe Puppet::Rails, "when initializing a postgresql connection" do
:password => "testpassword",
:database => "testname",
:socket => "testsocket",
- :pool => 1,
:reconnect => true
}
end
@@ -226,39 +216,35 @@ end
describe Puppet::Rails, "when initializing an Oracle connection" do
confine "Cannot test without ActiveRecord" => Puppet.features.rails?
- it "should provide the adapter, log_level, and username, password, dbconnections, and database arguments" do
+ it "should provide the adapter, log_level, and username, password, and database arguments" do
Puppet.settings.stubs(:value).with(:dbadapter).returns("oracle_enhanced")
Puppet.settings.stubs(:value).with(:rails_loglevel).returns("testlevel")
Puppet.settings.stubs(:value).with(:dbuser).returns("testuser")
Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
Puppet.settings.stubs(:value).with(:dbname).returns("testname")
- Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
Puppet::Rails.database_arguments.should == {
:adapter => "oracle_enhanced",
:log_level => "testlevel",
:username => "testuser",
:password => "testpassword",
- :database => "testname",
- :pool => 1
+ :database => "testname"
}
end
- it "should provide the adapter, log_level, and host, username, password, database, pool, and socket arguments" do
+ it "should provide the adapter, log_level, and host, username, password, database and socket arguments" do
Puppet.settings.stubs(:value).with(:dbadapter).returns("oracle_enhanced")
Puppet.settings.stubs(:value).with(:rails_loglevel).returns("testlevel")
Puppet.settings.stubs(:value).with(:dbuser).returns("testuser")
Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
Puppet.settings.stubs(:value).with(:dbname).returns("testname")
- Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
Puppet::Rails.database_arguments.should == {
:adapter => "oracle_enhanced",
:log_level => "testlevel",
:username => "testuser",
:password => "testpassword",
- :database => "testname",
- :pool => 1
+ :database => "testname"
}
end
end