diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-22 00:27:02 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-22 00:27:02 +0000 |
commit | 615ac3593499f54fde4b1eb0fba66b6bd944821b (patch) | |
tree | 1f0b0e97ee3dd51798658d53cee7eec976a83a97 /test/rubygems/test_gem.rb | |
parent | ff31b35f6a66f3c1548e3356d506ff65a574be7f (diff) | |
download | ruby-615ac3593499f54fde4b1eb0fba66b6bd944821b.tar.gz |
Merge rubygems master branch from github.com/rubygems/rubygems.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_gem.rb')
-rw-r--r-- | test/rubygems/test_gem.rb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index ddf0f7e04c..ae271d8c99 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -14,7 +14,7 @@ end class TestGem < Gem::TestCase - PLUGINS_LOADED = [] + PLUGINS_LOADED = [] # rubocop:disable Style/MutableConstant def setup super @@ -1494,7 +1494,7 @@ class TestGem < Gem::TestCase if Gem::USE_BUNDLER_FOR_GEMDEPS BUNDLER_LIB_PATH = File.expand_path $LOAD_PATH.find {|lp| File.file?(File.join(lp, "bundler.rb")) }.dup.untaint - BUNDLER_FULL_NAME = "bundler-#{Bundler::VERSION}" + BUNDLER_FULL_NAME = "bundler-#{Bundler::VERSION}".freeze end def add_bundler_full_name(names) @@ -1757,19 +1757,20 @@ class TestGem < Gem::TestCase else platform = " #{platform}" end - expected = if Gem::USE_BUNDLER_FOR_GEMDEPS - <<-EXPECTED + expected = + if Gem::USE_BUNDLER_FOR_GEMDEPS + <<-EXPECTED Could not find gem 'a#{platform}' in any of the gem sources listed in your Gemfile. You may need to `gem install -g` to install missing gems - EXPECTED - else - <<-EXPECTED + EXPECTED + else + <<-EXPECTED Unable to resolve dependency: user requested 'a (>= 0)' You may need to `gem install -g` to install missing gems - EXPECTED - end + EXPECTED + end assert_output nil, expected do Gem.use_gemdeps |