From 521a2d2beb945a2ce22b4788409f5fb475fea17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Fri, 26 Jul 2019 13:37:51 +0200
Subject: [bundler/bundler] Revert "make system_bundle_bin_path helper and
 resolve failing tests for ruby < 2.6"

This reverts commit e63e844bc7444c6a489fcde0dc7011c6c4807edd.

It was introduced to resolve some failing tests at the cost of making
the intention of the spec much less clear.

Thanks to the previous fixes we have added to this spec, we can revert
that patch now.

https://github.com/bundler/bundler/commit/b29a40820f
---
 spec/bundler/commands/exec_spec.rb | 2 +-
 spec/bundler/support/helpers.rb    | 2 +-
 spec/bundler/support/path.rb       | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/spec/bundler/commands/exec_spec.rb b/spec/bundler/commands/exec_spec.rb
index 1acfd7b219..bb13b1b086 100644
--- a/spec/bundler/commands/exec_spec.rb
+++ b/spec/bundler/commands/exec_spec.rb
@@ -856,7 +856,7 @@ __FILE__: #{path.to_s.inspect}
         file = bundled_app("file_that_bundle_execs.rb")
         create_file(file, <<-RB)
           #!#{Gem.ruby}
-          puts `#{system_bundle_bin_path} exec echo foo`
+          puts `bundle exec echo foo`
         RB
         file.chmod(0o777)
         bundle! "exec #{file}", :system_bundler => true
diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb
index 2445b566aa..02ec3c790b 100644
--- a/spec/bundler/support/helpers.rb
+++ b/spec/bundler/support/helpers.rb
@@ -110,7 +110,7 @@ module Spec
       bundle_bin = options.delete("bundle_bin") || bindir.join("bundle")
 
       if system_bundler = options.delete(:system_bundler)
-        bundle_bin = system_bundle_bin_path
+        bundle_bin = system_gem_path.join("bin/bundler")
       end
 
       env = options.delete(:env) || {}
diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb
index aa06a3f047..b722ec498b 100644
--- a/spec/bundler/support/path.rb
+++ b/spec/bundler/support/path.rb
@@ -100,10 +100,6 @@ module Spec
       tmp("gems/system", *path)
     end
 
-    def system_bundle_bin_path
-      system_gem_path("bin/bundle")
-    end
-
     def lib_path(*args)
       tmp("libs", *args)
     end
-- 
cgit v1.2.1