aboutsummaryrefslogtreecommitdiffstats
path: root/spec/bundler/support
diff options
context:
space:
mode:
Diffstat (limited to 'spec/bundler/support')
-rw-r--r--spec/bundler/support/helpers.rb4
-rw-r--r--spec/bundler/support/path.rb2
-rw-r--r--spec/bundler/support/platforms.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb
index 181dac3220..b027e7a922 100644
--- a/spec/bundler/support/helpers.rb
+++ b/spec/bundler/support/helpers.rb
@@ -53,7 +53,7 @@ module Spec
end
def bundle_update_requires_all?
- Bundler::VERSION.start_with?("2.") ? nil : true
+ Bundler::VERSION.start_with?("1.") ? nil : true
end
def in_app_root(&blk)
@@ -152,7 +152,7 @@ module Spec
bang :bundle
def forgotten_command_line_options(options)
- remembered = Bundler.bundler_major_version < 3
+ remembered = Bundler::VERSION.split(".", 2).first == "1"
options = options.map do |k, v|
k = Array(k)[remembered ? 0 : -1]
v = '""' if v && v.to_s.empty?
diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb
index 03a96893f3..76fa89d3cc 100644
--- a/spec/bundler/support/path.rb
+++ b/spec/bundler/support/path.rb
@@ -29,7 +29,7 @@ module Spec
end
def default_bundle_path(*path)
- if Bundler::VERSION.split(".").first.to_i < 3
+ if Bundler::VERSION.split(".").first.to_i < 2
system_gem_path(*path)
else
bundled_app(*[".bundle", ENV.fetch("BUNDLER_SPEC_RUBY_ENGINE", Gem.ruby_engine), Gem::ConfigMap[:ruby_version], *path].compact)
diff --git a/spec/bundler/support/platforms.rb b/spec/bundler/support/platforms.rb
index 950311d20e..39040a61bd 100644
--- a/spec/bundler/support/platforms.rb
+++ b/spec/bundler/support/platforms.rb
@@ -106,7 +106,7 @@ module Spec
end
def local_platforms
- if Bundler::VERSION.split(".").first.to_i > 2
+ if Bundler::VERSION.split(".").first.to_i > 1
[local, specific_local_platform]
else
[local]