aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorCarl Lerche <me@carllerche.com>2010-10-13 12:32:52 -0700
committerCarl Lerche <me@carllerche.com>2010-10-13 12:32:52 -0700
commit91ba75806f20195b06b9a2197cf5f40a238231d5 (patch)
treea21ce01948f4448c7ed1c4fd05944c0a9914a3a5 /activerecord/test/cases
parent0b6af35ef0647cf346bc7e274fc49da64f790ab0 (diff)
downloadrails-91ba75806f20195b06b9a2197cf5f40a238231d5.tar.gz
rails-91ba75806f20195b06b9a2197cf5f40a238231d5.tar.bz2
rails-91ba75806f20195b06b9a2197cf5f40a238231d5.zip
Update the ActiveRecord tests to not set unused options
This makes a test fail, but it is revealing a bug in Arel master.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/locking_test.rb2
-rw-r--r--activerecord/test/cases/transactions_test.rb2
2 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index e7126964cd..48719c660d 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -306,8 +306,6 @@ unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter)
end
if current_adapter?(:PostgreSQLAdapter, :OracleAdapter)
- use_concurrent_connections
-
def test_no_locks_no_wait
first, second = duel { Person.find 1 }
assert first.end > second.end
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index 9255190613..8385286fd0 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -529,8 +529,6 @@ end if Topic.connection.supports_savepoints?
if current_adapter?(:PostgreSQLAdapter)
class ConcurrentTransactionTest < TransactionTest
- use_concurrent_connections
-
# This will cause transactions to overlap and fail unless they are performed on
# separate database connections.
def test_transaction_per_thread