Skip to content

Commit 8bfd152

Browse files
committed
TEST ORDER IS NOW FIXED.
1 parent f264abd commit 8bfd152

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

activerecord-sqlserver-adapter.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
1818
spec.add_dependency 'activerecord', '~> 4.2.0'
1919
spec.add_development_dependency 'bundler'
2020
spec.add_development_dependency 'guard-minitest'
21+
spec.add_development_dependency 'minitest', '< 5.3.4' # PENDING: [Rails5.x] Remove test order constraint.
2122
spec.add_development_dependency 'minitest-focus'
2223
spec.add_development_dependency 'minitest-spec-rails'
2324
spec.add_development_dependency 'mocha'

test/support/rake_helpers.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ def sqlserver_cases
2222

2323
def ar_cases
2424
@ar_cases ||= begin
25-
all_cases = Dir.glob("#{ARTest::SQLServer.root_activerecord}/test/cases/**/*_test.rb")
26-
adapters_cases = Dir.glob("#{ARTest::SQLServer.root_activerecord}/test/cases/adapters/**/*_test.rb")
27-
(all_cases - adapters_cases).sort
25+
Dir.glob("#{ARTest::SQLServer.root_activerecord}/test/cases/**/*_test.rb").reject{ |x| x =~ /\/adapters\// }.sort
2826
end
2927
end
3028

3129
def test_files
32-
return env_ar_test_files.unshift(SQLSERVER_HELPER) if env_ar_test_files
33-
return env_test_files if env_test_files
34-
if ENV['ONLY_SQLSERVER']
30+
if env_ar_test_files
31+
[SQLSERVER_HELPER] + env_ar_test_files
32+
elsif env_test_files
33+
env_test_files
34+
elsif ENV['ONLY_SQLSERVER']
3535
sqlserver_cases
3636
elsif ENV['ONLY_ACTIVERECORD']
3737
[SQLSERVER_HELPER] + (ar_cases + [SQLSERVER_COERCED])

0 commit comments

Comments
 (0)