aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-05 17:31:00 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-05 17:31:00 -0200
commit9ec973f0ac5148998278b2f435b53d0536ceff63 (patch)
tree0c948832ed4ceb87294cebfeffdd450ee37d18f2 /activerecord/test/cases
parent0abd0b54f06c8dc448846e0dc1b287ee4f957868 (diff)
downloadrails-9ec973f0ac5148998278b2f435b53d0536ceff63.tar.gz
rails-9ec973f0ac5148998278b2f435b53d0536ceff63.tar.bz2
rails-9ec973f0ac5148998278b2f435b53d0536ceff63.zip
Do not run remove_connection in memory db test
This will make rake test_sqlite3_mem work again
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/multiple_db_test.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/activerecord/test/cases/multiple_db_test.rb b/activerecord/test/cases/multiple_db_test.rb
index 15c60d5562..f9bc266e84 100644
--- a/activerecord/test/cases/multiple_db_test.rb
+++ b/activerecord/test/cases/multiple_db_test.rb
@@ -93,14 +93,14 @@ class MultipleDbTest < ActiveRecord::TestCase
assert_not_equal Entrant.arel_engine.connection, Course.arel_engine.connection
end
- def test_count_on_custom_connection
- ActiveRecord::Base.remove_connection
- assert_equal 1, College.count
- ensure
- ActiveRecord::Base.establish_connection :arunit
- end
-
unless in_memory_db?
+ def test_count_on_custom_connection
+ ActiveRecord::Base.remove_connection
+ assert_equal 1, College.count
+ ensure
+ ActiveRecord::Base.establish_connection :arunit
+ end
+
def test_associations_should_work_when_model_has_no_connection
begin
ActiveRecord::Base.remove_connection