diff options
Diffstat (limited to 'activerecord/test')
11 files changed, 23 insertions, 11 deletions
diff --git a/activerecord/test/connections/native_db2/connection.rb b/activerecord/test/connections/native_db2/connection.rb index 47f323945a..aa736ccc85 100644 --- a/activerecord/test/connections/native_db2/connection.rb +++ b/activerecord/test/connections/native_db2/connection.rb @@ -1,5 +1,5 @@ print "Using native DB2\n" -require 'fixtures/course' +require_dependency 'fixtures/course' require 'logger' ActiveRecord::Base.logger = Logger.new("debug.log") diff --git a/activerecord/test/connections/native_firebird/connection.rb b/activerecord/test/connections/native_firebird/connection.rb index 96baf38376..c861d952d3 100644 --- a/activerecord/test/connections/native_firebird/connection.rb +++ b/activerecord/test/connections/native_firebird/connection.rb @@ -1,5 +1,5 @@ print "Using native Firebird\n" -require 'fixtures/course' +require_dependency 'fixtures/course' require 'logger' ActiveRecord::Base.logger = Logger.new("debug.log") diff --git a/activerecord/test/connections/native_mysql/connection.rb b/activerecord/test/connections/native_mysql/connection.rb index f1dd284b19..dea337567b 100644 --- a/activerecord/test/connections/native_mysql/connection.rb +++ b/activerecord/test/connections/native_mysql/connection.rb @@ -1,5 +1,5 @@ print "Using native MySQL\n" -require 'fixtures/course' +require_dependency 'fixtures/course' require 'logger' ActiveRecord::Base.logger = Logger.new("debug.log") diff --git a/activerecord/test/connections/native_oci/connection.rb b/activerecord/test/connections/native_oci/connection.rb index 2d9006c231..0b1babb898 100644 --- a/activerecord/test/connections/native_oci/connection.rb +++ b/activerecord/test/connections/native_oci/connection.rb @@ -1,5 +1,5 @@ print "Using OCI Oracle\n" -require 'fixtures/course' +require_dependency 'fixtures/course' require 'logger' ActiveRecord::Base.logger = Logger.new STDOUT diff --git a/activerecord/test/connections/native_postgresql/connection.rb b/activerecord/test/connections/native_postgresql/connection.rb index 4dedf74040..1bdff730b1 100644 --- a/activerecord/test/connections/native_postgresql/connection.rb +++ b/activerecord/test/connections/native_postgresql/connection.rb @@ -1,5 +1,5 @@ print "Using native PostgreSQL\n" -require 'fixtures/course' +require_dependency 'fixtures/course' require 'logger' ActiveRecord::Base.logger = Logger.new("debug.log") diff --git a/activerecord/test/connections/native_sqlite/connection.rb b/activerecord/test/connections/native_sqlite/connection.rb index 6a08fc1f8e..ce3494fb7d 100644 --- a/activerecord/test/connections/native_sqlite/connection.rb +++ b/activerecord/test/connections/native_sqlite/connection.rb @@ -1,5 +1,5 @@ print "Using native SQlite\n" -require 'fixtures/course' +require_dependency 'fixtures/course' require 'logger' ActiveRecord::Base.logger = Logger.new("debug.log") diff --git a/activerecord/test/connections/native_sqlite3/connection.rb b/activerecord/test/connections/native_sqlite3/connection.rb index 917f7129da..ab6686076f 100644 --- a/activerecord/test/connections/native_sqlite3/connection.rb +++ b/activerecord/test/connections/native_sqlite3/connection.rb @@ -1,5 +1,5 @@ print "Using native SQLite3\n" -require 'fixtures/course' +require_dependency 'fixtures/course' require 'logger' ActiveRecord::Base.logger = Logger.new("debug.log") diff --git a/activerecord/test/connections/native_sqlite3/in_memory_connection.rb b/activerecord/test/connections/native_sqlite3/in_memory_connection.rb index 9e0414ba88..31b1597048 100644 --- a/activerecord/test/connections/native_sqlite3/in_memory_connection.rb +++ b/activerecord/test/connections/native_sqlite3/in_memory_connection.rb @@ -1,5 +1,5 @@ print "Using native SQLite3\n" -require 'fixtures/course' +require_dependency 'fixtures/course' require 'logger' ActiveRecord::Base.logger = Logger.new("debug.log") diff --git a/activerecord/test/connections/native_sqlserver/connection.rb b/activerecord/test/connections/native_sqlserver/connection.rb index aa19fc7700..24658d7157 100644 --- a/activerecord/test/connections/native_sqlserver/connection.rb +++ b/activerecord/test/connections/native_sqlserver/connection.rb @@ -1,5 +1,5 @@ print "Using native SQLServer\n" -require 'fixtures/course' +require_dependency 'fixtures/course' require 'logger' ActiveRecord::Base.logger = Logger.new("debug.log") diff --git a/activerecord/test/connections/native_sqlserver_odbc/connection.rb b/activerecord/test/connections/native_sqlserver_odbc/connection.rb index b156a07920..918be3eda7 100644 --- a/activerecord/test/connections/native_sqlserver_odbc/connection.rb +++ b/activerecord/test/connections/native_sqlserver_odbc/connection.rb @@ -1,5 +1,5 @@ print "Using native SQLServer via ODBC\n" -require 'fixtures/course' +require_dependency 'fixtures/course' require 'logger' ActiveRecord::Base.logger = Logger.new("debug.log") diff --git a/activerecord/test/multiple_db_test.rb b/activerecord/test/multiple_db_test.rb index f888d587d0..df2ef10619 100644 --- a/activerecord/test/multiple_db_test.rb +++ b/activerecord/test/multiple_db_test.rb @@ -1,7 +1,9 @@ require 'abstract_unit' -require 'fixtures/course' require 'fixtures/entrant' +# So we can test whether Course.connection survives a reload. +require_dependency 'fixtures/course' + class MultipleDbTest < Test::Unit::TestCase self.use_transactional_fixtures = false @@ -45,4 +47,14 @@ class MultipleDbTest < Test::Unit::TestCase e3 = Entrant.find(3) assert_equal e3.course.id, c2.id end + + def test_course_connection_should_survive_dependency_reload + assert Course.connection + + Dependencies.clear + Object.send(:remove_const, :Course) + require_dependency 'fixtures/course' + + assert Course.connection + end end |