Skip to content

Commit 4586623

Browse files
committed
reverse check for bundler methods
1 parent d43f844 commit 4586623

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Rakefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ $LOAD_PATH.unshift("#{SOURCE_ROOT}/src/ruby_supportlib")
2828
if defined?(Bundler)
2929
clean_env = nil
3030

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
3333
clean_env = ENV.to_hash
3434
end
3535
else
36-
Bundler.with_unbundled_env do
36+
Bundler.with_clean_env do
3737
clean_env = ENV.to_hash
3838
end
3939
end

test/integration_tests/native_packaging_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
# with Bundler.
3636
if defined?(Bundler)
3737
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
4040
clean_env = ENV.to_hash
4141
end
4242
else
43-
Bundler.with_unbundled_env do
43+
Bundler.with_clean_env do
4444
clean_env = ENV.to_hash
4545
end
4646
end

test/support/test_helper.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Clean Bundler environment variables. Otherwise we can't test against multiple Rails versions.
22
if defined?(Bundler)
33
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
66
clean_env = ENV.to_hash
77
end
88
else
9-
Bundler.with_unbundled_env do
9+
Bundler.with_clean_env do
1010
clean_env = ENV.to_hash
1111
end
1212
end

0 commit comments

Comments
 (0)