@@ -40,7 +40,11 @@ class ActiveRecordSafetyListener include Singleton def scenario_started(*args) if defined?(ActiveRecord::Base) - ActiveRecord::Base.send :increment_open_transactions unless Rails::VERSION::STRING == "1.1.6" + if ActiveRecord::Base.respond_to?(:increment_open_transactions) + 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 end @@ -48,7 +52,11 @@ class ActiveRecordSafetyListener def scenario_succeeded(*args) if defined?(ActiveRecord::Base) ActiveRecord::Base.connection.rollback_db_transaction - ActiveRecord::Base.send :decrement_open_transactions unless Rails::VERSION::STRING == "1.1.6" + if ActiveRecord::Base.respond_to?(:decrement_open_transactions) + 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 alias :scenario_pending :scenario_succeeded lib/spec/rails/story_adapter.rb 6499e4e0d26451c090d88c4312fa245c189979b1 David Chelimsky david@chelimac.local http://github.com/dchelimsky/rspec-rails/commit/96e2389b6162bf3ab87d78d06615f61a2778491f 96e2389b6162bf3ab87d78d06615f61a2778491f 2008-07-17T21:09:25-07:00 2008-07-17T21:09:25-07:00 Move [increment|decrement]_open_transactions from ActiveRecord::Base to ActiveRecord::Base.connection (for edge > v2.1.0)" 9af1bbb527dc702c26fa006e062cb679cd5bb916 David Chelimsky david@chelimac.local