Skip to content

Commit a764ac1

Browse files
author
lawrence
committed
SQLServer tests fix due to change 8681. Closes #11106. [h-lame]
git-svn-id: http://dev.rubyonrails.org/svn/rails/adapters/sqlserver@8868 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1 parent b9e10a5 commit a764ac1

File tree

4 files changed

+11
-14
lines changed

4 files changed

+11
-14
lines changed

test/aaaa_create_tables_test_sqlserver.rb

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# The filename begins with "aaaa" to ensure this is the first test.
2-
require 'abstract_unit'
2+
require 'cases/helper'
33

4-
class AAAACreateTablesTestSqlserver < Test::Unit::TestCase
4+
class AAAACreateTablesTestSqlserver < ActiveRecord::TestCase
55
self.use_transactional_fixtures = false
66

77
def setup
8-
@ar_path = "../../../rails/activerecord/test/fixtures/db_definitions"
8+
@ar_path = "../../../rails/activerecord/test/schema"
99
@base_path = "#{File.dirname(__FILE__)}/fixtures/db_definitions"
1010
end
1111

@@ -17,15 +17,12 @@ def test_sqlserver_load_test_schema
1717
assert true
1818
end
1919

20-
#FUTURE
2120
def __test_activerecord_load_test_schema
22-
#FUTURE: eval(File.read("#{@ar_path}/schema.rb"))
23-
eval(File.read("#{@base_path}/schema.rb"))
21+
eval(File.read("#{@ar_path}/schema.rb"))
2422
connection = ActiveRecord::Base.connection
2523
begin
2624
ActiveRecord::Base.connection = Course.connection
27-
#FUTURE: eval(File.read("#{@ar_path}/schema2.rb"))
28-
eval(File.read("#{@base_path}/schema2.rb"))
25+
eval(File.read("#{@ar_path}/schema2.rb"))
2926
ensure
3027
ActiveRecord::Base.connection = connection
3128
end

test/affected_rows_test_sqlserver.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
require 'abstract_unit'
2-
require 'fixtures/topic'
3-
require 'fixtures/reply'
1+
require 'cases/helper'
2+
require 'models/topic'
3+
require 'models/reply'
44

5-
class AffectedRowsTestSqlserver < Test::Unit::TestCase
5+
class AffectedRowsTestSqlserver < ActiveRecord::TestCase
66
self.use_transactional_fixtures = false
77
fixtures :topics
88

test/connections/native_sqlserver/connection.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
print "Using native SQLServer\n"
2-
require_dependency 'fixtures/course'
2+
require_dependency 'models/course'
33
require 'logger'
44

55
ActiveRecord::Base.logger = Logger.new("debug.log")

test/connections/native_sqlserver_odbc/connection.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
print "Using native SQLServer via ODBC\n"
2-
require_dependency 'fixtures/course'
2+
require_dependency 'models/course'
33
require 'logger'
44

55
ActiveRecord::Base.logger = Logger.new("debug.log")

0 commit comments

Comments
 (0)