1 files changed, 21 insertions, 21 deletions

diff --git a/spec/bundler/install/allow_offline_install_spec.rb b/spec/bundler/install/allow_offline_install_spec.rb
index 4c6c77a61e..21b0568f7d 100644
--- a/spec/bundler/install/allow_offline_install_spec.rb
+++ b/spec/bundler/install/allow_offline_install_spec.rb
@@ -7,17 +7,17 @@ RSpec.describe "bundle install with :allow_offline_install" do
 
   context "with no cached data locally" do
     it "still installs" do
-      install_gemfile <<-G, :artifice => "compact_index"
+      install_gemfile <<-G, artifice: "compact_index"
         source "http://testgemserver.local"
-        gem "rack-obama"
+        gem "myrack-obama"
       G
-      expect(the_bundle).to include_gem("rack 1.0")
+      expect(the_bundle).to include_gem("myrack 1.0")
     end
 
     it "still fails when the network is down" do
-      install_gemfile <<-G, :artifice => "fail", :raise_on_error => false
+      install_gemfile <<-G, artifice: "fail", raise_on_error: false
         source "http://testgemserver.local"
-        gem "rack-obama"
+        gem "myrack-obama"
       G
       expect(err).to include("Could not reach host testgemserver.local.")
       expect(the_bundle).to_not be_locked
@@ -26,37 +26,37 @@ RSpec.describe "bundle install with :allow_offline_install" do
 
   context "with cached data locally" do
     it "will install from the compact index" do
-      system_gems ["rack-1.0.0"], :path => default_bundle_path
+      system_gems ["myrack-1.0.0"], path: default_bundle_path
 
       bundle "config set clean false"
-      install_gemfile <<-G, :artifice => "compact_index"
+      install_gemfile <<-G, artifice: "compact_index"
         source "http://testgemserver.local"
-        gem "rack-obama"
-        gem "rack", "< 1.0"
+        gem "myrack-obama"
+        gem "myrack", "< 1.0"
       G
 
-      expect(the_bundle).to include_gems("rack-obama 1.0", "rack 0.9.1")
+      expect(the_bundle).to include_gems("myrack-obama 1.0", "myrack 0.9.1")
 
       gemfile <<-G
         source "http://testgemserver.local"
-        gem "rack-obama"
+        gem "myrack-obama"
       G
 
-      bundle :update, :artifice => "fail", :all => true
+      bundle :update, artifice: "fail", all: true
       expect(last_command.stdboth).to include "Using the cached data for the new index because of a network error"
 
-      expect(the_bundle).to include_gems("rack-obama 1.0", "rack 1.0.0")
+      expect(the_bundle).to include_gems("myrack-obama 1.0", "myrack 1.0.0")
     end
 
     def break_git_remote_ops!
       FileUtils.mkdir_p(tmp("broken_path"))
       File.open(tmp("broken_path/git"), "w", 0o755) do |f|
-        f.puts strip_whitespace(<<-RUBY)
+        f.puts <<~RUBY
           #!/usr/bin/env ruby
-          fetch_args = %w(fetch --force --quiet)
+          fetch_args = %w(fetch --force --quiet --no-tags)
           clone_args = %w(clone --bare --no-hardlinks --quiet)
 
-          if (fetch_args.-(ARGV).empty? || clone_args.-(ARGV).empty?) && ARGV.any? {|arg| arg.start_with?("file://") }
+          if (fetch_args.-(ARGV).empty? || clone_args.-(ARGV).empty?) && File.exist?(ARGV[ARGV.index("--") + 1])
             warn "git remote ops have been disabled"
             exit 1
           end
@@ -75,20 +75,20 @@ RSpec.describe "bundle install with :allow_offline_install" do
     it "will install from a cached git repo" do
       skip "doesn't print errors" if Gem.win_platform?
 
-      git = build_git "a", "1.0.0", :path => lib_path("a")
-      update_git("a", :path => git.path, :branch => "new_branch")
+      git = build_git "a", "1.0.0", path: lib_path("a")
+      update_git("a", path: git.path, branch: "new_branch")
       install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "https://gem.repo1"
         gem "a", :git => #{git.path.to_s.dump}
       G
 
-      break_git_remote_ops! { bundle :update, :all => true }
+      break_git_remote_ops! { bundle :update, all: true }
       expect(err).to include("Using cached git data because of network errors")
       expect(the_bundle).to be_locked
 
       break_git_remote_ops! do
         install_gemfile <<-G
-          source "#{file_uri_for(gem_repo1)}"
+          source "https://gem.repo1"
           gem "a", :git => #{git.path.to_s.dump}, :branch => "new_branch"
         G
       end