mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
[rubygems/rubygems] Fix conservative updates regardless of --strict
https://github.com/rubygems/rubygems/commit/c9a1d69a8d
This commit is contained in:
parent
71794a75db
commit
35c65e7ba6
2 changed files with 107 additions and 109 deletions
|
@ -46,7 +46,7 @@ module Bundler
|
|||
|
||||
Bundler::CLI::Common.configure_gem_version_promoter(
|
||||
Bundler.definition,
|
||||
options
|
||||
options.merge(:strict => @strict)
|
||||
)
|
||||
|
||||
definition_resolution = proc do
|
||||
|
|
|
@ -1098,7 +1098,6 @@ RSpec.describe "bundle outdated" do
|
|||
end
|
||||
|
||||
context "conservative updates" do
|
||||
context "without --strict" do
|
||||
before do
|
||||
build_repo4 do
|
||||
build_gem "patch", %w[1.0.0 1.0.1]
|
||||
|
@ -1163,7 +1162,7 @@ RSpec.describe "bundle outdated" do
|
|||
end
|
||||
end
|
||||
|
||||
context "with --strict" do
|
||||
context "tricky conservative updates" do
|
||||
before do
|
||||
build_repo4 do
|
||||
build_gem "foo", %w[1.4.3 1.4.4] do |s|
|
||||
|
@ -1196,8 +1195,8 @@ RSpec.describe "bundle outdated" do
|
|||
G
|
||||
end
|
||||
|
||||
it "shows gems with --strict updating to patch and filtering to patch" do
|
||||
bundle "outdated --patch --strict --filter-patch", :raise_on_error => false
|
||||
it "shows gems updating to patch and filtering to patch" do
|
||||
bundle "outdated --patch --filter-patch", :raise_on_error => false, :env => { "DEBUG_RESOLVER" => "1" }
|
||||
|
||||
expected_output = <<~TABLE.strip
|
||||
Gem Current Latest Requested Groups
|
||||
|
@ -1208,8 +1207,8 @@ RSpec.describe "bundle outdated" do
|
|||
expect(out).to end_with(expected_output)
|
||||
end
|
||||
|
||||
it "shows gems with --strict updating to patch and filtering to patch, in debug mode" do
|
||||
bundle "outdated --patch --strict --filter-patch", :raise_on_error => false, :env => { "DEBUG" => "1" }
|
||||
it "shows gems updating to patch and filtering to patch, in debug mode" do
|
||||
bundle "outdated --patch --filter-patch", :raise_on_error => false, :env => { "DEBUG" => "1" }
|
||||
|
||||
expected_output = <<~TABLE.strip
|
||||
Gem Current Latest Requested Groups Path
|
||||
|
@ -1220,7 +1219,6 @@ RSpec.describe "bundle outdated" do
|
|||
expect(out).to end_with(expected_output)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe "with --only-explicit" do
|
||||
it "does not report outdated dependent gems" do
|
||||
|
|
Loading…
Reference in a new issue