File tree 3 files changed +9
-9
lines changed
3 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -28,12 +28,12 @@ $LOAD_PATH.unshift("#{SOURCE_ROOT}/src/ruby_supportlib")
28
28
if defined? ( Bundler )
29
29
clean_env = nil
30
30
31
- if Bundler . method_defined? ( :with_clean_env )
32
- Bundler . with_clean_env do
31
+ if Bundler . method_defined? ( :with_unbundled_env )
32
+ Bundler . with_unbundled_env do
33
33
clean_env = ENV . to_hash
34
34
end
35
35
else
36
- Bundler . with_unbundled_env do
36
+ Bundler . with_clean_env do
37
37
clean_env = ENV . to_hash
38
38
end
39
39
end
Original file line number Diff line number Diff line change 35
35
# with Bundler.
36
36
if defined? ( Bundler )
37
37
clean_env = nil
38
- if Bundler . method_defined? ( :with_clean_env )
39
- Bundler . with_clean_env do
38
+ if Bundler . method_defined? ( :with_unbundled_env )
39
+ Bundler . with_unbundled_env do
40
40
clean_env = ENV . to_hash
41
41
end
42
42
else
43
- Bundler . with_unbundled_env do
43
+ Bundler . with_clean_env do
44
44
clean_env = ENV . to_hash
45
45
end
46
46
end
Original file line number Diff line number Diff line change 1
1
# Clean Bundler environment variables. Otherwise we can't test against multiple Rails versions.
2
2
if defined? ( Bundler )
3
3
clean_env = nil
4
- if Bundler . method_defined? ( :with_clean_env )
5
- Bundler . with_clean_env do
4
+ if Bundler . method_defined? ( :with_unbundled_env )
5
+ Bundler . with_unbundled_env do
6
6
clean_env = ENV . to_hash
7
7
end
8
8
else
9
- Bundler . with_unbundled_env do
9
+ Bundler . with_clean_env do
10
10
clean_env = ENV . to_hash
11
11
end
12
12
end
You can’t perform that action at this time.
0 commit comments