diff options
| -rw-r--r-- | lib/puppet/rails.rb | 1 | ||||
| -rwxr-xr-x | spec/unit/rails.rb | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index 5175acc8f..1a240e206 100644 --- a/lib/puppet/rails.rb +++ b/lib/puppet/rails.rb @@ -22,7 +22,6 @@ module Puppet::Rails ActiveRecord::Base.logger.level = Logger::DEBUG end - ActiveRecord::Base.allow_concurrency = true ActiveRecord::Base.verify_active_connections! begin diff --git a/spec/unit/rails.rb b/spec/unit/rails.rb index ab862a719..df3f149da 100755 --- a/spec/unit/rails.rb +++ b/spec/unit/rails.rb @@ -39,7 +39,6 @@ describe Puppet::Rails, "when initializing any connection" do ActiveRecord::Base.stubs(:logger).returns(logger) logger.expects(:level=).with(Logger::DEBUG) - ActiveRecord::Base.stubs(:allow_concurrency=) ActiveRecord::Base.stubs(:verify_active_connections!) ActiveRecord::Base.stubs(:establish_connection) Puppet::Rails.stubs(:database_arguments) @@ -47,12 +46,6 @@ describe Puppet::Rails, "when initializing any connection" do Puppet::Rails.connect end - it "should set ActiveRecord::Base.allow_concurrency" do - ActiveRecord::Base.expects(:allow_concurrency=).with(true) - - Puppet::Rails.connect - end - it "should call ActiveRecord::Base.verify_active_connections!" do ActiveRecord::Base.expects(:verify_active_connections!) |