Merge prepare version of Bundler 2.2.0

1 files changed, 6 insertions, 1 deletions

diff --git a/spec/bundler/commands/newgem_spec.rb b/spec/bundler/commands/newgem_spec.rb
index beee2b0fdc..421ffa80c6 100644
--- a/spec/bundler/commands/newgem_spec.rb
+++ b/spec/bundler/commands/newgem_spec.rb
@@ -14,6 +14,7 @@ RSpec.describe "bundle gem" do
     prepare_gemspec(bundled_app(gem_name, "#{gem_name}.gemspec"))
     rubocop_version = RUBY_VERSION > "2.4" ? "0.90.0" : "0.80.1"
     gems = ["minitest", "rake", "rake-compiler", "rspec", "rubocop -v #{rubocop_version}", "test-unit"]
+    gems.unshift "parallel -v 1.19.2" if RUBY_VERSION < "2.5"
     gems += ["rubocop-ast -v 0.4.0"] if rubocop_version == "0.90.0"
     path = Bundler.feature_flag.default_install_uses_path? ? local_gem_path(:base => bundled_app(gem_name)) : system_gem_path
     realworld_system_gems gems, :path => path
@@ -423,7 +424,7 @@ RSpec.describe "bundle gem" do
     it "requires the version file" do
       bundle "gem #{gem_name}"
 
-      expect(bundled_app("#{gem_name}/lib/#{require_path}.rb").read).to match(%r{require "#{require_path}/version"})
+      expect(bundled_app("#{gem_name}/lib/#{require_path}.rb").read).to match(%r{require_relative "#{require_relative_path}/version"})
     end
 
     it "creates a base error class" do
@@ -910,6 +911,8 @@ RSpec.describe "bundle gem" do
 
     let(:require_path) { "test_gem" }
 
+    let(:require_relative_path) { "test_gem" }
+
     let(:flags) { nil }
 
     it "does not nest constants" do
@@ -963,6 +966,8 @@ RSpec.describe "bundle gem" do
 
     let(:require_path) { "test/gem" }
 
+    let(:require_relative_path) { "gem" }
+
     it "nests constants so they work" do
       bundle "gem #{gem_name}"
       expect(bundled_app("#{gem_name}/lib/#{require_path}/version.rb").read).to match(/module Test\n  module Gem/)