summaryrefslogtreecommitdiff
path: root/spec/bundler
diff options
context:
space:
mode:
authorJohn Hawthorn <john@hawthorn.email>2023-02-07 17:55:46 -0800
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2023-02-21 19:28:12 +0900
commit4064e3e7769d7cac03f817ede1c4a7d0f97b1ae0 (patch)
tree67a41183a16ce6a68320ab03a84944ecbd44ef7c /spec/bundler
parent80389915838fe235b5691391ba00e2733e31d93b (diff)
downloadruby-4064e3e7769d7cac03f817ede1c4a7d0f97b1ae0.tar.gz
[rubygems/rubygems] Update pub_grub
* Replaces the wording of "is forbidden" with "cannot be used" * Fixes the method signature of VersionRange::Empty#eql? https://github.com/rubygems/rubygems/commit/8c6b3f130b Co-authored-by: Daniel Colson <danieljamescolson@gmail.com>
Diffstat (limited to 'spec/bundler')
-rw-r--r--spec/bundler/commands/lock_spec.rb4
-rw-r--r--spec/bundler/install/gemfile/sources_spec.rb4
-rw-r--r--spec/bundler/install/gemfile/specific_platform_spec.rb2
-rw-r--r--spec/bundler/install/gems/flex_spec.rb2
4 files changed, 6 insertions, 6 deletions
diff --git a/spec/bundler/commands/lock_spec.rb b/spec/bundler/commands/lock_spec.rb
index 08ac333664..8c4c22d6bd 100644
--- a/spec/bundler/commands/lock_spec.rb
+++ b/spec/bundler/commands/lock_spec.rb
@@ -880,7 +880,7 @@ RSpec.describe "bundle lock" do
and rails >= 7.0.2.3, < 7.0.3.1 depends on activesupport = 7.0.2.3,
every version of activemodel is incompatible with rails >= 7.0.2.3, < 7.0.3.1.
And because rails >= 7.0.2.3, < 7.0.3.1 depends on activemodel = 7.0.2.3,
- rails >= 7.0.2.3, < 7.0.3.1 is forbidden.
+ rails >= 7.0.2.3, < 7.0.3.1 cannot be used.
(1) So, because rails >= 7.0.3.1, < 7.0.4 depends on activemodel = 7.0.3.1
and rails >= 7.0.4 depends on activemodel = 7.0.4,
rails >= 7.0.2.3 requires activemodel = 7.0.3.1 OR = 7.0.4.
@@ -892,7 +892,7 @@ RSpec.describe "bundle lock" do
and every version of activemodel depends on activesupport = 6.0.4,
activemodel != 7.0.2.3 is incompatible with rails >= 7.0.2.3.
And because rails >= 7.0.2.3 requires activemodel = 7.0.3.1 OR = 7.0.4 (1),
- rails >= 7.0.2.3 is forbidden.
+ rails >= 7.0.2.3 cannot be used.
So, because Gemfile depends on rails >= 7.0.2.3,
version solving has failed.
ERR
diff --git a/spec/bundler/install/gemfile/sources_spec.rb b/spec/bundler/install/gemfile/sources_spec.rb
index 2199d8bedc..b20ab0090f 100644
--- a/spec/bundler/install/gemfile/sources_spec.rb
+++ b/spec/bundler/install/gemfile/sources_spec.rb
@@ -376,7 +376,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
Because every version of depends_on_missing depends on missing >= 0
and missing >= 0 could not be found in any of the sources,
- every version of depends_on_missing is forbidden.
+ depends_on_missing cannot be used.
So, because Gemfile depends on depends_on_missing >= 0,
version solving has failed.
E
@@ -438,7 +438,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
Because every version of depends_on_rack depends on rack >= 0
and rack >= 0 could not be found in rubygems repository https://gem.repo2/ or installed locally,
- every version of depends_on_rack is forbidden.
+ depends_on_rack cannot be used.
So, because Gemfile depends on depends_on_rack >= 0,
version solving has failed.
E
diff --git a/spec/bundler/install/gemfile/specific_platform_spec.rb b/spec/bundler/install/gemfile/specific_platform_spec.rb
index 2f82a9f9f3..a7fac3da91 100644
--- a/spec/bundler/install/gemfile/specific_platform_spec.rb
+++ b/spec/bundler/install/gemfile/specific_platform_spec.rb
@@ -432,7 +432,7 @@ RSpec.describe "bundle install with specific platforms" do
Because every version of sorbet depends on sorbet-static = 0.5.6433
and sorbet-static = 0.5.6433 could not be found in rubygems repository #{file_uri_for(gem_repo4)}/ or installed locally for any resolution platforms (arm64-darwin-21),
- every version of sorbet is forbidden.
+ sorbet cannot be used.
So, because Gemfile depends on sorbet = 0.5.6433,
version solving has failed.
diff --git a/spec/bundler/install/gems/flex_spec.rb b/spec/bundler/install/gems/flex_spec.rb
index 4bbb2ea038..d5fa55be48 100644
--- a/spec/bundler/install/gems/flex_spec.rb
+++ b/spec/bundler/install/gems/flex_spec.rb
@@ -198,7 +198,7 @@ RSpec.describe "bundle flex_install" do
Because rack-obama >= 2.0 depends on rack = 1.2
and rack = 1.2 could not be found in rubygems repository #{file_uri_for(gem_repo2)}/ or installed locally,
- rack-obama >= 2.0 is forbidden.
+ rack-obama >= 2.0 cannot be used.
So, because Gemfile depends on rack-obama = 2.0,
version solving has failed.
E