From bdcd1990adbbbdb7baa26ca7a0fd6e56efb05143 Mon Sep 17 00:00:00 2001
From: David Rodríguez <deivid.rodriguez@riseup.net>
Date: Wed, 26 Jun 2019 16:35:49 +0200
Subject: [bundler/bundler] Generate new gem development dependencies in
 Gemfile

https://github.com/bundler/bundler/commit/02177d0e10
---
 spec/bundler/commands/newgem_spec.rb | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'spec')

diff --git a/spec/bundler/commands/newgem_spec.rb b/spec/bundler/commands/newgem_spec.rb
index fd28a417ab..94f4d82e98 100644
--- a/spec/bundler/commands/newgem_spec.rb
+++ b/spec/bundler/commands/newgem_spec.rb
@@ -363,9 +363,14 @@ RSpec.describe "bundle gem" do
         expect(bundled_app("test_gem/spec/spec_helper.rb")).to exist
       end
 
-      it "depends on a specific version of rspec" do
-        rspec_dep = generated_gemspec.development_dependencies.find {|d| d.name == "rspec" }
-        expect(rspec_dep).to be_specific
+      it "depends on a specific version of rspec in generated Gemfile" do
+        Dir.chdir(bundled_app("test_gem")) do
+          builder = Bundler::Dsl.new
+          builder.eval_gemfile(bundled_app("test_gem/Gemfile"))
+          builder.dependencies
+          rspec_dep = builder.dependencies.find {|d| d.name == "rspec" }
+          expect(rspec_dep).to be_specific
+        end
       end
 
       it "requires 'test-gem'" do
@@ -411,8 +416,13 @@ RSpec.describe "bundle gem" do
       end
 
       it "depends on a specific version of minitest" do
-        minitest_dep = generated_gemspec.development_dependencies.find {|d| d.name == "minitest" }
-        expect(minitest_dep).to be_specific
+        Dir.chdir(bundled_app("test_gem")) do
+          builder = Bundler::Dsl.new
+          builder.eval_gemfile(bundled_app("test_gem/Gemfile"))
+          builder.dependencies
+          minitest_dep = builder.dependencies.find {|d| d.name == "minitest" }
+          expect(minitest_dep).to be_specific
+        end
       end
 
       it "builds spec skeleton" do
@@ -703,7 +713,7 @@ RSpec.describe "bundle gem" do
       end
 
       it "includes rake-compiler" do
-        expect(bundled_app("test_gem/test_gem.gemspec").read).to include('spec.add_development_dependency "rake-compiler"')
+        expect(bundled_app("test_gem/Gemfile").read).to include('gem "rake-compiler"')
       end
 
       it "depends on compile task for build" do
@@ -808,7 +818,7 @@ Usage: "bundle gem NAME [OPTIONS]"
       RAKEFILE
 
       expect(bundled_app("foobar/Rakefile").read).to eq(rakefile)
-      expect(bundled_app("foobar/foobar.gemspec").read).to include('spec.add_development_dependency "rspec"')
+      expect(bundled_app("foobar/Gemfile").read).to include('gem "rspec"')
     end
 
     it "asks about MIT license" do
-- 
cgit v1.2.3