Don't generate duplicated spec groups

rubygems · Sep 25, 2020 · 8a9d58a · 8a9d58a
1 parent f910443
commit 8a9d58a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/bundler/lib/bundler/resolver.rb b/bundler/lib/bundler/resolver.rb
@@ -158,8 +158,9 @@ def search_for(dependency)
         # spec group.
         sg_ruby = sg.copy_for(Gem::Platform::RUBY)
         selected_sgs << sg_ruby if sg_ruby
-        sg_all_platforms = nil
         all_platforms = @platforms + [platform]
+        next if all_platforms.to_a == [Gem::Platform::RUBY]
+        sg_all_platforms = nil
         self.class.sort_platforms(all_platforms).reverse_each do |other_platform|
           if sg_all_platforms.nil?
             sg_all_platforms = sg.copy_for(other_platform)

diff --git a/bundler/spec/install/gems/resolving_spec.rb b/bundler/spec/install/gems/resolving_spec.rb
@@ -110,7 +110,7 @@
         expect(err).to include(" net_b").
           and include("BUNDLER: Starting resolution").
           and include("BUNDLER: Finished resolution").
-          and include("Attempting to activate")
+          and include("Attempting to activate [net_b (1.0) (ruby)]")
       end
     end
   end