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/commands | |
parent | 1436b5026cd1b2ac4b428955aeadaac8e8b12b1b (diff) | |
download | ruby-696a50751bc3257e5a75b4f0eb89ccef7ec89363.tar.gz |
[rubygems/rubygems] s/install_gemfile!/install_gemfile
https://github.com/rubygems/rubygems/commit/4d1a0c465a
Diffstat (limited to 'spec/bundler/commands')
-rw-r--r-- | spec/bundler/commands/add_spec.rb | 6 | ||||
-rw-r--r-- | spec/bundler/commands/binstubs_spec.rb | 4 | ||||
-rw-r--r-- | spec/bundler/commands/cache_spec.rb | 4 | ||||
-rw-r--r-- | spec/bundler/commands/check_spec.rb | 4 | ||||
-rw-r--r-- | spec/bundler/commands/clean_spec.rb | 6 | ||||
-rw-r--r-- | spec/bundler/commands/doctor_spec.rb | 2 | ||||
-rw-r--r-- | spec/bundler/commands/exec_spec.rb | 6 | ||||
-rw-r--r-- | spec/bundler/commands/info_spec.rb | 14 | ||||
-rw-r--r-- | spec/bundler/commands/install_spec.rb | 2 | ||||
-rw-r--r-- | spec/bundler/commands/pristine_spec.rb | 2 | ||||
-rw-r--r-- | spec/bundler/commands/show_spec.rb | 16 | ||||
-rw-r--r-- | spec/bundler/commands/update_spec.rb | 24 |
12 files changed, 45 insertions, 45 deletions
diff --git a/spec/bundler/commands/add_spec.rb b/spec/bundler/commands/add_spec.rb index fd7c637c2c..4c533652ca 100644 --- a/spec/bundler/commands/add_spec.rb +++ b/spec/bundler/commands/add_spec.rb @@ -200,7 +200,7 @@ RSpec.describe "bundle add" do describe "when a gem is added which is already specified in Gemfile with version" do it "shows an error when added with different version requirement" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "rack", "1.0" G @@ -212,7 +212,7 @@ RSpec.describe "bundle add" do end it "shows error when added without version requirements" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "rack", "1.0" G @@ -227,7 +227,7 @@ RSpec.describe "bundle add" do describe "when a gem is added which is already specified in Gemfile without version" do it "shows an error when added with different version requirement" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "rack" G diff --git a/spec/bundler/commands/binstubs_spec.rb b/spec/bundler/commands/binstubs_spec.rb index 8fb486744e..14542c6a78 100644 --- a/spec/bundler/commands/binstubs_spec.rb +++ b/spec/bundler/commands/binstubs_spec.rb @@ -44,7 +44,7 @@ RSpec.describe "bundle binstubs <gem>" do end it "allows installing all binstubs" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rails" G @@ -109,7 +109,7 @@ RSpec.describe "bundle binstubs <gem>" do R end end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "rack" gem "prints_loaded_gems" diff --git a/spec/bundler/commands/cache_spec.rb b/spec/bundler/commands/cache_spec.rb index 5eb18a120f..cbad2cee47 100644 --- a/spec/bundler/commands/cache_spec.rb +++ b/spec/bundler/commands/cache_spec.rb @@ -222,7 +222,7 @@ RSpec.describe "bundle cache" do end bundle "config --local without wo" - install_gemfile! <<-G + install_gemfile <<-G source "file:#{gem_repo1}" gem "rack" group :wo do @@ -295,7 +295,7 @@ RSpec.describe "bundle install with gem sources" do it "does not hit the remote at all" do build_repo2 - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "rack" G diff --git a/spec/bundler/commands/check_spec.rb b/spec/bundler/commands/check_spec.rb index 150118ad44..334e8d6992 100644 --- a/spec/bundler/commands/check_spec.rb +++ b/spec/bundler/commands/check_spec.rb @@ -102,7 +102,7 @@ RSpec.describe "bundle check" do it "uses the without setting" do bundle "config set without foo" - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" group :foo do gem "rack" @@ -207,7 +207,7 @@ RSpec.describe "bundle check" do end it "fails when there's no lock file and frozen is set" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "foo" G diff --git a/spec/bundler/commands/clean_spec.rb b/spec/bundler/commands/clean_spec.rb index 5036d8d491..3a4b638278 100644 --- a/spec/bundler/commands/clean_spec.rb +++ b/spec/bundler/commands/clean_spec.rb @@ -366,14 +366,14 @@ RSpec.describe "bundle clean" do it "does not call clean automatically when using system gems" do bundle "config set path.system true" - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "thin" gem "rack" G - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" @@ -430,7 +430,7 @@ RSpec.describe "bundle clean" do it "automatically cleans when path has not been set", :bundler => "3" do build_repo2 - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "foo" diff --git a/spec/bundler/commands/doctor_spec.rb b/spec/bundler/commands/doctor_spec.rb index 0731bb08db..42e7503356 100644 --- a/spec/bundler/commands/doctor_spec.rb +++ b/spec/bundler/commands/doctor_spec.rb @@ -7,7 +7,7 @@ require "bundler/cli/doctor" RSpec.describe "bundle doctor" do before(:each) do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" G diff --git a/spec/bundler/commands/exec_spec.rb b/spec/bundler/commands/exec_spec.rb index f30822c955..e797acfad2 100644 --- a/spec/bundler/commands/exec_spec.rb +++ b/spec/bundler/commands/exec_spec.rb @@ -355,7 +355,7 @@ RSpec.describe "bundle exec" do it "raises a helpful error when exec'ing to something outside of the bundle" do bundle "config set clean false" # want to keep the rackup binstub - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "with_license" G @@ -895,7 +895,7 @@ __FILE__: #{path.to_s.inspect} skip "https://github.com/rubygems/bundler/issues/6898" if Gem.win_platform? skip "openssl isn't a default gem" if expected.empty? - install_gemfile! "" # must happen before installing the broken system gem + install_gemfile "" # must happen before installing the broken system gem build_repo4 do build_gem "openssl", openssl_version do |s| @@ -935,7 +935,7 @@ __FILE__: #{path.to_s.inspect} before do build_git "simple_git_binary", &:add_c_extension bundle "config set --local path .bundle" - install_gemfile! <<-G + install_gemfile <<-G gem "simple_git_binary", :git => '#{lib_path("simple_git_binary-1.0")}' G end diff --git a/spec/bundler/commands/info_spec.rb b/spec/bundler/commands/info_spec.rb index 2a52b5e0c0..9286e6824a 100644 --- a/spec/bundler/commands/info_spec.rb +++ b/spec/bundler/commands/info_spec.rb @@ -3,7 +3,7 @@ RSpec.describe "bundle info" do context "with a standard Gemfile" do before do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rails" gem "has_metadata" @@ -96,7 +96,7 @@ RSpec.describe "bundle info" do end it "prints out git info" do - install_gemfile! <<-G + install_gemfile <<-G gem "foo", :git => "#{lib_path("foo-1.0")}" G expect(the_bundle).to include_gems "foo 1.0" @@ -111,7 +111,7 @@ RSpec.describe "bundle info" do end @revision = revision_for(lib_path("foo-1.0"))[0...6] - install_gemfile! <<-G + install_gemfile <<-G gem "foo", :git => "#{lib_path("foo-1.0")}", :branch => "omg" G expect(the_bundle).to include_gems "foo 1.0.omg" @@ -122,7 +122,7 @@ RSpec.describe "bundle info" do it "doesn't print the branch when tied to a ref" do sha = revision_for(lib_path("foo-1.0")) - install_gemfile! <<-G + install_gemfile <<-G gem "foo", :git => "#{lib_path("foo-1.0")}", :ref => "#{sha}" G @@ -132,7 +132,7 @@ RSpec.describe "bundle info" do it "handles when a version is a '-' prerelease" do @git = build_git("foo", "1.0.0-beta.1", :path => lib_path("foo")) - install_gemfile! <<-G + install_gemfile <<-G gem "foo", "1.0.0-beta.1", :git => "#{lib_path("foo")}" G expect(the_bundle).to include_gems "foo 1.0.0.pre.beta.1" @@ -144,7 +144,7 @@ RSpec.describe "bundle info" do context "with a valid regexp for gem name" do it "presents alternatives", :readline do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" gem "rack-obama" @@ -157,7 +157,7 @@ RSpec.describe "bundle info" do context "with an invalid regexp for gem name" do it "does not find the gem" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rails" G diff --git a/spec/bundler/commands/install_spec.rb b/spec/bundler/commands/install_spec.rb index d277b8a1d7..2a9df27dd2 100644 --- a/spec/bundler/commands/install_spec.rb +++ b/spec/bundler/commands/install_spec.rb @@ -557,7 +557,7 @@ RSpec.describe "bundle install with gem sources" do context "after installing with --standalone" do before do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" G diff --git a/spec/bundler/commands/pristine_spec.rb b/spec/bundler/commands/pristine_spec.rb index 4375ce93e3..20958ef338 100644 --- a/spec/bundler/commands/pristine_spec.rb +++ b/spec/bundler/commands/pristine_spec.rb @@ -18,7 +18,7 @@ RSpec.describe "bundle pristine", :ruby_repo do build_lib "bar", :path => lib_path("bar") end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "weakling" gem "very_simple_binary" diff --git a/spec/bundler/commands/show_spec.rb b/spec/bundler/commands/show_spec.rb index 177fb15c63..30e9de9686 100644 --- a/spec/bundler/commands/show_spec.rb +++ b/spec/bundler/commands/show_spec.rb @@ -3,7 +3,7 @@ RSpec.describe "bundle show", :bundler => "< 3" do context "with a standard Gemfile" do before :each do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rails" G @@ -94,7 +94,7 @@ RSpec.describe "bundle show", :bundler => "< 3" do end it "prints out git info" do - install_gemfile! <<-G + install_gemfile <<-G gem "foo", :git => "#{lib_path("foo-1.0")}" G expect(the_bundle).to include_gems "foo 1.0" @@ -109,7 +109,7 @@ RSpec.describe "bundle show", :bundler => "< 3" do end @revision = revision_for(lib_path("foo-1.0"))[0...6] - install_gemfile! <<-G + install_gemfile <<-G gem "foo", :git => "#{lib_path("foo-1.0")}", :branch => "omg" G expect(the_bundle).to include_gems "foo 1.0.omg" @@ -120,7 +120,7 @@ RSpec.describe "bundle show", :bundler => "< 3" do it "doesn't print the branch when tied to a ref" do sha = revision_for(lib_path("foo-1.0")) - install_gemfile! <<-G + install_gemfile <<-G gem "foo", :git => "#{lib_path("foo-1.0")}", :ref => "#{sha}" G @@ -130,7 +130,7 @@ RSpec.describe "bundle show", :bundler => "< 3" do it "handles when a version is a '-' prerelease" do @git = build_git("foo", "1.0.0-beta.1", :path => lib_path("foo")) - install_gemfile! <<-G + install_gemfile <<-G gem "foo", "1.0.0-beta.1", :git => "#{lib_path("foo")}" G expect(the_bundle).to include_gems "foo 1.0.0.pre.beta.1" @@ -166,7 +166,7 @@ RSpec.describe "bundle show", :bundler => "< 3" do context "with a valid regexp for gem name" do it "presents alternatives", :readline do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" gem "rack-obama" @@ -179,7 +179,7 @@ RSpec.describe "bundle show", :bundler => "< 3" do context "with an invalid regexp for gem name" do it "does not find the gem" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rails" G @@ -198,7 +198,7 @@ RSpec.describe "bundle show", :bundler => "< 3" do end it "doesn't update gems to newer versions" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "rails" G diff --git a/spec/bundler/commands/update_spec.rb b/spec/bundler/commands/update_spec.rb index 9a3bfd28c6..bed2f6c86c 100644 --- a/spec/bundler/commands/update_spec.rb +++ b/spec/bundler/commands/update_spec.rb @@ -75,19 +75,19 @@ RSpec.describe "bundle update" do before { bundle "config set update_requires_all_flag true" } it "errors when passed nothing" do - install_gemfile! "" + install_gemfile "" bundle :update, :raise_on_error => false expect(err).to eq("To update everything, pass the `--all` flag.") end it "errors when passed --all and another option" do - install_gemfile! "" + install_gemfile "" bundle "update --all foo", :raise_on_error => false expect(err).to eq("Cannot specify --all along with specific options.") end it "updates everything when passed --all" do - install_gemfile! "" + install_gemfile "" bundle "update --all" expect(out).to include("Bundle updated!") end @@ -153,7 +153,7 @@ RSpec.describe "bundle update" do end end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo4)}" gem "slim-rails" gem "slim_lint" @@ -179,7 +179,7 @@ RSpec.describe "bundle update" do build_gem "b", "2.0" end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo4)}" gem "a" gem "b" @@ -306,7 +306,7 @@ RSpec.describe "bundle update" do describe "with --source option" do it "should not update gems not included in the source that happen to have the same name", :bundler => "< 3" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "activesupport" G @@ -317,7 +317,7 @@ RSpec.describe "bundle update" do end it "should not update gems not included in the source that happen to have the same name", :bundler => "3" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "activesupport" G @@ -456,7 +456,7 @@ RSpec.describe "bundle update in more complicated situations" do end it "will warn when some explicitly updated gems are not updated" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo2)}" gem "thin" @@ -476,7 +476,7 @@ RSpec.describe "bundle update in more complicated situations" do it "will not warn when an explicitly updated git gem changes sha but not version" do build_git "foo" - install_gemfile! <<-G + install_gemfile <<-G gem "foo", :git => '#{lib_path("foo-1.0")}' G @@ -492,7 +492,7 @@ RSpec.describe "bundle update in more complicated situations" do it "will not warn when changing gem sources but not versions" do build_git "rack" - install_gemfile! <<-G + install_gemfile <<-G gem "rack", :git => '#{lib_path("rack-1.0")}' G @@ -674,7 +674,7 @@ RSpec.describe "bundle update" do build_gem "foo" end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo4)}" gem "bar" gem "foo" @@ -819,7 +819,7 @@ RSpec.describe "bundle update --bundler" do build_gem "rack", "1.0" end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo4)}" gem "rack" G |