@@ -40,22 +40,22 @@ class ActiveRecordSafetyListener include Singleton def scenario_started(*args) if defined?(ActiveRecord::Base) - if ActiveRecord::Base.respond_to?(:increment_open_transactions) + if ActiveRecord::Base.connection.respond_to?(:increment_open_transactions) + ActiveRecord::Base.connection.increment_open_transactions + else ActiveRecord::Base.send :increment_open_transactions - elsif ActiveRecord::Base.connection.respond_to?(:increment_open_transactions) - ActiveRecord::Base.connection.send :increment_open_transactions end - ActiveRecord::Base.connection.begin_db_transaction end + ActiveRecord::Base.connection.begin_db_transaction end def scenario_succeeded(*args) if defined?(ActiveRecord::Base) ActiveRecord::Base.connection.rollback_db_transaction - if ActiveRecord::Base.respond_to?(:decrement_open_transactions) + if ActiveRecord::Base.connection.respond_to?(:decrement_open_transactions) + ActiveRecord::Base.connection.decrement_open_transactions + else ActiveRecord::Base.send :decrement_open_transactions - elsif ActiveRecord::Base.connection.respond_to?(:decrement_open_transactions) - ActiveRecord::Base.connection.send :decrement_open_transactions end end end lib/spec/rails/story_adapter.rb 96e2389b6162bf3ab87d78d06615f61a2778491f David Chelimsky david@chelimac.local http://github.com/dchelimsky/rspec-rails/commit/036020d0a4bc62233bc999cdc6dd040a3e68f355 036020d0a4bc62233bc999cdc6dd040a3e68f355 2008-07-17T21:46:47-07:00 2008-07-17T21:46:47-07:00 and now, without breaking stories against all the non-edge versions of rails e605f533a9dad0246ef3b09f1e966ea56f75bc31 David Chelimsky david@chelimac.local