From fac95ee36d209263b8ff15eaa022d9cc9ca2125a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Thu, 19 Dec 2019 15:56:15 +0100
Subject: Fix test issue when using `rubygems-bundler` gem

---
 Rakefile          | 2 +-
 task/release.rake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 2243da21c5..07f74edb71 100644
--- a/Rakefile
+++ b/Rakefile
@@ -109,7 +109,7 @@ task :check_rvm_integration do
   # The rubygems-bundler gem is installed by RVM by default and it could easily
   # break when we change bundler. Make sure that binstubs still run with it
   # installed.
-  sh("bin/rake install && gem install rubygems-bundler && rake -T")
+  sh("gem install rubygems-bundler && RUBYOPT=-Ilib rake -T")
 end
 
 namespace :man do
diff --git a/task/release.rake b/task/release.rake
index 0b06e35acf..fdcb140e44 100644
--- a/task/release.rake
+++ b/task/release.rake
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
+require_relative "../lib/bundler/gem_tasks"
 task :build => ["build_metadata"] do
   Rake::Task["build_metadata:clean"].tap(&:reenable).real_invoke
 end
-- 
cgit v1.2.1