Skip to content

Commit 1f95f23

Browse files
committed
[Azure] Core tests friendly.
1 parent 4517ba6 commit 1f95f23

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

lib/active_record/connection_adapters/sqlserver/database_statements.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ def user_options_isolation_level
179179
if sqlserver_azure?
180180
sql = %(SELECT CASE [transaction_isolation_level]
181181
WHEN 0 THEN NULL
182-
WHEN 1 THEN 'READ UNCOMITTED'
183-
WHEN 2 THEN 'READ COMITTED'
182+
WHEN 1 THEN 'READ UNCOMMITTED'
183+
WHEN 2 THEN 'READ COMMITTED'
184184
WHEN 3 THEN 'REPEATABLE READ'
185185
WHEN 4 THEN 'SERIALIZABLE'
186186
WHEN 5 THEN 'SNAPSHOT' END AS [isolation_level]

test/cases/adapter_test_sqlserver.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
240240
describe 'database statements' do
241241

242242
it "run the database consistency checker useroptions command" do
243+
skip 'on azure' if connection_sqlserver_azure?
243244
keys = [:textsize, :language, :isolation_level, :dateformat]
244245
user_options = connection.user_options
245246
keys.each do |key|
@@ -249,6 +250,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
249250
end
250251

251252
it "return a underscored key hash with indifferent access of the results" do
253+
skip 'on azure' if connection_sqlserver_azure?
252254
user_options = connection.user_options
253255
assert_equal 'read committed', user_options['isolation_level']
254256
assert_equal 'read committed', user_options[:isolation_level]

test/cases/rake_test_sqlserver.rb

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,25 @@ class SQLServerRakeTest < ActiveRecord::TestCase
44

55
self.use_transactional_fixtures = false
66

7+
cattr_accessor :azure_skip
8+
self.azure_skip = connection_sqlserver_azure?
9+
710
let(:db_tasks) { ActiveRecord::Tasks::DatabaseTasks }
811
let(:new_database) { 'activerecord_unittest_tasks' }
912
let(:default_configuration) { ARTest.connection_config['arunit'] }
1013
let(:configuration) { default_configuration.merge('database' => new_database) }
1114

12-
before do
15+
before { skip 'on azure' if azure_skip }
16+
before { disconnect! unless azure_skip }
17+
after { reconnect unless azure_skip }
18+
19+
private
20+
21+
def disconnect!
1322
connection.disconnect!
1423
end
1524

16-
after do
25+
def reconnect
1726
ActiveRecord::Base.establish_connection(default_configuration)
1827
connection.drop_database(new_database) rescue nil
1928
end

test/cases/transaction_test_sqlserver.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ class TransactionTestSQLServer < ActiveRecord::TestCase
3535
begin
3636
in_level = nil
3737
begin_level = connection.user_options_isolation_level
38-
begin_level.must_match %r{read committed}
38+
begin_level.must_match %r{read committed}i
3939
Ship.transaction(isolation: :serializable) do
4040
Ship.create! name: 'Black Pearl'
4141
in_level = connection.user_options_isolation_level
4242
end
4343
after_level = connection.user_options_isolation_level
4444
in_level.must_match %r{serializable}i
45-
after_level.must_match %r{read committed}
45+
after_level.must_match %r{read committed}i
4646
ensure
4747
connection.set_transaction_isolation_level 'READ COMMITTED'
4848
end

0 commit comments

Comments
 (0)