ruby-changes:70610
From: David <ko1@a...>
Date: Mon, 27 Dec 2021 10:45:55 +0900 (JST)
Subject: [ruby-changes:70610] fb0737654c (master): [rubygems/rubygems] Move setup to the spec that uses it
https://git.ruby-lang.org/ruby.git/commit/?id=fb0737654c From fb0737654cc20cf2be5182e05981a216ba6d3789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Fri, 24 Dec 2021 01:36:14 +0100 Subject: [rubygems/rubygems] Move setup to the spec that uses it https://github.com/rubygems/rubygems/commit/7cf0a8fa8e --- spec/bundler/lock/lockfile_spec.rb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/spec/bundler/lock/lockfile_spec.rb b/spec/bundler/lock/lockfile_spec.rb index 8413988b5ac..b07b0b0f91e 100644 --- a/spec/bundler/lock/lockfile_spec.rb +++ b/spec/bundler/lock/lockfile_spec.rb @@ -2,15 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/spec/bundler/lock/lockfile_spec.rb#L2 RSpec.describe "the lockfile format" do before do - build_repo2 do - # Capistrano did this (at least until version 2.5.10) - # RubyGems 2.2 doesn't allow the specifying of a dependency twice - # See https://github.com/rubygems/rubygems/commit/03dbac93a3396a80db258d9bc63500333c25bd2f - build_gem "double_deps", "1.0", :skip_validation => true do |s| - s.add_dependency "net-ssh", ">= 1.0.0" - s.add_dependency "net-ssh" - end - end + build_repo2 end it "generates a simple lockfile for a single source, gem" do @@ -759,6 +751,16 @@ RSpec.describe "the lockfile format" do https://github.com/ruby/ruby/blob/trunk/spec/bundler/lock/lockfile_spec.rb#L751 end it "orders dependencies by version" do + update_repo2 do + # Capistrano did this (at least until version 2.5.10) + # RubyGems 2.2 doesn't allow the specifying of a dependency twice + # See https://github.com/rubygems/rubygems/commit/03dbac93a3396a80db258d9bc63500333c25bd2f + build_gem "double_deps", "1.0", :skip_validation => true do |s| + s.add_dependency "net-ssh", ">= 1.0.0" + s.add_dependency "net-ssh" + end + end + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}/" gem 'double_deps' -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/