summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorSutou Kouhei <kou@clear-code.com>2020-01-17 09:51:11 +0900
committerSutou Kouhei <kou@clear-code.com>2020-01-17 09:51:31 +0900
commita634e0a6c64b69e3bd5d8d528d7b311e73e31c58 (patch)
tree01967da3835a667f72828e566a928f2b3286118d /spec
parent3ca83a01484351fd4158a8b077409a4cc026e8dd (diff)
downloadbundler-a634e0a6c64b69e3bd5d8d528d7b311e73e31c58.tar.gz
Revert MatchPlatform#platforms_match?
Because some examples are failed: rspec ./spec/cache/gems_spec.rb:236 # bundle cache when previously cached doesn't remove gems that are for another platform rspec ./spec/commands/install_spec.rb:220 # bundle install with gem sources the simple case with a gem that installs multiple platforms installs gems for the local platform as first choice rspec ./spec/commands/update_spec.rb:39 # bundle update with --all updates the entire bundle rspec ./spec/commands/update_spec.rb:49 # bundle update with --all doesn't delete the Gemfile.lock file if something goes wrong rspec ./spec/commands/update_spec.rb:104 # bundle update with a top level dependency unlocks all child dependencies that are unrelated to other locked dependencies rspec ./spec/commands/update_spec.rb:115 # bundle update with an unknown dependency should inform the user rspec ./spec/commands/update_spec.rb:119 # bundle update with an unknown dependency should suggest alternatives rspec ./spec/commands/update_spec.rb:126 # bundle update with a child dependency should update the child dependency rspec ./spec/commands/update_spec.rb:299 # bundle update in a frozen bundle should suggest different command when frozen is set globally rspec ./spec/runtime/platform_spec.rb:60 # Bundler.setup with multi platform stuff will add the resolve for the current platform
Diffstat (limited to 'spec')
-rw-r--r--spec/install/gems/resolving_spec.rb14
1 files changed, 8 insertions, 6 deletions
diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb
index 1c7554700a..2f46661058 100644
--- a/spec/install/gems/resolving_spec.rb
+++ b/spec/install/gems/resolving_spec.rb
@@ -150,17 +150,19 @@ RSpec.describe "bundle install with install-time dependencies" do
s.required_ruby_version = "> 9000"
end
build_gem "rack", "1.2" do |s|
- s.platform = Bundler.local_platform
+ s.platform = mingw
s.required_ruby_version = "> 9000"
end
build_gem "rack", "1.2"
end
- install_gemfile <<-G, :artifice => "compact_index_rate_limited", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
- ruby "#{RUBY_VERSION}"
- source "http://localgemserver.test/"
- gem 'rack'
- G
+ simulate_platform mingw do
+ install_gemfile <<-G, :artifice => "compact_index_rate_limited", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+ ruby "#{RUBY_VERSION}"
+ source "http://localgemserver.test/"
+ gem 'rack'
+ G
+ end
expect(out).to_not include("rack-9001.0.0 requires ruby version > 9000")
expect(out).to_not include("rack-1.2-#{Bundler.local_platform} requires ruby version > 9000")