Get specs green on arm64-darwin-20

rubygems · Oct 10, 2021 · 7a0bd98 · 7a0bd98
1 parent e7e1487
commit 7a0bd98
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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