diff options
Diffstat (limited to 'spec/bundler/runtime')
-rw-r--r-- | spec/bundler/runtime/executable_spec.rb | 4 | ||||
-rw-r--r-- | spec/bundler/runtime/gem_tasks_spec.rb | 4 | ||||
-rw-r--r-- | spec/bundler/runtime/load_spec.rb | 6 | ||||
-rw-r--r-- | spec/bundler/runtime/platform_spec.rb | 10 | ||||
-rw-r--r-- | spec/bundler/runtime/require_spec.rb | 4 | ||||
-rw-r--r-- | spec/bundler/runtime/setup_spec.rb | 24 |
6 files changed, 26 insertions, 26 deletions
diff --git a/spec/bundler/runtime/executable_spec.rb b/spec/bundler/runtime/executable_spec.rb index c36d999ed3..98077efaf0 100644 --- a/spec/bundler/runtime/executable_spec.rb +++ b/spec/bundler/runtime/executable_spec.rb @@ -2,7 +2,7 @@ RSpec.describe "Running bin/* commands" do before :each do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" G @@ -140,7 +140,7 @@ RSpec.describe "Running bin/* commands" do end it "rewrites bins on binstubs (to maintain backwards compatibility)" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" G diff --git a/spec/bundler/runtime/gem_tasks_spec.rb b/spec/bundler/runtime/gem_tasks_spec.rb index 73fd845f62..ced3635149 100644 --- a/spec/bundler/runtime/gem_tasks_spec.rb +++ b/spec/bundler/runtime/gem_tasks_spec.rb @@ -19,7 +19,7 @@ RSpec.describe "require 'bundler/gem_tasks'" do RAKEFILE end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rake" @@ -74,7 +74,7 @@ RSpec.describe "require 'bundler/gem_tasks'" do end it "works", :ruby_repo do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rake" diff --git a/spec/bundler/runtime/load_spec.rb b/spec/bundler/runtime/load_spec.rb index e091d8ed6b..5783654c0e 100644 --- a/spec/bundler/runtime/load_spec.rb +++ b/spec/bundler/runtime/load_spec.rb @@ -3,7 +3,7 @@ RSpec.describe "Bundler.load" do describe "with a gemfile" do before(:each) do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" G @@ -75,7 +75,7 @@ RSpec.describe "Bundler.load" do describe "when called twice" do it "doesn't try to load the runtime twice" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" gem "activesupport", :group => :test @@ -99,7 +99,7 @@ RSpec.describe "Bundler.load" do describe "not hurting brittle rubygems" do it "does not inject #source into the generated YAML of the gem specs" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "activerecord" G diff --git a/spec/bundler/runtime/platform_spec.rb b/spec/bundler/runtime/platform_spec.rb index a629b29f7d..215ba8628f 100644 --- a/spec/bundler/runtime/platform_spec.rb +++ b/spec/bundler/runtime/platform_spec.rb @@ -49,7 +49,7 @@ RSpec.describe "Bundler.setup with multi platform stuff" do G simulate_platform "x86-darwin-10" - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "nokogiri" G @@ -75,7 +75,7 @@ RSpec.describe "Bundler.setup with multi platform stuff" do simulate_platform "x86-darwin-100" - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "nokogiri" gem "platform_specific" @@ -87,7 +87,7 @@ RSpec.describe "Bundler.setup with multi platform stuff" do it "allows specifying only-ruby-platform" do simulate_platform "java" - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "nokogiri" gem "platform_specific" @@ -102,7 +102,7 @@ RSpec.describe "Bundler.setup with multi platform stuff" do it "allows specifying only-ruby-platform on windows with dependency platforms" do simulate_windows do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "nokogiri", :platforms => [:mingw, :mswin, :x64_mingw, :jruby] gem "platform_specific" @@ -159,7 +159,7 @@ RSpec.describe "Bundler.setup with multi platform stuff" do requires_platform_specific L - install_gemfile! <<-G, :verbose => true + install_gemfile <<-G, :verbose => true source "#{file_uri_for(gem_repo2)}" gem "requires_platform_specific" G diff --git a/spec/bundler/runtime/require_spec.rb b/spec/bundler/runtime/require_spec.rb index 3646b00a3d..a1c0005511 100644 --- a/spec/bundler/runtime/require_spec.rb +++ b/spec/bundler/runtime/require_spec.rb @@ -370,7 +370,7 @@ RSpec.describe "Bundler.require" do end it "does not load rubygems gemspecs that are used" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" G @@ -395,7 +395,7 @@ RSpec.describe "Bundler.require" do it "does not load git gemspecs that are used" do build_git "foo" - install_gemfile! <<-G + install_gemfile <<-G gem "foo", :git => "#{lib_path("foo-1.0")}" G diff --git a/spec/bundler/runtime/setup_spec.rb b/spec/bundler/runtime/setup_spec.rb index 09d54435be..80c448c969 100644 --- a/spec/bundler/runtime/setup_spec.rb +++ b/spec/bundler/runtime/setup_spec.rb @@ -164,7 +164,7 @@ RSpec.describe "Bundler.setup" do end it "falls back to order the load path alphabetically for backwards compatibility" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "weakling" gem "duradura" @@ -665,7 +665,7 @@ RSpec.describe "Bundler.setup" do end it "does not load all gemspecs" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" G @@ -717,7 +717,7 @@ end before { ENV["MANPATH"] = "/foo#{File::PATH_SEPARATOR}" } it "adds the gem's man dir to the MANPATH" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo4)}" gem "with_man" G @@ -731,7 +731,7 @@ end before { ENV.delete("MANPATH") } it "adds the gem's man dir to the MANPATH" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo4)}" gem "with_man" G @@ -1194,7 +1194,7 @@ end end it "does not load openssl" do - install_gemfile! "" + install_gemfile "" ruby! <<-RUBY require "#{lib_dir}/bundler/setup" puts defined?(OpenSSL) || "undefined" @@ -1250,13 +1250,13 @@ end RUBY it "activates no gems with -rbundler/setup" do - install_gemfile! "" + install_gemfile "" ruby! code, :env => { "RUBYOPT" => activation_warning_hack_rubyopt + " -r#{lib_dir}/bundler/setup" } expect(out).to eq("{}") end it "activates no gems with bundle exec" do - install_gemfile! "" + install_gemfile "" create_file("script.rb", code) bundle "exec ruby ./script.rb", :env => { "RUBYOPT" => activation_warning_hack_rubyopt } expect(out).to eq("{}") @@ -1265,7 +1265,7 @@ end it "activates no gems with bundle exec that is loaded" do skip "not executable" if Gem.win_platform? - install_gemfile! "" + install_gemfile "" create_file("script.rb", "#!/usr/bin/env ruby\n\n#{code}") FileUtils.chmod(0o777, bundled_app("script.rb")) bundle "exec ./script.rb", :artifice => nil, :env => { "RUBYOPT" => activation_warning_hack_rubyopt } @@ -1324,7 +1324,7 @@ end build_gem g, "999999" end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo4)}" gem "#{g}", "999999" G @@ -1340,7 +1340,7 @@ end build_gem g, "0.0.0.a" end - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo4)}" gem "#{g}", "0.0.0.a" G @@ -1369,7 +1369,7 @@ end end it "keeps Kernel#gem private", :bundler => "3" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" G @@ -1385,7 +1385,7 @@ end end it "keeps Kernel#require private" do - install_gemfile! <<-G + install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" G |