diff options
| author | David Rodriguez <deivid.rodriguez@riseup.net> | 2021-10-09 12:12:13 +0200 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2021-10-11 00:23:54 +0900 |
| commit | 9072228a26d0b737c6b9ca2f7a3e7dd7d41bb4ea (patch) | |
| tree | 4af25e1d01ad55428ab72f36d6c0fec699ed3de1 /spec/bundler | |
| parent | a4876a563d6c8011914504e186de8173f481e543 (diff) | |
[ruby/rubygems] Get specs green on arm64-darwin-20
https://github.com/rubygems/rubygems/commit/7a0bd9801d
Diffstat (limited to 'spec/bundler')
| -rw-r--r-- | spec/bundler/bundler/definition_spec.rb | 3 | ||||
| -rw-r--r-- | spec/bundler/lock/lockfile_spec.rb | 3 | ||||
| -rw-r--r-- | spec/bundler/runtime/platform_spec.rb | 3 | ||||
| -rw-r--r-- | spec/bundler/support/platforms.rb | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/spec/bundler/bundler/definition_spec.rb b/spec/bundler/bundler/definition_spec.rb index bf000c468a..728945c401 100644 --- a/spec/bundler/bundler/definition_spec.rb +++ b/spec/bundler/bundler/definition_spec.rb @@ -136,8 +136,7 @@ RSpec.describe Bundler::Definition do only_java (1.1-java) PLATFORMS - java - #{lockfile_platforms} + #{lockfile_platforms_for(["java"] + local_platforms)} DEPENDENCIES only_java diff --git a/spec/bundler/lock/lockfile_spec.rb b/spec/bundler/lock/lockfile_spec.rb index 0e2a3a3cd8..4e9e0f5fc3 100644 --- a/spec/bundler/lock/lockfile_spec.rb +++ b/spec/bundler/lock/lockfile_spec.rb @@ -984,8 +984,7 @@ RSpec.describe "the lockfile format" do rack (1.0.0) PLATFORMS - java - #{lockfile_platforms} + #{lockfile_platforms_for(["java"] + local_platforms)} DEPENDENCIES rack diff --git a/spec/bundler/runtime/platform_spec.rb b/spec/bundler/runtime/platform_spec.rb index d81bccbdf8..a89659d6ce 100644 --- a/spec/bundler/runtime/platform_spec.rb +++ b/spec/bundler/runtime/platform_spec.rb @@ -86,8 +86,7 @@ RSpec.describe "Bundler.setup with multi platform stuff" do racc (1.5.2) PLATFORMS - ruby - #{Bundler.local_platform} + #{lockfile_platforms_for(["ruby"] + local_platforms)} DEPENDENCIES nokogiri (~> 1.11) diff --git a/spec/bundler/support/platforms.rb b/spec/bundler/support/platforms.rb index 0cb7f7cd29..07973fd727 100644 --- a/spec/bundler/support/platforms.rb +++ b/spec/bundler/support/platforms.rb @@ -90,7 +90,11 @@ module Spec end def lockfile_platforms - local_platforms.map(&:to_s).sort.join("\n ") + lockfile_platforms_for(local_platforms) + end + + def lockfile_platforms_for(platforms) + platforms.map(&:to_s).sort.join("\n ") end def local_platforms |