The tests now run with rails 4.1.0

removing duplicate standard_dump

Author: Anna Carey

Gemfile

@@ -41,7 +41,8 @@ group :development do
   gem 'bcrypt-ruby', '~> 3.0.0'
   gem 'bench_press'
   gem 'mocha'
-  gem 'minitest-spec-rails'
+  # TODO: Change back when it's ready
+  gem 'minitest-spec-rails', git: "https://github.com/metaskills/minitest-spec-rails.git"
   gem 'nokogiri'
   gem 'rake', '~> 0.9.2'
   gem 'rubocop'

VERSION

@@ -1 +1 @@
-4.0.0
+4.1.0.pre

activerecord-sqlserver-adapter.gemspec

@@ -1,20 +1,21 @@
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+$:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
-  s.name          = 'activerecord-sqlserver-adapter'
-  s.version       = File.read(File.expand_path('../VERSION', __FILE__)).strip
-  s.summary       = 'ActiveRecord SQL Server Adapter. For SQL Server 2005 And Higher.'
-  s.description   = 'ActiveRecord SQL Server Adapter. For SQL Server 2005 And Higher.'
-
-  s.authors       = ['Ken Collins', 'Anna Carey', 'Murray Steele', 'Shawn Balestracci', 'Joe Rafaniello', 'Tom Ward']
-  s.email         = 'ken@metaskills.net'
-  s.homepage      = 'http://github.com/rails-sqlserver/activerecord-sqlserver-adapter'
-
-  s.files         = Dir['CHANGELOG', 'MIT-LICENSE', 'README.rdoc', 'VERSION', 'lib/**/*']
+  s.name          = "activerecord-sqlserver-adapter"
+  s.version       = File.read(File.expand_path("../VERSION",__FILE__)).strip
+  s.summary       = "ActiveRecord SQL Server Adapter. For SQL Server 2005 And Higher."
+  s.description   = "ActiveRecord SQL Server Adapter. For SQL Server 2005 And Higher."
+  
+  s.authors       = ['Ken Collins', 'Murray Steele', 'Shawn Balestracci', 'Joe Rafaniello', 'Tom Ward']
+  s.email         = "ken@metaskills.net"
+  s.homepage      = "http://github.com/rails-sqlserver/activerecord-sqlserver-adapter"
+  
+  s.files         = Dir['CHANGELOG', 'MIT-LICENSE', 'README.rdoc', 'VERSION', 'lib/**/*' ]
   s.require_path  = 'lib'
   s.rubyforge_project = 'activerecord-sqlserver-adapter'
-
-  s.add_dependency('activerecord', '~> 4.0.0')
-  s.add_dependency('arel', '~> 4.0.1')
+  
+  s.add_dependency('activerecord', '~> 4.1.0')
+  s.add_dependency('arel')
 end
+

test/cases/schema_dumper_test_sqlserver.rb

@@ -1,6 +1,8 @@
 require 'cases/sqlserver_helper'
+require 'cases/schema_dumper_test'
 require 'stringio'
 
+
 class SchemaDumperTestSqlserver < ActiveRecord::TestCase
 
   setup :find_all_tables
@@ -96,15 +98,6 @@ def test_coerced_types_line_up
     end
   end
 
-  private
-
-  def standard_dump
-    stream = StringIO.new
-    ActiveRecord::SchemaDumper.ignore_tables = []
-    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-    stream.string
-  end
-
 end
 
 

test/cases/sqlserver_helper.rb

@@ -24,6 +24,7 @@
 require 'active_record/version'
 require 'active_record/connection_adapters/abstract_adapter'
 require 'minitest-spec-rails'
+require 'minitest-spec-rails/init/active_support'
 require 'minitest-spec-rails/init/mini_shoulda'
 require 'cases/helper'
 require 'models/topic'

test/cases/sqlserver_test_case.rb

@@ -1,4 +1,4 @@
-require 'active_record/test_case.rb'
+require 'cases/test_case.rb'
 
 # TODO: I'm struggling to figure out how to unsubscribe from only one 'sql.active_record'
 # This is a temporary hack until we can just get the sqlserver_ignored regex in rails