Skip to content

Commit 2c09b8f

Browse files
committed
Fix bundle load paths for ActiveRecord.
1 parent 2723a23 commit 2c09b8f

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

test/cases/helper_sqlserver.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
require 'bundler/setup' ; Bundler.require :default, :development
21
require 'support/paths_sqlserver'
2+
require 'bundler/setup'
3+
Bundler.require :default, :development
34
require 'support/minitest_sqlserver'
45
require 'cases/helper'
56
require 'support/load_schema_sqlserver'

test/support/paths_sqlserver.rb

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@ def test_root_sqlserver
1212
end
1313

1414
def root_activerecord
15-
Gem.loaded_specs['activerecord'].full_gem_path
15+
File.join Gem.loaded_specs['rails'].full_gem_path, 'activerecord'
1616
end
1717

18-
def test_root_activerecord
18+
def root_activerecord_lib
19+
File.join root_activerecord, 'lib'
20+
end
21+
22+
def root_activerecord_test
1923
File.join root_activerecord, 'test'
2024
end
2125

2226
def test_load_paths
23-
ar_lib = File.join root_activerecord, 'lib'
24-
ar_test = File.join root_activerecord, 'test'
25-
['lib', 'test', ar_lib, ar_test]
27+
['lib', 'test', root_activerecord_lib, root_activerecord_test]
2628
end
2729

2830
def add_to_load_paths!

0 commit comments

Comments
 (0)