aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
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/lib/active_record
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/lib/active_record')
-rw-r--r--activerecord/lib/active_record/test_case.rb15
1 files changed, 0 insertions, 15 deletions
diff --git a/activerecord/lib/active_record/test_case.rb b/activerecord/lib/active_record/test_case.rb
index 31b5a8651b..014a900c71 100644
--- a/activerecord/lib/active_record/test_case.rb
+++ b/activerecord/lib/active_record/test_case.rb
@@ -36,21 +36,6 @@ module ActiveRecord
assert_queries(0, &block)
end
- def self.use_concurrent_connections
- setup :connection_allow_concurrency_setup
- teardown :connection_allow_concurrency_teardown
- end
-
- def connection_allow_concurrency_setup
- @connection = ActiveRecord::Base.remove_connection
- ActiveRecord::Base.establish_connection(@connection.merge({:allow_concurrency => true}))
- end
-
- def connection_allow_concurrency_teardown
- ActiveRecord::Base.clear_all_connections!
- ActiveRecord::Base.establish_connection(@connection)
- end
-
def with_kcode(kcode)
if RUBY_VERSION < '1.9'
orig_kcode, $KCODE = $KCODE, kcode