From 7a0bd9801de46ad91065241e25d0d3c26d465d91 Mon Sep 17 00:00:00 2001 From: David Rodriguez Date: Sat, 9 Oct 2021 12:12:13 +0200 Subject: [PATCH] Get specs green on arm64-darwin-20 --- bundler/spec/bundler/definition_spec.rb | 3 +-- bundler/spec/lock/lockfile_spec.rb | 3 +-- bundler/spec/runtime/platform_spec.rb | 3 +-- bundler/spec/support/platforms.rb | 6 +++++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bundler/spec/bundler/definition_spec.rb b/bundler/spec/bundler/definition_spec.rb index bf000c468a2c..728945c40194 100644 --- a/bundler/spec/bundler/definition_spec.rb +++ b/bundler/spec/bundler/definition_spec.rb @@ -136,8 +136,7 @@ only_java (1.1-java) PLATFORMS - java - #{lockfile_platforms} + #{lockfile_platforms_for(["java"] + local_platforms)} DEPENDENCIES only_java diff --git a/bundler/spec/lock/lockfile_spec.rb b/bundler/spec/lock/lockfile_spec.rb index 0e2a3a3cd80c..4e9e0f5fc3cc 100644 --- a/bundler/spec/lock/lockfile_spec.rb +++ b/bundler/spec/lock/lockfile_spec.rb @@ -984,8 +984,7 @@ rack (1.0.0) PLATFORMS - java - #{lockfile_platforms} + #{lockfile_platforms_for(["java"] + local_platforms)} DEPENDENCIES rack diff --git a/bundler/spec/runtime/platform_spec.rb b/bundler/spec/runtime/platform_spec.rb index d81bccbdf853..a89659d6ce39 100644 --- a/bundler/spec/runtime/platform_spec.rb +++ b/bundler/spec/runtime/platform_spec.rb @@ -86,8 +86,7 @@ racc (1.5.2) PLATFORMS - ruby - #{Bundler.local_platform} + #{lockfile_platforms_for(["ruby"] + local_platforms)} DEPENDENCIES nokogiri (~> 1.11) diff --git a/bundler/spec/support/platforms.rb b/bundler/spec/support/platforms.rb index 0cb7f7cd29a3..07973fd7273e 100644 --- a/bundler/spec/support/platforms.rb +++ b/bundler/spec/support/platforms.rb @@ -90,7 +90,11 @@ def not_local_patchlevel 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