Fix a stale typo in the PostgreSQL adapter. Fix a stale mock expection in transaction_test.

2 files changed, 1 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 98501db816..cfeef30d06 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -537,7 +537,7 @@ module ActiveRecord
         execute("ROLLBACK TO SAVEPOINT #{current_savepoint_name}")
       end
 
-      def release_savepoint(savepoint_number)
+      def release_savepoint
         execute("RELEASE SAVEPOINT #{current_savepoint_name}")
       end
 
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index 27cc841dd3..4bbcd272b7 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -309,7 +309,6 @@ class TransactionTest < ActiveRecord::TestCase
   uses_mocha 'mocking connection.commit_db_transaction' do
     def test_rollback_when_commit_raises
       Topic.connection.expects(:begin_db_transaction)
-      Topic.connection.expects(:transaction_active?).returns(true) if current_adapter?(:PostgreSQLAdapter)
       Topic.connection.expects(:commit_db_transaction).raises('OH NOES')
       Topic.connection.expects(:rollback_db_transaction)