Simplify testing. Make AR tests not run by default.

Author: metaskills

Gemfile

@@ -11,7 +11,7 @@ group :tinytds do
   if ENV['TINYTDS_SOURCE']
     gem 'tiny_tds', :path => ENV['TINYTDS_SOURCE']
   else
-    gem 'tiny_tds'
+    gem 'tiny_tds', '>= 0.4.5'
   end
 end
 
@@ -24,12 +24,5 @@ group :development do
   gem 'mocha', '0.9.8'
   gem 'shoulda', '2.10.3'
   gem 'bench_press'
-  platforms :mri_18 do
-    gem 'ruby-prof', '0.9.1'
-    gem 'ruby-debug', '0.10.3'
-  end
-  platforms :mri_19 do
-    gem 'ruby-debug19', '0.11.6'
-  end
 end
 

Rakefile

@@ -12,7 +12,7 @@ end
 
 def test_files
   files = Dir.glob("test/cases/**/*_test_sqlserver.rb").sort
-  unless ENV['ACTIVERECORD_UNITTEST_SKIP']
+  if ENV['ACTIVERECORD_UNITTEST']
     ar_cases = Dir.glob("#{ENV['RAILS_SOURCE']}/activerecord/test/cases/**/*_test.rb")
     adapter_cases = Dir.glob("#{ENV['RAILS_SOURCE']}/activerecord/test/cases/adapters/**/*_test.rb")
     files += (ar_cases-adapter_cases).sort

test/cases/migration_test_sqlserver.rb

@@ -80,5 +80,5 @@ def test_coerced_string_creates_string_column
       @connection.expects(:add_column).with(:delete_me, :bar, 'nvarchar(255)', {})
       t.string :foo, :bar
     end
-  end
+  end if run_ar_tests?
 end

test/cases/sqlserver_helper.rb

@@ -12,11 +12,6 @@
 Bundler.setup
 require 'shoulda'
 require 'mocha'
-begin ; require 'ruby-debug' ; rescue LoadError ; end
-[ File.expand_path(File.join(File.dirname(__FILE__),'..','..','test')),
-  File.expand_path(File.join(File.dirname(__FILE__),'..','..','test','connections','native_sqlserver_odbc')),
-  File.expand_path(File.join(ENV['RAILS_SOURCE'],'activerecord','test'))
-].each{ |lib| $:.unshift(lib) unless $:.include?(lib) } if ENV['TM_DIRECTORY']
 require 'cases/helper'
 require 'models/topic'
 require 'active_record/version'
@@ -92,13 +87,15 @@ class SQLCounter
 module ActiveRecord 
   class TestCase < ActiveSupport::TestCase
     class << self
+      def run_ar_tests? ; ENV['ACTIVERECORD_UNITTEST'].present? ; end
       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
       def ruby_19? ; RUBY_VERSION >= '1.9' ; end
     end
+    def run_ar_tests? ; self.class.run_ar_tests? ; 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