diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2020-06-03 20:46:03 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-06-18 19:14:15 +0900 |
commit | 696a50751bc3257e5a75b4f0eb89ccef7ec89363 (patch) | |
tree | 19e940b128c0a3dcdebac95ff98c217f646ae925 /spec/bundler/install/gemfile | |
parent | 1436b5026cd1b2ac4b428955aeadaac8e8b12b1b (diff) |
[rubygems/rubygems] s/install_gemfile!/install_gemfile
https://github.com/rubygems/rubygems/commit/4d1a0c465a
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3212
Diffstat (limited to 'spec/bundler/install/gemfile')
-rw-r--r-- | spec/bundler/install/gemfile/eval_gemfile_spec.rb | 2 | ||||
-rw-r--r-- | spec/bundler/install/gemfile/gemspec_spec.rb | 16 | ||||
-rw-r--r-- | spec/bundler/install/gemfile/git_spec.rb | 10 | ||||
-rw-r--r-- | spec/bundler/install/gemfile/path_spec.rb | 2 | ||||
-rw-r--r-- | spec/bundler/install/gemfile/platform_spec.rb | 4 | ||||
-rw-r--r-- | spec/bundler/install/gemfile/ruby_spec.rb | 2 | ||||
-rw-r--r-- | spec/bundler/install/gemfile/sources_spec.rb | 4 | ||||
-rw-r--r-- | spec/bundler/install/gemfile/specific_platform_spec.rb | 8 |
8 files changed, 24 insertions, 24 deletions
diff --git a/spec/bundler/install/gemfile/eval_gemfile_spec.rb b/spec/bundler/install/gemfile/eval_gemfile_spec.rb index 405837c686..c42ae7ef79 100644 --- a/spec/bundler/install/gemfile/eval_gemfile_spec.rb +++ b/spec/bundler/install/gemfile/eval_gemfile_spec.rb @@ -75,7 +75,7 @@ RSpec.describe "bundle install with gemfile that uses eval_gemfile" do source "#{file_uri_for(gem_repo1)}" eval_gemfile "other/Gemfile" G - install_gemfile! "eval_gemfile File.expand_path('Gemfile-alt')" + install_gemfile "eval_gemfile File.expand_path('Gemfile-alt')" expect(the_bundle).to include_gem "rack 1.0.0" end diff --git a/spec/bundler/install/gemfile/gemspec_spec.rb b/spec/bundler/install/gemfile/gemspec_spec.rb index bb56d5d0d4..70b5367e15 100644 --- a/spec/bundler/install/gemfile/gemspec_spec.rb +++ b/spec/bundler/install/gemfile/gemspec_spec.rb @@ -138,7 +138,7 @@ RSpec.describe "bundle install from an existing gemspec" do s.add_dependency "rack" end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gemspec :path => '#{tmp.join("foo")}' G @@ -157,7 +157,7 @@ RSpec.describe "bundle install from an existing gemspec" do s.add_development_dependency "thin" end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gemspec :path => '#{tmp.join("foo")}' G @@ -175,7 +175,7 @@ RSpec.describe "bundle install from an existing gemspec" do system_gems "platform_specific-1.0-java", :path => default_bundle_path - install_gemfile! <<-G + install_gemfile <<-G gemspec :path => '#{tmp.join("foo")}' G @@ -209,7 +209,7 @@ RSpec.describe "bundle install from an existing gemspec" do f.write "#{gemspec.strip}.tap { gem 'rack-obama'; require 'rack/obama' }" end - install_gemfile! <<-G + install_gemfile <<-G gemspec G @@ -247,7 +247,7 @@ RSpec.describe "bundle install from an existing gemspec" do build_gem "foo", "0.0.1" end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "deps" gemspec :path => '#{tmp.join("foo")}', :name => 'foo' @@ -280,7 +280,7 @@ RSpec.describe "bundle install from an existing gemspec" do s.add_dependency "activesupport", ">= 1" end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gemspec G @@ -549,7 +549,7 @@ RSpec.describe "bundle install from an existing gemspec" do it "installs the ruby platform gemspec" do simulate_platform "ruby" - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gemspec :path => '#{tmp.join("foo")}', :name => 'foo' G @@ -561,7 +561,7 @@ RSpec.describe "bundle install from an existing gemspec" do simulate_platform "ruby" bundle "config --local without development" - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gemspec :path => '#{tmp.join("foo")}', :name => 'foo' G diff --git a/spec/bundler/install/gemfile/git_spec.rb b/spec/bundler/install/gemfile/git_spec.rb index e1ab8b7d93..9b68b424e4 100644 --- a/spec/bundler/install/gemfile/git_spec.rb +++ b/spec/bundler/install/gemfile/git_spec.rb @@ -225,7 +225,7 @@ RSpec.describe "bundle install with git sources" do s.write("lib/foo.rb", "raise 'FAIL'") end - install_gemfile! <<-G + install_gemfile <<-G git "#{lib_path("foo-1.0")}", :ref => "refs/bundler/1" do gem "foo" end @@ -241,7 +241,7 @@ RSpec.describe "bundle install with git sources" do end it "works when the revision is a non-head ref and it was previously downloaded" do - install_gemfile! <<-G + install_gemfile <<-G git "#{lib_path("foo-1.0")}" do gem "foo" end @@ -259,7 +259,7 @@ RSpec.describe "bundle install with git sources" do s.write("lib/foo.rb", "raise 'FAIL'") end - install_gemfile! <<-G + install_gemfile <<-G git "#{lib_path("foo-1.0")}", :ref => "refs/bundler/1" do gem "foo" end @@ -279,7 +279,7 @@ RSpec.describe "bundle install with git sources" do bundle "config set global_gem_cache true" - install_gemfile! <<-G + install_gemfile <<-G git "#{lib_path("foo-1.0")}" do gem "foo" end @@ -446,7 +446,7 @@ RSpec.describe "bundle install with git sources" do s.write "lib/rack.rb", "puts :LOCAL" end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master" G diff --git a/spec/bundler/install/gemfile/path_spec.rb b/spec/bundler/install/gemfile/path_spec.rb index 3e6ee219ac..29cbb291a4 100644 --- a/spec/bundler/install/gemfile/path_spec.rb +++ b/spec/bundler/install/gemfile/path_spec.rb @@ -727,7 +727,7 @@ RSpec.describe "bundle install with explicit source paths" do s.write("lib/rubygems_plugin.rb", "FileUtils.touch('#{bar_file}')") end - install_gemfile! <<-G + install_gemfile <<-G gem "foo", :path => "#{lib_path("foo-1.0")}" gem "bar", :path => "#{lib_path("bar-1.0")}" G diff --git a/spec/bundler/install/gemfile/platform_spec.rb b/spec/bundler/install/gemfile/platform_spec.rb index a38ad4fd91..13b3e47163 100644 --- a/spec/bundler/install/gemfile/platform_spec.rb +++ b/spec/bundler/install/gemfile/platform_spec.rb @@ -95,7 +95,7 @@ RSpec.describe "bundle install across platforms" do simulate_platform java - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo4)}" gem "empyrean", "0.1.0" @@ -242,7 +242,7 @@ RSpec.describe "bundle install across platforms" do build_gem "CFPropertyList" end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "facter" diff --git a/spec/bundler/install/gemfile/ruby_spec.rb b/spec/bundler/install/gemfile/ruby_spec.rb index 0fe93097ae..cdb3960089 100644 --- a/spec/bundler/install/gemfile/ruby_spec.rb +++ b/spec/bundler/install/gemfile/ruby_spec.rb @@ -89,7 +89,7 @@ RSpec.describe "ruby requirement" do end it "allows requirements with trailing whitespace" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" ruby "#{RUBY_VERSION}\\n \t\\n" gem "rack" diff --git a/spec/bundler/install/gemfile/sources_spec.rb b/spec/bundler/install/gemfile/sources_spec.rb index db8724fb1a..3690dc50d6 100644 --- a/spec/bundler/install/gemfile/sources_spec.rb +++ b/spec/bundler/install/gemfile/sources_spec.rb @@ -544,7 +544,7 @@ RSpec.describe "bundle install with gems on multiple sources" do context "when a gem is installed to system gems" do before do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" G @@ -590,7 +590,7 @@ RSpec.describe "bundle install with gems on multiple sources" do describe "source changed to one containing a higher version of a dependency" do before do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" diff --git a/spec/bundler/install/gemfile/specific_platform_spec.rb b/spec/bundler/install/gemfile/specific_platform_spec.rb index 2fa7d10f9a..959ffbf615 100644 --- a/spec/bundler/install/gemfile/specific_platform_spec.rb +++ b/spec/bundler/install/gemfile/specific_platform_spec.rb @@ -57,7 +57,7 @@ RSpec.describe "bundle install with specific_platform enabled" do before { simulate_platform "x86_64-darwin-15" } it "locks to both the specific darwin platform and ruby" do - install_gemfile!(google_protobuf) + install_gemfile(google_protobuf) allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile) expect(the_bundle.locked_gems.platforms).to eq([pl("ruby"), pl("x86_64-darwin-15")]) expect(the_bundle).to include_gem("google-protobuf 3.0.0.alpha.5.0.5.1 universal-darwin") @@ -75,7 +75,7 @@ RSpec.describe "bundle install with specific_platform enabled" do end it "uses the platform-specific gem with extra dependencies" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "facter" G @@ -94,7 +94,7 @@ RSpec.describe "bundle install with specific_platform enabled" do end it "adds the foreign platform" do - install_gemfile!(google_protobuf) + install_gemfile(google_protobuf) bundle "lock --add-platform=#{x64_mingw}" expect(the_bundle.locked_gems.platforms).to eq([rb, x64_mingw, pl("x86_64-darwin-15")]) @@ -106,7 +106,7 @@ RSpec.describe "bundle install with specific_platform enabled" do end it "falls back on plain ruby when that version doesnt have a platform-specific gem" do - install_gemfile!(google_protobuf) + install_gemfile(google_protobuf) bundle "lock --add-platform=#{java}" expect(the_bundle.locked_gems.platforms).to eq([java, rb, pl("x86_64-darwin-15")]) |