summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorSutou Kouhei <kou@clear-code.com>2020-01-05 10:49:50 +0900
committerSutou Kouhei <kou@clear-code.com>2020-01-15 06:27:03 +0900
commitfe2e99711f10103f674c7a074ae093aba51a4128 (patch)
tree294c7192c32dba38c1c7431beb50356983aca62a /spec
parent2a374012d4d977905b01fb0d789375e274d1be13 (diff)
downloadbundler-fe2e99711f10103f674c7a074ae093aba51a4128.tar.gz
Add support for force_ruby_platform with specific_platform again
Diffstat (limited to 'spec')
-rw-r--r--spec/install/gems/flex_spec.rb10
-rw-r--r--spec/runtime/platform_spec.rb1
2 files changed, 3 insertions, 8 deletions
diff --git a/spec/install/gems/flex_spec.rb b/spec/install/gems/flex_spec.rb
index 70a4c624dd..77891acc24 100644
--- a/spec/install/gems/flex_spec.rb
+++ b/spec/install/gems/flex_spec.rb
@@ -192,12 +192,6 @@ RSpec.describe "bundle flex_install" do
end
it "suggests bundle update when the Gemfile requires different versions than the lock" do
- if Bundler.feature_flag.specific_platform?
- error_message_platform = " #{Bundler.local_platform}"
- else
- error_message_platform = ""
- end
-
bundle "config set force_ruby_platform true"
nice_error = <<-E.strip.gsub(/^ {8}/, "")
@@ -207,10 +201,10 @@ RSpec.describe "bundle flex_install" do
In Gemfile:
rack-obama (= 2.0) was resolved to 2.0, which depends on
- rack (= 1.2)#{error_message_platform}
+ rack (= 1.2)
rack_middleware was resolved to 1.0, which depends on
- rack (= 0.9.1)#{error_message_platform}
+ rack (= 0.9.1)
Running `bundle update` will rebuild your snapshot from scratch, using only
the gems in your Gemfile, which may resolve the conflict.
diff --git a/spec/runtime/platform_spec.rb b/spec/runtime/platform_spec.rb
index ad9c56d14e..70c7594395 100644
--- a/spec/runtime/platform_spec.rb
+++ b/spec/runtime/platform_spec.rb
@@ -113,6 +113,7 @@ RSpec.describe "Bundler.setup with multi platform stuff" do
bundle! "install"
expect(the_bundle).to include_gems "platform_specific 1.0 RUBY"
+ expect(the_bundle).to not_include_gems "nokogiri"
end
end