New way to coerce tests. Always after AR.

Author: metaskills

Guardfile

@@ -11,16 +11,16 @@ guard :minitest, {
   autorun: false,
   include: ['lib', 'test', ar_lib, ar_test],
   test_folders: ['test'],
-  test_file_patterns: ["*_test.rb", "*_test_sqlserver.rb"]
+  test_file_patterns: ["*_test.rb", "*_test_sqlserver.rb", "*_tests.rb"]
 } do
   # Our project watchers.
   if ENV['FOCUS_TEST']
     ENV['FOCUS_TEST'].split(',').map(&:strip).each do |file|
       watch(%r{.*}) { file }
     end
   else
-    watch(%r{^test/cases/\w+_test_sqlserver.rb$})
-    watch(%r{^test/cases/coerced/\w+_test.rb$})
+    watch(%r{^test/cases/\w+_test_sqlserver\.rb$})
+    watch(%r{^test/cases/coerced_tests\.rb$}) { "test/cases/coerced_tests.rb" }
     watch(%r{^lib/active_record/connection_adapters/sqlserver/([^/]+)\.rb$})  { |m| "test/cases/#{m[1]}_test_sqlserver.rb" }
     watch(%r{^test/cases/helper_sqlserver\.rb$}) { 'test' }
   end

test/cases/coerced/sanitize_test.rb

@@ -0,0 +1,37 @@
+require 'cases/helper_sqlserver'
+
+
+require 'models/post'
+class SanitizeTest < ActiveRecord::TestCase
+
+  coerce_tests :test_sanitize_sql_like_example_use_case
+
+  def test_sanitize_sql_like_example_use_case_coerced
+    searchable_post = Class.new(Post) do
+      def self.search(term)
+        where("title LIKE ?", sanitize_sql_like(term, '!'))
+      end
+    end
+    assert_sql(/\(title LIKE N''20!% !_reduction!_!!''\)/) do
+      searchable_post.search("20% _reduction_!").to_a
+    end
+  end
+
+end
+
+
+require 'models/author'
+class YamlSerializationTest < ActiveRecord::TestCase
+
+  fixtures :authors
+
+  coerce_tests :test_types_of_virtual_columns_are_not_changed_on_round_trip
+
+  def test_types_of_virtual_columns_are_not_changed_on_round_trip_coerced
+    author = Author.select('authors.*, 5 as posts_count').first
+    dumped = YAML.load(YAML.dump(author))
+    assert_equal 5, author.posts_count
+    assert_equal 5, dumped.posts_count
+  end
+
+end

test/cases/coerced_tests.rb

@@ -10,6 +10,8 @@
 module ActiveRecord
   class TestCase < ActiveSupport::TestCase
 
+    include ARTest::SQLServer::CoercedTest
+
     let(:logger) { ActiveRecord::Base.logger }
     let(:connection) { ActiveRecord::Base.connection }
 

test/cases/helper_sqlserver.rb

@@ -2,36 +2,39 @@ module ARTest
   module SQLServer
     module CoercedTest
 
-      def self.included(base)
-        base.extend ClassMethods
+      extend ActiveSupport::Concern
+
+      included do
+        cattr_accessor :coerced_tests, instance_accessor: false
+        self.coerced_tests = []
       end
 
       module ClassMethods
 
-        def self.extended(base)
-          base.class_eval do
-            Array(coerced_tests).each do |method_name|
-              undefine_and_puts(method_name)
-            end
+        def coerce_tests(*names)
+          names.each do |n|
+            self.coerced_tests.push(n)
+            coerce_test!(n)
           end
         end
 
-        def coerced_tests
-          self.const_get(:COERCED_TESTS) rescue nil
+        def coerce_test!(method)
+          coerced_test_warning(method)
         end
 
         def method_added(method)
-          if coerced_tests && coerced_tests.include?(method)
-            undefine_and_puts(method)
-          end
+          coerced_test_warning(method) if coerced_tests.include?(method.to_sym)
         end
 
-        def undefine_and_puts(method)
+        private
+
+        def coerced_test_warning(method)
           result = undef_method(method) rescue nil
           STDOUT.puts("Info: Undefined coerced test: #{self.name}##{method}") unless result.blank?
         end
 
       end
+
     end
   end
 end

test/support/coerced_test_sqlserver.rb

@@ -1,5 +1,6 @@
 
-SQLSERVER_TEST_HELPER = 'test/cases/helper_sqlserver.rb'
+SQLSERVER_HELPER = 'test/cases/helper_sqlserver.rb'
+SQLSERVER_COERCED = 'test/cases/coerced_tests.rb'
 
 def env_ar_test_files
   return unless ENV['TEST_FILES_AR'] && !ENV['TEST_FILES_AR'].empty?
@@ -19,26 +20,22 @@ def sqlserver_cases
   @sqlserver_cases ||= Dir.glob('test/cases/*_test_sqlserver.rb')
 end
 
-def ar_coerced
-  @ar_coerced ||= Dir.glob('test/cases/coerced/*test*.rb')
-end
-
 def ar_cases
   @ar_cases ||= begin
     all_cases = Dir.glob("#{ARTest::SQLServer.root_activerecord}/test/cases/**/*_test.rb")
     adapters_cases = Dir.glob("#{ARTest::SQLServer.root_activerecord}/test/cases/adapters/**/*_test.rb")
-    (all_cases - adapters_cases).sort.unshift(SQLSERVER_TEST_HELPER)
+    (all_cases - adapters_cases).sort
   end
 end
 
 def test_files
-  return env_ar_test_files.unshift(SQLSERVER_TEST_HELPER) if env_ar_test_files
+  return env_ar_test_files.unshift(SQLSERVER_HELPER) if env_ar_test_files
   return env_test_files if env_test_files
   if ENV['ONLY_SQLSERVER']
-    sqlserver_cases + ar_coerced
+    sqlserver_cases + [SQLSERVER_COERCED]
   elsif ENV['ONLY_ACTIVERECORD']
-    (ar_coerced + ar_cases).unshift(SQLSERVER_TEST_HELPER)
+    [SQLSERVER_HELPER] + (ar_cases + [SQLSERVER_COERCED])
   else
-    (ar_coerced + ar_cases + sqlserver_cases).unshift(SQLSERVER_TEST_HELPER)
+    [SQLSERVER_HELPER] + (ar_cases + [SQLSERVER_COERCED] + sqlserver_cases)
   end
 end