Skip to content

Commit 5acebb3

Browse files
committed
Move rake path helpers to their own file. Run entire AR suite now.
1 parent 3952f40 commit 5acebb3

File tree

3 files changed

+45
-21
lines changed

3 files changed

+45
-21
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
source 'https://rubygems.org'
22
gemspec
33

4+
gem 'bcrypt'
5+
46
if RbConfig::CONFIG["host_os"] =~ /darwin/
57
gem 'terminal-notifier-guard'
68
end

Rakefile

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,6 @@
11
require 'rake/testtask'
22
require_relative 'test/support/paths_sqlserver'
3-
4-
def test_files
5-
if files = ENV['AR_TEST_FILES']
6-
files = files.split(',').map do |file|
7-
File.join ARTest::SQLServer.root_activerecord, file.strip
8-
end
9-
return files.unshift 'test/cases/helper_sqlserver.rb'
10-
end
11-
if files = ENV['TEST_FILES']
12-
return files.split(',').map(&:strip)
13-
end
14-
sqlserver_cases = Dir.glob('test/cases/**/*_test_sqlserver.rb')
15-
ar_cases = Dir.glob("#{ARTest::SQLServer.root_activerecord}/test/cases/**/*_test.rb")
16-
if ENV['SQLSERVER_ONLY']
17-
sqlserver_cases
18-
elsif ENV['ACTIVERECORD_ONLY']
19-
ar_cases
20-
else
21-
sqlserver_cases + ar_cases
22-
end
23-
end
3+
require_relative 'test/support/rake_helpers'
244

255
task test: ['test:dblib']
266
task default: [:test]

test/support/rake_helpers.rb

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
2+
TEST_HELPER = 'test/cases/helper_sqlserver.rb'
3+
4+
def env_ar_test_files
5+
return unless ENV['AR_TEST_FILES'] && !ENV['AR_TEST_FILES'].empty?
6+
@env_ar_test_files ||= begin
7+
files = ENV['AR_TEST_FILES'].split(',').map do |file|
8+
File.join ARTest::SQLServer.root_activerecord, file.strip
9+
end
10+
files.unshift(TEST_HELPER)
11+
end
12+
end
13+
14+
def env_test_files
15+
return unless ENV['TEST_FILES'] && !ENV['TEST_FILES'].empty?
16+
@env_test_files ||= ENV['TEST_FILES'].split(',').map(&:strip)
17+
end
18+
19+
def sqlserver_cases
20+
@sqlserver_cases ||= Dir.glob('test/cases/**/*_test_sqlserver.rb') - [TEST_HELPER]
21+
end
22+
23+
def ar_cases
24+
@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+
[TEST_HELPER] + all_cases - adapters_cases
28+
end
29+
end
30+
31+
def test_files
32+
return env_ar_test_files if env_ar_test_files
33+
return env_test_files if env_test_files
34+
if ENV['SQLSERVER_ONLY']
35+
sqlserver_cases
36+
elsif ENV['ACTIVERECORD_ONLY']
37+
ar_cases
38+
else
39+
sqlserver_cases + ar_cases
40+
end
41+
end
42+

0 commit comments

Comments
 (0)