ruby-changes:70040
From: David <ko1@a...>
Date: Fri, 3 Dec 2021 20:01:11 +0900 (JST)
Subject: [ruby-changes:70040] aa87780f8f (master): [rubygems/rubygems] Fix incorrect order in changed sources message
https://git.ruby-lang.org/ruby.git/commit/?id=aa87780f8f From aa87780f8f27253e216d4883dd4cae84d545ec1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Wed, 17 Nov 2021 14:21:48 +0100 Subject: [rubygems/rubygems] Fix incorrect order in changed sources message https://github.com/rubygems/rubygems/commit/6f1b5f68de --- lib/bundler/definition.rb | 2 +- spec/bundler/install/deploy_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 9afbdfa07d9..9fa62fedca5 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -400,7 +400,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L400 next if lock_source.nil? || lock_source.can_lock?(dep) gemfile_source_name = dep.source || "no specified source" lockfile_source_name = lock_source - changed << "* #{name} from `#{gemfile_source_name}` to `#{lockfile_source_name}`" + changed << "* #{name} from `#{lockfile_source_name}` to `#{gemfile_source_name}`" end reason = change_reason diff --git a/spec/bundler/install/deploy_spec.rb b/spec/bundler/install/deploy_spec.rb index 8f2650a932d..3604157155d 100644 --- a/spec/bundler/install/deploy_spec.rb +++ b/spec/bundler/install/deploy_spec.rb @@ -401,7 +401,7 @@ RSpec.describe "install in deployment or frozen mode" do https://github.com/ruby/ruby/blob/trunk/spec/bundler/install/deploy_spec.rb#L401 bundle "config set --local deployment true" bundle :install, :raise_on_error => false expect(err).to include("deployment mode") - expect(err).to include("You have changed in the Gemfile:\n* rack from `no specified source` to `#{lib_path("rack")}`") + expect(err).to include("You have changed in the Gemfile:\n* rack from `#{lib_path("rack")}` to `no specified source`") expect(err).not_to include("You have added to the Gemfile") expect(err).not_to include("You have deleted from the Gemfile") end -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/