Rename 'cases/sqlserver_helper' to our suffix convention 'cases/helper_sqlserver'.

metaskills · metaskills · commit d60859457550 · 2015-01-01T09:54:07.000-05:00
diff --git a/Rakefile b/Rakefile
@@ -15,7 +15,7 @@ def test_libs
 end
 
 def test_files
-  test_setup = ['test/cases/sqlserver_helper.rb']
+  test_setup = ['test/cases/helper_sqlserver.rb']
   return test_setup + (ENV['TEST_FILES']).split(',') if ENV['TEST_FILES']
   sqlserver_cases = Dir.glob('test/cases/**/*_test_sqlserver.rb')
   ar_cases = Dir.glob("#{AR_PATH}/test/cases/**/*_test.rb")
diff --git a/test/cases/adapter_test_sqlserver.rb b/test/cases/adapter_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/task'
 require 'models/reply'
 require 'models/joke'
diff --git a/test/cases/associations_test_sqlserver.rb b/test/cases/associations_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/owner'
 
 class HasManyThroughAssociationsTest <  ActiveRecord::TestCase
diff --git a/test/cases/attribute_methods_test_sqlserver.rb b/test/cases/attribute_methods_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/developer'
 require 'models/topic'
 require 'models_sqlserver/topic'
diff --git a/test/cases/base_test_sqlserver.rb b/test/cases/base_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/post'
 require 'models/auto_id'
 
diff --git a/test/cases/batches_test_sqlserver.rb b/test/cases/batches_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/post'
 
 class BatchesTestSqlserver < ActiveRecord::TestCase
diff --git a/test/cases/belongs_to_associations_test_sqlserver.rb b/test/cases/belongs_to_associations_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 
 class BelongsToAssociationsTestSqlserver < ActiveRecord::TestCase
 end
diff --git a/test/cases/bind_parameter_test_sqlserver.rb b/test/cases/bind_parameter_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/topic'
 require 'models_sqlserver/topic'
 require 'cases/bind_parameter_test'
diff --git a/test/cases/calculations_test_sqlserver.rb b/test/cases/calculations_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/company'
 require 'models/topic'
 require 'models/edge'
diff --git a/test/cases/column_test_sqlserver.rb b/test/cases/column_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/binary'
 require 'models_sqlserver/float_data'
 require 'models_sqlserver/numeric_data'
diff --git a/test/cases/connection_management_test_sqlserver.rb b/test/cases/connection_management_test_sqlserver.rb
@@ -1,6 +1,6 @@
 #This rails pull request will make this code unnecessary https://github.com/rails/rails/pull/13745
 
-require "cases/sqlserver_helper"
+require "cases/helper_sqlserver"
 require "rack"
 
 module ActiveRecord
diff --git a/test/cases/connection_test_sqlserver.rb b/test/cases/connection_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/reply'
 require 'models_sqlserver/topic'
 
diff --git a/test/cases/database_statements_test_sqlserver.rb b/test/cases/database_statements_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 
 class DatabaseStatementsTestSqlserver < ActiveRecord::TestCase
 
diff --git a/test/cases/disconnected_test_sqlserver.rb b/test/cases/disconnected_test_sqlserver.rb
@@ -1,6 +1,6 @@
 if Pathname.new("#{ACTIVERECORD_TEST_ROOT}/cases/disconnected_test.rb").exist?
   #cases/disconnected_test was added in rails 4.0.1 so this errors in 4.0.0
-  require 'cases/sqlserver_helper'
+  require 'cases/helper_sqlserver'
   require 'cases/disconnected_test'
 
   class TestDisconnectedAdapter < ActiveRecord::TestCase
diff --git a/test/cases/eager_test_sqlserver.rb b/test/cases/eager_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/post'
 require 'models/comment'
 require 'models/author'
diff --git a/test/cases/execute_procedure_test_sqlserver.rb b/test/cases/execute_procedure_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 
 class ExecuteProcedureTestSqlserver < ActiveRecord::TestCase
 
diff --git a/test/cases/finder_test_sqlserver.rb b/test/cases/finder_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/event'
 require 'models/author'
 require 'models/post'
diff --git a/test/cases/has_and_belongs_to_many_associations_test_sqlserver.rb b/test/cases/has_and_belongs_to_many_associations_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 
 class HasAndBelongsToManyAssociationsTestSqlserver < ActiveRecord::TestCase
 end
diff --git a/test/cases/helper_sqlserver.rb b/test/cases/helper_sqlserver.rb
@@ -18,13 +18,8 @@
 require 'minitest-spec-rails/init/active_support'
 require 'minitest-spec-rails/init/mini_shoulda'
 require 'cases/helper'
-require 'models/topic'
 require 'cases/sqlserver_test_case'
 
-ActiveRecord::Migration.verbose = false
-ActiveRecord::Base.logger = Logger.new(File.expand_path(File.join(SQLSERVER_TEST_ROOT,'debug.log')))
-ActiveRecord::Base.logger.level = 0
-
 # A module that we can include in classes where we want to override an active record test.
 #
 module SqlserverCoercedTest
@@ -63,21 +58,25 @@ def undefine_and_puts(method)
 
 module ActiveRecord
   class TestCase < ActiveSupport::TestCase
+
     class << self
       def connection_mode_dblib? ; ActiveRecord::Base.connection.instance_variable_get(:@connection_options)[:mode] == :dblib ; end
       def connection_mode_odbc? ; ActiveRecord::Base.connection.instance_variable_get(:@connection_options)[:mode] == :odbc ; end
       def sqlserver_2005? ; ActiveRecord::Base.connection.sqlserver_2005? ; end
       def sqlserver_2008? ; ActiveRecord::Base.connection.sqlserver_2008? ; end
       def sqlserver_azure? ; ActiveRecord::Base.connection.sqlserver_azure? ; end
     end
+
     def connection_mode_dblib? ; self.class.connection_mode_dblib? ; end
     def connection_mode_odbc? ; self.class.connection_mode_odbc? ; end
     def sqlserver_2005? ; self.class.sqlserver_2005? ; end
     def sqlserver_2008? ; self.class.sqlserver_2008? ; end
     def sqlserver_azure? ; self.class.sqlserver_azure? ; end
+
     def with_enable_default_unicode_types?
       ActiveRecord::ConnectionAdapters::SQLServerAdapter.enable_default_unicode_types.is_a?(TrueClass)
     end
+
     def with_enable_default_unicode_types(setting)
       old_setting = ActiveRecord::ConnectionAdapters::SQLServerAdapter.enable_default_unicode_types
       old_text = ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_text_database_type
@@ -96,18 +95,15 @@ def with_auto_connect(boolean)
       existing = ActiveRecord::ConnectionAdapters::SQLServerAdapter.auto_connect
       ActiveRecord::ConnectionAdapters::SQLServerAdapter.auto_connect = boolean
       yield
-      ensure
-        ActiveRecord::ConnectionAdapters::SQLServerAdapter.auto_connect = existing
+    ensure
+      ActiveRecord::ConnectionAdapters::SQLServerAdapter.auto_connect = existing
     end
+
   end
 end
 
 require 'mocha/mini_test'
 
-# Core AR.
-schema_file = "#{ACTIVERECORD_TEST_ROOT}/schema/schema.rb"
-eval(File.read(schema_file))
-
 # SQL Server.
 sqlserver_specific_schema_file = "#{SQLSERVER_SCHEMA_ROOT}/sqlserver_specific_schema.rb"
-eval(File.read(sqlserver_specific_schema_file))
+eval(File.read(sqlserver_specific_schema_file)) unless ENV["SKIP_SCHEMA"]
diff --git a/test/cases/inheritance_test_sqlserver.rb b/test/cases/inheritance_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/company'
 require 'models/project'
 require 'models/subscriber'
diff --git a/test/cases/invalid_connection_test_sqlserver.rb b/test/cases/invalid_connection_test_sqlserver.rb
@@ -1,6 +1,6 @@
 #cases/invalid_connection_test was added in rails 4.0.1
 if Pathname.new("#{ACTIVERECORD_TEST_ROOT}/cases/invalid_connection_test.rb").exist?
-  require 'cases/sqlserver_helper'
+  require 'cases/helper_sqlserver'
   require 'cases/invalid_connection_test'
 
   class TestAdapterWithInvalidConnection < ActiveRecord::TestCase
diff --git a/test/cases/migration_test_sqlserver.rb b/test/cases/migration_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/person'
 require 'models_sqlserver/person'
 
diff --git a/test/cases/named_scoping_test_sqlserver.rb b/test/cases/named_scoping_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/post'
 require 'models_sqlserver/post'
 
diff --git a/test/cases/offset_and_limit_test_sqlserver.rb b/test/cases/offset_and_limit_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/job'
 require 'models/person'
 require 'models/reference'
diff --git a/test/cases/order_test_sqlserver.rb b/test/cases/order_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/post'
 
 class OrderTestSqlserver < ActiveRecord::TestCase
diff --git a/test/cases/persistence_test_sqlserver.rb b/test/cases/persistence_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/post'
 require 'models/comment'
 require 'models/author'
diff --git a/test/cases/pessimistic_locking_test_sqlserver.rb b/test/cases/pessimistic_locking_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/person'
 require 'models/reader'
 require 'models_sqlserver/person'
diff --git a/test/cases/predicate_builder_test_sqlserver.rb b/test/cases/predicate_builder_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/topic'
 require 'models_sqlserver/topic'
 
diff --git a/test/cases/query_cache_test_sqlserver.rb b/test/cases/query_cache_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/task'
 
 class QueryCacheTestSqlserver < ActiveRecord::TestCase
diff --git a/test/cases/relations_test_sqlserver.rb b/test/cases/relations_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require "cases/sqlserver_helper"
+require "cases/helper_sqlserver"
 require 'models/post'
 
 
diff --git a/test/cases/schema_dumper_test_sqlserver.rb b/test/cases/schema_dumper_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'cases/schema_dumper_test'
 require 'stringio'
 
diff --git a/test/cases/schema_test_sqlserver.rb b/test/cases/schema_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models_sqlserver/sql_server_natural_pk_data'
 require 'models_sqlserver/sql_server_natural_pk_data_schema'
 
diff --git a/test/cases/scratch_test_sqlserver.rb b/test/cases/scratch_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 
 class ScratchTestSqlserver < ActiveRecord::TestCase
 
diff --git a/test/cases/session_test_sqlserver.rb b/test/cases/session_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'action_dispatch'
 
 module ActiveRecord
diff --git a/test/cases/showplan_test_sqlserver.rb b/test/cases/showplan_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/car'
 
 class ShowplanTestSqlserver < ActiveRecord::TestCase
diff --git a/test/cases/specific_schema_test_sqlserver.rb b/test/cases/specific_schema_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models_sqlserver/no_pk_data'
 require 'models_sqlserver/sql_server_dollar_table_name'
 require 'models_sqlserver/sql_server_edge_schema'
diff --git a/test/cases/table_name_test_sqlserver.rb b/test/cases/table_name_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/order'
 
 class SqlServerRailsOrders < ActiveRecord::Base
diff --git a/test/cases/transaction_test_sqlserver.rb b/test/cases/transaction_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/ship'
 require 'models/developer'
 
diff --git a/test/cases/unicode_test_sqlserver.rb b/test/cases/unicode_test_sqlserver.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 
 class UnicodeTestSqlserver < ActiveRecord::TestCase
 
diff --git a/test/cases/uniqueness_validation_test_sqlserver.rb b/test/cases/uniqueness_validation_test_sqlserver.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/event'
 
 class Event < ActiveRecord::Base
diff --git a/test/cases/uuid_test_sqlserver.rb b/test/cases/uuid_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 
 class SQLServerUUIDTest < ActiveRecord::TestCase
   class UUID < ActiveRecord::Base
diff --git a/test/cases/where_chain_test_sqlserver.rb b/test/cases/where_chain_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'cases/sqlserver_helper'
+require 'cases/helper_sqlserver'
 require 'models/post'
 require 'models/comment'
 
@@ -14,4 +14,4 @@ def test_coerced_not_eq_with_array_parameter
       assert_equal([expected], relation.where_values)
     end
   end
-end
+end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require 'cases/sqlserver_helper'`
	`1`	`+require 'cases/helper_sqlserver'`
`2`	`2`	`require 'models/task'`
`3`	`3`	`require 'models/reply'`
`4`	`4`	`require 'models/joke'`