Adding Guard. Terse and un-memoized path helpers.

Author: metaskills

Guardfile

@@ -0,0 +1,13 @@
+require_relative 'test/support/paths_sqlserver'
+
+guard :minitest, {
+  all_on_start: false,
+  autorun: false,
+  include: ['lib', 'test', File.join(ARTest::Sqlserver.root_activerecord, 'lib'), File.join(ARTest::Sqlserver.root_activerecord, 'test')],
+  test_folders: ['test'],
+  test_file_patterns: ["*_test_sqlserver.rb"],
+} do
+  watch(%r{^test/cases/\w+_test_sqlserver.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

Rakefile

@@ -1,25 +1,18 @@
-require 'rake'
 require 'rake/testtask'
-
-AR_PATH = Gem.loaded_specs['activerecord'].full_gem_path
-
-# Since the Gemfile for this project requires, rails, it ends up causing
-# Rails.env to be defined, which affects some of the unit tests. We fix this
-# by setting the RAILS_ENV to "default_env"
-ENV['RAILS_ENV'] = 'default_env'
+require_relative 'test/support/paths_sqlserver'
 
 def test_libs
-  ar_lib = File.join AR_PATH, 'lib'
-  ar_test = File.join AR_PATH, 'test'
+  ar_lib = File.join ARTest::Sqlserver.root_activerecord, 'lib'
+  ar_test = File.join ARTest::Sqlserver.root_activerecord, 'test'
   ['lib', 'test', ar_lib, ar_test]
 end
 
 def test_files
   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")
-  adapter_cases = Dir.glob("#{AR_PATH}/test/cases/adapters/**/*_test.rb")
+  ar_cases = Dir.glob("#{ARTest::Sqlserver.root_activerecord}/test/cases/**/*_test.rb")
+  adapter_cases = Dir.glob("#{ARTest::Sqlserver.root_activerecord}/test/cases/adapters/**/*_test.rb")
   if ENV['SQLSERVER_ONLY']
     sqlserver_cases
   elsif ENV['ACTIVERECORD_ONLY']

activerecord-sqlserver-adapter.gemspec

@@ -17,9 +17,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.add_dependency 'activerecord', '~> 4.2.0'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'minitest-spec-rails'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'nokogiri'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake'
 end

test/cases/helper_sqlserver.rb

@@ -5,6 +5,7 @@
 require 'support/load_schema_sqlserver'
 require 'support/coerced_test_sqlserver'
 require 'support/sql_counter_sqlserver'
+require 'mocha/mini_test'
 
 module ActiveRecord
   class TestCase < ActiveSupport::TestCase
@@ -51,5 +52,3 @@ def with_auto_connect(boolean)
 
   end
 end
-
-require 'mocha/mini_test'

test/support/paths_sqlserver.rb

@@ -3,18 +3,20 @@ module Sqlserver
 
     extend self
 
+    def root_sqlserver
+      File.expand_path File.join(File.dirname(__FILE__), '..', '..')
+    end
+
     def test_root_sqlserver
-      @test_root_sqlserver ||= begin
-        root = File.join File.dirname(__FILE__), '..'
-        File.expand_path(root)
-      end
+      File.join root_sqlserver, 'test'
+    end
+
+    def root_activerecord
+      Gem.loaded_specs['activerecord'].full_gem_path
     end
 
     def test_root_activerecord
-      @test_root_activerecord ||= begin
-        gem_root = Gem.loaded_specs['activerecord'].full_gem_path
-        File.join gem_root, 'test'
-      end
+      File.join root_activerecord, 'test'
     end
 
     def test_root_activerecord_add_to_load_path
@@ -23,15 +25,15 @@ def test_root_activerecord_add_to_load_path
     end
 
     def migrations_root
-      @migrations_root ||= File.join test_root_sqlserver, 'migrations'
+      File.join test_root_sqlserver, 'migrations'
     end
 
     def arconfig_file
-      @arconfig_file ||= File.join test_root_sqlserver, 'config.yml'
+      File.join test_root_sqlserver, 'config.yml'
     end
 
     def arconfig_file_env!
-      ENV['ARCONFIG'] = ARTest::Sqlserver.arconfig_file
+      ENV['ARCONFIG'] = arconfig_file
     end
 
   end