From 61774e0d494fa9076e08d55dde5efd1599ef7040 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 6 Jun 2011 11:17:44 -0700
Subject: please use ruby -I lib:test path/to/test.rb, or export RUBY_OPT

---
 activerecord/test/cases/adapter_test.rb                                | 2 +-
 activerecord/test/cases/adapters/firebird/connection_test.rb           | 2 +-
 activerecord/test/cases/adapters/firebird/default_test.rb              | 2 +-
 activerecord/test/cases/adapters/firebird/migration_test.rb            | 2 +-
 activerecord/test/cases/adapters/mysql/active_schema_test.rb           | 2 +-
 activerecord/test/cases/adapters/mysql/connection_test.rb              | 2 +-
 activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb           | 2 +-
 activerecord/test/cases/adapters/mysql/quoting_test.rb                 | 2 +-
 activerecord/test/cases/adapters/mysql/reserved_word_test.rb           | 2 +-
 activerecord/test/cases/adapters/mysql/schema_test.rb                  | 2 +-
 activerecord/test/cases/adapters/mysql/sp_test.rb                      | 2 +-
 activerecord/test/cases/adapters/mysql2/active_schema_test.rb          | 2 +-
 activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb         | 2 +-
 activerecord/test/cases/adapters/mysql2/connection_test.rb             | 2 +-
 activerecord/test/cases/adapters/mysql2/reserved_word_test.rb          | 2 +-
 activerecord/test/cases/adapters/mysql2/schema_test.rb                 | 2 +-
 activerecord/test/cases/adapters/oracle/synonym_test.rb                | 2 +-
 activerecord/test/cases/adapters/postgresql/active_schema_test.rb      | 2 +-
 activerecord/test/cases/adapters/postgresql/datatype_test.rb           | 2 +-
 activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb | 2 +-
 activerecord/test/cases/adapters/postgresql/quoting_test.rb            | 2 +-
 .../test/cases/adapters/postgresql/schema_authorization_test.rb        | 2 +-
 activerecord/test/cases/adapters/postgresql/schema_test.rb             | 2 +-
 activerecord/test/cases/adapters/sqlite3/copy_table_test.rb            | 2 +-
 activerecord/test/cases/adapters/sqlite3/quoting_test.rb               | 2 +-
 activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb       | 2 +-
 activerecord/test/cases/aggregations_test.rb                           | 2 +-
 activerecord/test/cases/ar_schema_test.rb                              | 2 +-
 activerecord/test/cases/associations/belongs_to_associations_test.rb   | 2 +-
 activerecord/test/cases/associations/callbacks_test.rb                 | 2 +-
 activerecord/test/cases/associations/cascaded_eager_loading_test.rb    | 2 +-
 .../test/cases/associations/eager_load_includes_full_sti_class_test.rb | 2 +-
 activerecord/test/cases/associations/eager_load_nested_include_test.rb | 2 +-
 activerecord/test/cases/associations/eager_singularization_test.rb     | 2 +-
 activerecord/test/cases/associations/eager_test.rb                     | 2 +-
 activerecord/test/cases/associations/extension_test.rb                 | 2 +-
 activerecord/test/cases/associations/habtm_join_table_test.rb          | 2 +-
 .../cases/associations/has_and_belongs_to_many_associations_test.rb    | 2 +-
 activerecord/test/cases/associations/has_many_associations_test.rb     | 2 +-
 .../test/cases/associations/has_many_through_associations_test.rb      | 2 +-
 activerecord/test/cases/associations/has_one_associations_test.rb      | 2 +-
 .../test/cases/associations/has_one_through_associations_test.rb       | 2 +-
 activerecord/test/cases/associations/identity_map_test.rb              | 2 +-
 activerecord/test/cases/associations/inner_join_association_test.rb    | 2 +-
 activerecord/test/cases/associations/inverse_associations_test.rb      | 2 +-
 activerecord/test/cases/associations/join_model_test.rb                | 2 +-
 .../test/cases/associations/nested_through_associations_test.rb        | 2 +-
 activerecord/test/cases/associations_test.rb                           | 2 +-
 activerecord/test/cases/attribute_methods/read_test.rb                 | 2 +-
 activerecord/test/cases/attribute_methods_test.rb                      | 2 +-
 activerecord/test/cases/autosave_association_test.rb                   | 2 +-
 activerecord/test/cases/base_test.rb                                   | 2 +-
 activerecord/test/cases/batches_test.rb                                | 2 +-
 activerecord/test/cases/binary_test.rb                                 | 2 +-
 activerecord/test/cases/bind_parameter_test.rb                         | 2 +-
 activerecord/test/cases/calculations_test.rb                           | 2 +-
 activerecord/test/cases/callbacks_test.rb                              | 2 +-
 activerecord/test/cases/clone_test.rb                                  | 2 +-
 activerecord/test/cases/coders/yaml_column_test.rb                     | 3 ++-
 activerecord/test/cases/column_alias_test.rb                           | 2 +-
 activerecord/test/cases/column_definition_test.rb                      | 2 +-
 activerecord/test/cases/connection_adapters/connection_handler_test.rb | 2 +-
 activerecord/test/cases/connection_management_test.rb                  | 2 +-
 activerecord/test/cases/connection_pool_test.rb                        | 2 +-
 activerecord/test/cases/counter_cache_test.rb                          | 2 +-
 activerecord/test/cases/custom_locking_test.rb                         | 2 +-
 activerecord/test/cases/database_statements_test.rb                    | 2 +-
 activerecord/test/cases/date_time_test.rb                              | 2 +-
 activerecord/test/cases/defaults_test.rb                               | 2 +-
 activerecord/test/cases/deprecated_finder_test.rb                      | 2 +-
 activerecord/test/cases/dirty_test.rb                                  | 2 +-
 activerecord/test/cases/dup_test.rb                                    | 2 +-
 activerecord/test/cases/dynamic_finder_match_test.rb                   | 2 +-
 activerecord/test/cases/finder_respond_to_test.rb                      | 2 +-
 activerecord/test/cases/finder_test.rb                                 | 2 +-
 activerecord/test/cases/fixtures_test.rb                               | 2 +-
 activerecord/test/cases/habtm_destroy_order_test.rb                    | 2 +-
 activerecord/test/cases/i18n_test.rb                                   | 2 +-
 activerecord/test/cases/identity_map/middleware_test.rb                | 2 +-
 activerecord/test/cases/identity_map_test.rb                           | 3 ++-
 activerecord/test/cases/inheritance_test.rb                            | 2 +-
 activerecord/test/cases/invalid_date_test.rb                           | 2 +-
 activerecord/test/cases/invertible_migration_test.rb                   | 2 +-
 activerecord/test/cases/json_serialization_test.rb                     | 2 +-
 activerecord/test/cases/lifecycle_test.rb                              | 2 +-
 activerecord/test/cases/locking_test.rb                                | 2 +-
 activerecord/test/cases/log_subscriber_test.rb                         | 2 +-
 activerecord/test/cases/mass_assignment_security_test.rb               | 2 +-
 activerecord/test/cases/method_scoping_test.rb                         | 2 +-
 activerecord/test/cases/migration/command_recorder_test.rb             | 2 +-
 activerecord/test/cases/migration_test.rb                              | 2 +-
 activerecord/test/cases/mixin_test.rb                                  | 2 +-
 activerecord/test/cases/modules_test.rb                                | 2 +-
 activerecord/test/cases/multiple_db_test.rb                            | 2 +-
 activerecord/test/cases/named_scope_test.rb                            | 2 +-
 activerecord/test/cases/nested_attributes_test.rb                      | 2 +-
 activerecord/test/cases/persistence_test.rb                            | 2 +-
 activerecord/test/cases/pooled_connections_test.rb                     | 2 +-
 activerecord/test/cases/primary_keys_test.rb                           | 2 +-
 activerecord/test/cases/query_cache_test.rb                            | 2 +-
 activerecord/test/cases/quoting_test.rb                                | 2 +-
 activerecord/test/cases/readonly_test.rb                               | 2 +-
 activerecord/test/cases/reflection_test.rb                             | 2 +-
 activerecord/test/cases/relation_scoping_test.rb                       | 2 +-
 activerecord/test/cases/relation_test.rb                               | 2 +-
 activerecord/test/cases/relations_test.rb                              | 2 +-
 activerecord/test/cases/reload_models_test.rb                          | 2 +-
 activerecord/test/cases/sanitize_test.rb                               | 2 +-
 activerecord/test/cases/schema_dumper_test.rb                          | 2 +-
 activerecord/test/cases/serialization_test.rb                          | 2 +-
 activerecord/test/cases/session_store/session_test.rb                  | 2 +-
 activerecord/test/cases/session_store/sql_bypass.rb                    | 2 +-
 activerecord/test/cases/timestamp_test.rb                              | 2 +-
 activerecord/test/cases/transaction_callbacks_test.rb                  | 2 +-
 activerecord/test/cases/transactions_test.rb                           | 2 +-
 activerecord/test/cases/unconnected_test.rb                            | 2 +-
 activerecord/test/cases/validations/association_validation_test.rb     | 2 +-
 .../test/cases/validations/i18n_generate_message_validation_test.rb    | 2 +-
 activerecord/test/cases/validations/i18n_validation_test.rb            | 2 +-
 activerecord/test/cases/validations/uniqueness_validation_test.rb      | 2 +-
 activerecord/test/cases/validations_test.rb                            | 2 +-
 activerecord/test/cases/xml_serialization_test.rb                      | 2 +-
 activerecord/test/cases/yaml_serialization_test.rb                     | 2 +-
 123 files changed, 125 insertions(+), 123 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index e7a3bb9ced..07de544868 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 
 class AdapterTest < ActiveRecord::TestCase
   def setup
diff --git a/activerecord/test/cases/adapters/firebird/connection_test.rb b/activerecord/test/cases/adapters/firebird/connection_test.rb
index 47e8859ac6..f57ea686a5 100644
--- a/activerecord/test/cases/adapters/firebird/connection_test.rb
+++ b/activerecord/test/cases/adapters/firebird/connection_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 class FirebirdConnectionTest < ActiveRecord::TestCase
   def test_charset_properly_set
diff --git a/activerecord/test/cases/adapters/firebird/default_test.rb b/activerecord/test/cases/adapters/firebird/default_test.rb
index 2d5e45dd74..713c7e11bf 100644
--- a/activerecord/test/cases/adapters/firebird/default_test.rb
+++ b/activerecord/test/cases/adapters/firebird/default_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 require 'models/default'
 
 class DefaultTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/adapters/firebird/migration_test.rb b/activerecord/test/cases/adapters/firebird/migration_test.rb
index 0fe3d4a858..5c94593765 100644
--- a/activerecord/test/cases/adapters/firebird/migration_test.rb
+++ b/activerecord/test/cases/adapters/firebird/migration_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 require 'models/course'
 
 class FirebirdMigrationTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/adapters/mysql/active_schema_test.rb b/activerecord/test/cases/adapters/mysql/active_schema_test.rb
index c817b259b4..509baacaef 100644
--- a/activerecord/test/cases/adapters/mysql/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql/active_schema_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 class ActiveSchemaTest < ActiveRecord::TestCase
   def setup
diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb
index 703eb5a8bd..eee771ecff 100644
--- a/activerecord/test/cases/adapters/mysql/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql/connection_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
index 756115e5c9..146b77a95c 100644
--- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   module ConnectionAdapters
diff --git a/activerecord/test/cases/adapters/mysql/quoting_test.rb b/activerecord/test/cases/adapters/mysql/quoting_test.rb
index 7933800440..3d1330efb8 100644
--- a/activerecord/test/cases/adapters/mysql/quoting_test.rb
+++ b/activerecord/test/cases/adapters/mysql/quoting_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   module ConnectionAdapters
diff --git a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
index 2750831b93..292c7efebb 100644
--- a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 class Group < ActiveRecord::Base
   Group.table_name = 'group'
diff --git a/activerecord/test/cases/adapters/mysql/schema_test.rb b/activerecord/test/cases/adapters/mysql/schema_test.rb
index 8b26d303bf..a2155d1dd1 100644
--- a/activerecord/test/cases/adapters/mysql/schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql/schema_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 
diff --git a/activerecord/test/cases/adapters/mysql/sp_test.rb b/activerecord/test/cases/adapters/mysql/sp_test.rb
index baa44fab70..3ca2917ca4 100644
--- a/activerecord/test/cases/adapters/mysql/sp_test.rb
+++ b/activerecord/test/cases/adapters/mysql/sp_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 
 class StoredProcedureTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb
index ca716f7016..a83399d0cd 100644
--- a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 class ActiveSchemaTest < ActiveRecord::TestCase
   def setup
diff --git a/activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb b/activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb
index 7bb35d755a..cd9c1041dc 100644
--- a/activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/bind_parameter_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 
 module ActiveRecord
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
index 1c523dad69..26091c713b 100644
--- a/activerecord/test/cases/adapters/mysql2/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
diff --git a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
index 9cb30b0fd1..752b864818 100644
--- a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 class Group < ActiveRecord::Base
   Group.table_name = 'group'
diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb
index ec89972360..858d1da2dd 100644
--- a/activerecord/test/cases/adapters/mysql2/schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 
diff --git a/activerecord/test/cases/adapters/oracle/synonym_test.rb b/activerecord/test/cases/adapters/oracle/synonym_test.rb
index 4cbca6dcb2..b9a422a6ca 100644
--- a/activerecord/test/cases/adapters/oracle/synonym_test.rb
+++ b/activerecord/test/cases/adapters/oracle/synonym_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 require 'models/subject'
 
diff --git a/activerecord/test/cases/adapters/postgresql/active_schema_test.rb b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
index 1802e2be24..e4746d4aa3 100644
--- a/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require 'cases/helper'
 
 class PostgresqlActiveSchemaTest < ActiveRecord::TestCase
   def setup
diff --git a/activerecord/test/cases/adapters/postgresql/datatype_test.rb b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
index c383e8b6fb..ce08e4c6a7 100644
--- a/activerecord/test/cases/adapters/postgresql/datatype_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 class PostgresqlArray < ActiveRecord::Base
 end
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index 14e78ed982..7c49236854 100644
--- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   module ConnectionAdapters
diff --git a/activerecord/test/cases/adapters/postgresql/quoting_test.rb b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
index e95d10c594..172055f15c 100644
--- a/activerecord/test/cases/adapters/postgresql/quoting_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   module ConnectionAdapters
diff --git a/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
index 8b9c4d337a..d5e1838543 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 class SchemaThing < ActiveRecord::Base
 end
diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb
index 6f3dba4168..a5c3e69af9 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 class SchemaTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
diff --git a/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb b/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
index 899df1d59a..575b4806c1 100644
--- a/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 class CopyTableTest < ActiveRecord::TestCase
   fixtures :customers, :companies, :comments
diff --git a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
index 51f01c262d..0d9db92447 100644
--- a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 require 'bigdecimal'
 require 'yaml'
 
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index d58a804815..6ff04e3eb3 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('../../../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   module ConnectionAdapters
diff --git a/activerecord/test/cases/aggregations_test.rb b/activerecord/test/cases/aggregations_test.rb
index d296364d7f..3e0e6dce2c 100644
--- a/activerecord/test/cases/aggregations_test.rb
+++ b/activerecord/test/cases/aggregations_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/customer'
 require 'active_support/core_ext/exception'
 
diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index eb4488899f..588adc38e3 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 
 if ActiveRecord::Base.connection.supports_migrations?
 
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index d7293aa1e3..5a900e0605 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/developer'
 require 'models/project'
 require 'models/company'
diff --git a/activerecord/test/cases/associations/callbacks_test.rb b/activerecord/test/cases/associations/callbacks_test.rb
index 387a25b7b1..2d0d4541b4 100644
--- a/activerecord/test/cases/associations/callbacks_test.rb
+++ b/activerecord/test/cases/associations/callbacks_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/author'
 require 'models/project'
diff --git a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
index d21afff978..ff376a68d8 100644
--- a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
+++ b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/author'
diff --git a/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb b/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
index 41cf745f91..d75791cab9 100644
--- a/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
+++ b/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require 'cases/helper'
 require 'models/post'
 require 'models/tagging'
 
diff --git a/activerecord/test/cases/associations/eager_load_nested_include_test.rb b/activerecord/test/cases/associations/eager_load_nested_include_test.rb
index de1f47873f..2cf9f89c3c 100644
--- a/activerecord/test/cases/associations/eager_load_nested_include_test.rb
+++ b/activerecord/test/cases/associations/eager_load_nested_include_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require 'cases/helper'
 require 'models/post'
 require 'models/tag'
 require 'models/author'
diff --git a/activerecord/test/cases/associations/eager_singularization_test.rb b/activerecord/test/cases/associations/eager_singularization_test.rb
index ffb5411a5b..07d0b24613 100644
--- a/activerecord/test/cases/associations/eager_singularization_test.rb
+++ b/activerecord/test/cases/associations/eager_singularization_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 
 class Virus < ActiveRecord::Base
   belongs_to :octopus
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 945edad48a..325fc58958 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/tagging'
 require 'models/tag'
diff --git a/activerecord/test/cases/associations/extension_test.rb b/activerecord/test/cases/associations/extension_test.rb
index c0a8f74834..24830a661a 100644
--- a/activerecord/test/cases/associations/extension_test.rb
+++ b/activerecord/test/cases/associations/extension_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/project'
diff --git a/activerecord/test/cases/associations/habtm_join_table_test.rb b/activerecord/test/cases/associations/habtm_join_table_test.rb
index cc0a6cd6c2..fe2b82f2c1 100644
--- a/activerecord/test/cases/associations/habtm_join_table_test.rb
+++ b/activerecord/test/cases/associations/habtm_join_table_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require 'cases/helper'
 
 class MyReader < ActiveRecord::Base
   has_and_belongs_to_many :my_books
diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index 171177ad1d..d8d2a113ff 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/developer'
 require 'models/project'
 require 'models/company'
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index b87a1744c1..49999630b6 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/developer'
 require 'models/project'
 require 'models/company'
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index 476bc637f6..877148bd5e 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/person'
 require 'models/reference'
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
index 9bafe0f57d..299688d840 100644
--- a/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/developer'
 require 'models/project'
 require 'models/company'
diff --git a/activerecord/test/cases/associations/has_one_through_associations_test.rb b/activerecord/test/cases/associations/has_one_through_associations_test.rb
index 24576fb580..2503349c08 100644
--- a/activerecord/test/cases/associations/has_one_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_through_associations_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/club'
 require 'models/member_type'
 require 'models/member'
diff --git a/activerecord/test/cases/associations/identity_map_test.rb b/activerecord/test/cases/associations/identity_map_test.rb
index 0dd6c76efd..9b8635774c 100644
--- a/activerecord/test/cases/associations/identity_map_test.rb
+++ b/activerecord/test/cases/associations/identity_map_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/author'
 require 'models/post'
 
diff --git a/activerecord/test/cases/associations/inner_join_association_test.rb b/activerecord/test/cases/associations/inner_join_association_test.rb
index 1c0fe8368f..e5e9ca6131 100644
--- a/activerecord/test/cases/associations/inner_join_association_test.rb
+++ b/activerecord/test/cases/associations/inner_join_association_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/author'
diff --git a/activerecord/test/cases/associations/inverse_associations_test.rb b/activerecord/test/cases/associations/inverse_associations_test.rb
index 9e4975566b..76282213d8 100644
--- a/activerecord/test/cases/associations/inverse_associations_test.rb
+++ b/activerecord/test/cases/associations/inverse_associations_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/man'
 require 'models/face'
 require 'models/interest'
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index c869e6fbc5..b59ce4efeb 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'active_support/core_ext/object/inclusion'
 require 'models/tag'
 require 'models/tagging'
diff --git a/activerecord/test/cases/associations/nested_through_associations_test.rb b/activerecord/test/cases/associations/nested_through_associations_test.rb
index b13b8d5e36..dd450a2a8e 100644
--- a/activerecord/test/cases/associations/nested_through_associations_test.rb
+++ b/activerecord/test/cases/associations/nested_through_associations_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/author'
 require 'models/post'
 require 'models/person'
diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
index 8bff37907d..49d82ba2df 100644
--- a/activerecord/test/cases/associations_test.rb
+++ b/activerecord/test/cases/associations_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/developer'
 require 'models/project'
 require 'models/company'
diff --git a/activerecord/test/cases/attribute_methods/read_test.rb b/activerecord/test/cases/attribute_methods/read_test.rb
index bb0dcb2a77..3641031d12 100644
--- a/activerecord/test/cases/attribute_methods/read_test.rb
+++ b/activerecord/test/cases/attribute_methods/read_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'active_support/core_ext/object/inclusion'
 
 module ActiveRecord
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index bf6408be0f..b0896fb236 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'active_support/core_ext/object/inclusion'
 require 'models/minimalistic'
 require 'models/developer'
diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb
index b14c458435..8f55b7ebe6 100644
--- a/activerecord/test/cases/autosave_association_test.rb
+++ b/activerecord/test/cases/autosave_association_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require 'cases/helper'
 require 'models/bird'
 require 'models/company'
 require 'models/customer'
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 5eb9a825b7..2224097f04 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/author'
 require 'models/topic'
diff --git a/activerecord/test/cases/batches_test.rb b/activerecord/test/cases/batches_test.rb
index 31e00c998c..6620464d6a 100644
--- a/activerecord/test/cases/batches_test.rb
+++ b/activerecord/test/cases/batches_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require 'cases/helper'
 require 'models/post'
 
 class EachTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/binary_test.rb b/activerecord/test/cases/binary_test.rb
index 365c16679e..06c14cb108 100644
--- a/activerecord/test/cases/binary_test.rb
+++ b/activerecord/test/cases/binary_test.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 
 # Without using prepared statements, it makes no sense to test
 # BLOB data with DB2 or Firebird, because the length of a statement
diff --git a/activerecord/test/cases/bind_parameter_test.rb b/activerecord/test/cases/bind_parameter_test.rb
index bfd4c2afdf..3652255c38 100644
--- a/activerecord/test/cases/bind_parameter_test.rb
+++ b/activerecord/test/cases/bind_parameter_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require 'cases/helper'
 require 'models/topic'
 
 module ActiveRecord
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index cedd5c3d41..56f6d795b6 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/company'
 require 'models/topic'
 require 'models/edge'
diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb
index c2b43438fc..7f4d25790b 100644
--- a/activerecord/test/cases/callbacks_test.rb
+++ b/activerecord/test/cases/callbacks_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 
 class CallbackDeveloper < ActiveRecord::Base
   set_table_name 'developers'
diff --git a/activerecord/test/cases/clone_test.rb b/activerecord/test/cases/clone_test.rb
index b25340c205..d91646efca 100644
--- a/activerecord/test/cases/clone_test.rb
+++ b/activerecord/test/cases/clone_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 
 module ActiveRecord
diff --git a/activerecord/test/cases/coders/yaml_column_test.rb b/activerecord/test/cases/coders/yaml_column_test.rb
index 55aba713e8..c7dcc21809 100644
--- a/activerecord/test/cases/coders/yaml_column_test.rb
+++ b/activerecord/test/cases/coders/yaml_column_test.rb
@@ -1,4 +1,5 @@
-require File.expand_path('../../helper', __FILE__)
+
+require "cases/helper"
 
 module ActiveRecord
   module Coders
diff --git a/activerecord/test/cases/column_alias_test.rb b/activerecord/test/cases/column_alias_test.rb
index 1b6ac870e4..40707d9cb2 100644
--- a/activerecord/test/cases/column_alias_test.rb
+++ b/activerecord/test/cases/column_alias_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 
 class TestColumnAlias < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/column_definition_test.rb b/activerecord/test/cases/column_definition_test.rb
index 4d046eb9ba..d1dddd4c2c 100644
--- a/activerecord/test/cases/column_definition_test.rb
+++ b/activerecord/test/cases/column_definition_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   module ConnectionAdapters
diff --git a/activerecord/test/cases/connection_adapters/connection_handler_test.rb b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
index 0bf33f86cf..abf317768f 100644
--- a/activerecord/test/cases/connection_adapters/connection_handler_test.rb
+++ b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   module ConnectionAdapters
diff --git a/activerecord/test/cases/connection_management_test.rb b/activerecord/test/cases/connection_management_test.rb
index 2b2deb6732..85871aebdf 100644
--- a/activerecord/test/cases/connection_management_test.rb
+++ b/activerecord/test/cases/connection_management_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   module ConnectionAdapters
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 7aa765dc4f..f92f4e62c5 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   module ConnectionAdapters
diff --git a/activerecord/test/cases/counter_cache_test.rb b/activerecord/test/cases/counter_cache_test.rb
index 31faef5f0f..3ed96a3ec8 100644
--- a/activerecord/test/cases/counter_cache_test.rb
+++ b/activerecord/test/cases/counter_cache_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require 'cases/helper'
 require 'models/topic'
 require 'models/car'
 require 'models/wheel'
diff --git a/activerecord/test/cases/custom_locking_test.rb b/activerecord/test/cases/custom_locking_test.rb
index 1d4385eac0..d63ecdbcc5 100644
--- a/activerecord/test/cases/custom_locking_test.rb
+++ b/activerecord/test/cases/custom_locking_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/person'
 
 module ActiveRecord
diff --git a/activerecord/test/cases/database_statements_test.rb b/activerecord/test/cases/database_statements_test.rb
index 8fa2c9ca44..c689e97d83 100644
--- a/activerecord/test/cases/database_statements_test.rb
+++ b/activerecord/test/cases/database_statements_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 
 class DatabaseStatementsTest < ActiveRecord::TestCase
   def setup
diff --git a/activerecord/test/cases/date_time_test.rb b/activerecord/test/cases/date_time_test.rb
index a9e477bd76..3deb0dac99 100644
--- a/activerecord/test/cases/date_time_test.rb
+++ b/activerecord/test/cases/date_time_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 require 'models/task'
 
diff --git a/activerecord/test/cases/defaults_test.rb b/activerecord/test/cases/defaults_test.rb
index 8cf008871b..b3a281d960 100644
--- a/activerecord/test/cases/defaults_test.rb
+++ b/activerecord/test/cases/defaults_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'active_support/core_ext/object/inclusion'
 require 'models/default'
 require 'models/entrant'
diff --git a/activerecord/test/cases/deprecated_finder_test.rb b/activerecord/test/cases/deprecated_finder_test.rb
index 1819bfc5ca..2afc91b769 100644
--- a/activerecord/test/cases/deprecated_finder_test.rb
+++ b/activerecord/test/cases/deprecated_finder_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/entrant'
 
 class DeprecatedFinderTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb
index 7d58781eca..b1ce846218 100644
--- a/activerecord/test/cases/dirty_test.rb
+++ b/activerecord/test/cases/dirty_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require 'cases/helper'
 require 'models/topic'    # For booleans
 require 'models/pirate'   # For timestamps
 require 'models/parrot'
diff --git a/activerecord/test/cases/dup_test.rb b/activerecord/test/cases/dup_test.rb
index 9acf5fdd32..0236f9b0a1 100644
--- a/activerecord/test/cases/dup_test.rb
+++ b/activerecord/test/cases/dup_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 
 module ActiveRecord
diff --git a/activerecord/test/cases/dynamic_finder_match_test.rb b/activerecord/test/cases/dynamic_finder_match_test.rb
index 693a8e2180..e576870317 100644
--- a/activerecord/test/cases/dynamic_finder_match_test.rb
+++ b/activerecord/test/cases/dynamic_finder_match_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   class DynamicFinderMatchTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/finder_respond_to_test.rb b/activerecord/test/cases/finder_respond_to_test.rb
index 7952e9a46a..235805a67c 100644
--- a/activerecord/test/cases/finder_respond_to_test.rb
+++ b/activerecord/test/cases/finder_respond_to_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 
 class FinderRespondToTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 3920f306f9..4e75eafe3d 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/author'
 require 'models/categorization'
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index e645a9a47c..306b437fb3 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/binary'
 require 'models/topic'
diff --git a/activerecord/test/cases/habtm_destroy_order_test.rb b/activerecord/test/cases/habtm_destroy_order_test.rb
index 776ed3f517..f2b91d977e 100644
--- a/activerecord/test/cases/habtm_destroy_order_test.rb
+++ b/activerecord/test/cases/habtm_destroy_order_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require "models/lesson"
 require "models/student"
 
diff --git a/activerecord/test/cases/i18n_test.rb b/activerecord/test/cases/i18n_test.rb
index d96dc5fba9..a428f1d87b 100644
--- a/activerecord/test/cases/i18n_test.rb
+++ b/activerecord/test/cases/i18n_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 
diff --git a/activerecord/test/cases/identity_map/middleware_test.rb b/activerecord/test/cases/identity_map/middleware_test.rb
index 047192c244..60dcad4586 100644
--- a/activerecord/test/cases/identity_map/middleware_test.rb
+++ b/activerecord/test/cases/identity_map/middleware_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   module IdentityMap
diff --git a/activerecord/test/cases/identity_map_test.rb b/activerecord/test/cases/identity_map_test.rb
index d814f1cc92..cd9c358799 100644
--- a/activerecord/test/cases/identity_map_test.rb
+++ b/activerecord/test/cases/identity_map_test.rb
@@ -1,4 +1,5 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
+
 require 'models/developer'
 require 'models/project'
 require 'models/company'
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb
index 5bfc572ea8..b5d8314541 100644
--- a/activerecord/test/cases/inheritance_test.rb
+++ b/activerecord/test/cases/inheritance_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/company'
 require 'models/project'
 require 'models/subscriber'
diff --git a/activerecord/test/cases/invalid_date_test.rb b/activerecord/test/cases/invalid_date_test.rb
index 65d326bc12..2de50b224c 100644
--- a/activerecord/test/cases/invalid_date_test.rb
+++ b/activerecord/test/cases/invalid_date_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require 'cases/helper'
 require 'models/topic'
 
 class InvalidDateTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/invertible_migration_test.rb b/activerecord/test/cases/invertible_migration_test.rb
index d145ff7427..afec64750e 100644
--- a/activerecord/test/cases/invertible_migration_test.rb
+++ b/activerecord/test/cases/invertible_migration_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   class InvertibleMigrationTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/json_serialization_test.rb b/activerecord/test/cases/json_serialization_test.rb
index aef7403a09..d9e350abc0 100644
--- a/activerecord/test/cases/json_serialization_test.rb
+++ b/activerecord/test/cases/json_serialization_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/contact'
 require 'models/post'
 require 'models/author'
diff --git a/activerecord/test/cases/lifecycle_test.rb b/activerecord/test/cases/lifecycle_test.rb
index 7d47f7e21b..643e949087 100644
--- a/activerecord/test/cases/lifecycle_test.rb
+++ b/activerecord/test/cases/lifecycle_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require 'cases/helper'
 require 'models/topic'
 require 'models/developer'
 require 'models/reply'
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index 88861df86a..61baa55027 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -1,5 +1,5 @@
 require 'thread'
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/person'
 require 'models/job'
 require 'models/reader'
diff --git a/activerecord/test/cases/log_subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb
index f29ced4526..c6c6079490 100644
--- a/activerecord/test/cases/log_subscriber_test.rb
+++ b/activerecord/test/cases/log_subscriber_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require "models/developer"
 require "models/post"
 require "active_support/log_subscriber/test_helper"
diff --git a/activerecord/test/cases/mass_assignment_security_test.rb b/activerecord/test/cases/mass_assignment_security_test.rb
index a41ce539c7..33737e12a8 100644
--- a/activerecord/test/cases/mass_assignment_security_test.rb
+++ b/activerecord/test/cases/mass_assignment_security_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/company'
 require 'models/subscriber'
 require 'models/keyboard'
diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb
index 52e76cb91a..a0cb5dbdc5 100644
--- a/activerecord/test/cases/method_scoping_test.rb
+++ b/activerecord/test/cases/method_scoping_test.rb
@@ -2,7 +2,7 @@
 # All the tests were already ported to relation_scoping_test.rb when the new
 # relation scoping API was added.
 
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/author'
 require 'models/developer'
diff --git a/activerecord/test/cases/migration/command_recorder_test.rb b/activerecord/test/cases/migration/command_recorder_test.rb
index 986dc7173d..0f79c99e1a 100644
--- a/activerecord/test/cases/migration/command_recorder_test.rb
+++ b/activerecord/test/cases/migration/command_recorder_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   class Migration
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 01f7575653..bf7565a0d0 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'bigdecimal/util'
 
 require 'models/person'
diff --git a/activerecord/test/cases/mixin_test.rb b/activerecord/test/cases/mixin_test.rb
index 65101199b8..f927c13979 100644
--- a/activerecord/test/cases/mixin_test.rb
+++ b/activerecord/test/cases/mixin_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 
 class Mixin < ActiveRecord::Base
 end
diff --git a/activerecord/test/cases/modules_test.rb b/activerecord/test/cases/modules_test.rb
index df5e66ea3c..a2041af16a 100644
--- a/activerecord/test/cases/modules_test.rb
+++ b/activerecord/test/cases/modules_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/company_in_module'
 require 'models/shop'
 
diff --git a/activerecord/test/cases/multiple_db_test.rb b/activerecord/test/cases/multiple_db_test.rb
index fca832e50b..bd51388e05 100644
--- a/activerecord/test/cases/multiple_db_test.rb
+++ b/activerecord/test/cases/multiple_db_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/entrant'
 require 'models/bird'
 
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 2403645940..2afe3c8f32 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'active_support/core_ext/array/random_access'
 require 'models/post'
 require 'models/topic'
diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index d94d4768a9..6568eb1d18 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require "models/pirate"
 require "models/ship"
 require "models/ship_part"
diff --git a/activerecord/test/cases/persistence_test.rb b/activerecord/test/cases/persistence_test.rb
index 00543f7350..57d1441128 100644
--- a/activerecord/test/cases/persistence_test.rb
+++ b/activerecord/test/cases/persistence_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/author'
diff --git a/activerecord/test/cases/pooled_connections_test.rb b/activerecord/test/cases/pooled_connections_test.rb
index 0321c5208f..379cf5b44e 100644
--- a/activerecord/test/cases/pooled_connections_test.rb
+++ b/activerecord/test/cases/pooled_connections_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require "models/project"
 require "timeout"
 
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index e810a155a0..05a41d8a0a 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 require 'models/subscriber'
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index b08443b455..a61180cfaf 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 require 'models/task'
 require 'models/category'
diff --git a/activerecord/test/cases/quoting_test.rb b/activerecord/test/cases/quoting_test.rb
index 4cb38118c9..80ee74e41e 100644
--- a/activerecord/test/cases/quoting_test.rb
+++ b/activerecord/test/cases/quoting_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 
 module ActiveRecord
   module ConnectionAdapters
diff --git a/activerecord/test/cases/readonly_test.rb b/activerecord/test/cases/readonly_test.rb
index 88168776b1..e21109baae 100644
--- a/activerecord/test/cases/readonly_test.rb
+++ b/activerecord/test/cases/readonly_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/developer'
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index c7288baaba..58c78ab058 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 require 'models/customer'
 require 'models/company'
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index 5067384fb6..a6e08f95d0 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/author'
 require 'models/developer'
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 5ad089c875..12e58bd340 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index ecc68b19d4..fc9df8c7a3 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/tag'
 require 'models/tagging'
 require 'models/post'
diff --git a/activerecord/test/cases/reload_models_test.rb b/activerecord/test/cases/reload_models_test.rb
index 0ac46a2768..0d16a3526f 100644
--- a/activerecord/test/cases/reload_models_test.rb
+++ b/activerecord/test/cases/reload_models_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/owner'
 require 'models/pet'
 
diff --git a/activerecord/test/cases/sanitize_test.rb b/activerecord/test/cases/sanitize_test.rb
index 7c30bcf4c8..817897ceac 100644
--- a/activerecord/test/cases/sanitize_test.rb
+++ b/activerecord/test/cases/sanitize_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/binary'
 
 class SanitizeTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index e765fdfe70..4adecf8e83 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'stringio'
 
 
diff --git a/activerecord/test/cases/serialization_test.rb b/activerecord/test/cases/serialization_test.rb
index 9c976f4999..677d659f39 100644
--- a/activerecord/test/cases/serialization_test.rb
+++ b/activerecord/test/cases/serialization_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/contact'
 require 'models/topic'
 require 'models/reply'
diff --git a/activerecord/test/cases/session_store/session_test.rb b/activerecord/test/cases/session_store/session_test.rb
index fb6f4cfd44..669c0b7b4d 100644
--- a/activerecord/test/cases/session_store/session_test.rb
+++ b/activerecord/test/cases/session_store/session_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require 'cases/helper'
 require 'action_dispatch'
 require 'active_record/session_store'
 
diff --git a/activerecord/test/cases/session_store/sql_bypass.rb b/activerecord/test/cases/session_store/sql_bypass.rb
index 97ccb1f5c9..7402b2afd6 100644
--- a/activerecord/test/cases/session_store/sql_bypass.rb
+++ b/activerecord/test/cases/session_store/sql_bypass.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require 'cases/helper'
 require 'action_dispatch'
 require 'active_record/session_store'
 
diff --git a/activerecord/test/cases/timestamp_test.rb b/activerecord/test/cases/timestamp_test.rb
index ce6419c0da..ceb1452afd 100644
--- a/activerecord/test/cases/timestamp_test.rb
+++ b/activerecord/test/cases/timestamp_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require 'cases/helper'
 require 'models/developer'
 require 'models/owner'
 require 'models/pet'
diff --git a/activerecord/test/cases/transaction_callbacks_test.rb b/activerecord/test/cases/transaction_callbacks_test.rb
index 2d88e660b3..85f222bca2 100644
--- a/activerecord/test/cases/transaction_callbacks_test.rb
+++ b/activerecord/test/cases/transaction_callbacks_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 
 class TransactionCallbacksTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index fa33ffaed3..110a18772f 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 require 'models/developer'
diff --git a/activerecord/test/cases/unconnected_test.rb b/activerecord/test/cases/unconnected_test.rb
index a6aaf1eb3d..f85fb4e5da 100644
--- a/activerecord/test/cases/unconnected_test.rb
+++ b/activerecord/test/cases/unconnected_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 
 class TestRecord < ActiveRecord::Base
 end
diff --git a/activerecord/test/cases/validations/association_validation_test.rb b/activerecord/test/cases/validations/association_validation_test.rb
index 45290680f9..56e345990f 100644
--- a/activerecord/test/cases/validations/association_validation_test.rb
+++ b/activerecord/test/cases/validations/association_validation_test.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 require 'models/owner'
diff --git a/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb b/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
index 922fb5dce7..628029f8df 100644
--- a/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
+++ b/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 
 class I18nGenerateMessageValidationTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/validations/i18n_validation_test.rb b/activerecord/test/cases/validations/i18n_validation_test.rb
index 46f0c3c49d..15b97c02c8 100644
--- a/activerecord/test/cases/validations/i18n_validation_test.rb
+++ b/activerecord/test/cases/validations/i18n_validation_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 
diff --git a/activerecord/test/cases/validations/uniqueness_validation_test.rb b/activerecord/test/cases/validations/uniqueness_validation_test.rb
index 218f673451..0f1b3667cc 100644
--- a/activerecord/test/cases/validations/uniqueness_validation_test.rb
+++ b/activerecord/test/cases/validations/uniqueness_validation_test.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('../../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 require 'models/warehouse_thing'
diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
index 8764a22d40..c3e494866b 100644
--- a/activerecord/test/cases/validations_test.rb
+++ b/activerecord/test/cases/validations_test.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 require 'models/person'
diff --git a/activerecord/test/cases/xml_serialization_test.rb b/activerecord/test/cases/xml_serialization_test.rb
index c48957e7a7..756c8a32eb 100644
--- a/activerecord/test/cases/xml_serialization_test.rb
+++ b/activerecord/test/cases/xml_serialization_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/contact'
 require 'models/post'
 require 'models/author'
diff --git a/activerecord/test/cases/yaml_serialization_test.rb b/activerecord/test/cases/yaml_serialization_test.rb
index 6caa782a97..0b54c309d1 100644
--- a/activerecord/test/cases/yaml_serialization_test.rb
+++ b/activerecord/test/cases/yaml_serialization_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require "cases/helper"
 require 'models/topic'
 
 class YamlSerializationTest < ActiveRecord::TestCase
-- 
cgit v1.2.3