Skip to content

Commit 69b6808

Browse files
committed
Fixing a few tests in the move to better org. Also silence sqlserver specific schema which is noisy in adapter specfic tests.
1 parent 2dad784 commit 69b6808

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

test/cases/aaaa_create_tables_test_sqlserver.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
class AAAACreateTablesTestSqlserver < ActiveRecord::TestCase
55

66
def test_load_sqlserver_specific_schema
7-
eval(File.read(File.expand_path(File.join(File.dirname(__FILE__), '..', 'schema', 'sqlserver_specific_schema.rb'))))
7+
sqlserver_specific_schema_file = File.expand_path(File.join(File.dirname(__FILE__), '..', 'schema', 'sqlserver_specific_schema.rb'))
8+
ActiveRecord::Base.silence { eval(File.read(sqlserver_specific_schema_file)) }
89
assert true
910
end
1011

test/cases/adapter_test_sqlserver.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def setup
88
@connection = ActiveRecord::Base.connection
99
end
1010

11-
11+
1212
def test_update_sql_statement_invalid
1313
assert_raise(ActiveRecord::StatementInvalid) { Topic.connection.update_sql("UPDATE XXX") }
1414
end

test/cases/connection_test_sqlserver.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class ConnectionTestSqlserver < ActiveRecord::TestCase
66

77
self.use_transactional_fixtures = false
88

9-
fixtures :topics
9+
fixtures :topics, :accounts
1010

1111
def setup
1212
@connection = ActiveRecord::Base.connection

0 commit comments

Comments
 (0)