From d8d5e16305ee071f7cf16980788cabcc44799c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Fri, 31 May 2019 11:03:11 +0200
Subject: [bundler/bundler] Use a clean gemspec for gem helper specs

https://github.com/bundler/bundler/commit/f694fe7f67
---
 spec/bundler/bundler/gem_helper_spec.rb |  1 +
 spec/bundler/commands/newgem_spec.rb    | 14 +-------------
 spec/bundler/support/helpers.rb         | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'spec')

diff --git a/spec/bundler/bundler/gem_helper_spec.rb b/spec/bundler/bundler/gem_helper_spec.rb
index a7ecb63495..1452e20967 100644
--- a/spec/bundler/bundler/gem_helper_spec.rb
+++ b/spec/bundler/bundler/gem_helper_spec.rb
@@ -11,6 +11,7 @@ RSpec.describe Bundler::GemHelper do
   before(:each) do
     global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "false"
     bundle "gem #{app_name}"
+    prepare_gemspec(app_gemspec_path)
   end
 
   context "determining gemspec" do
diff --git a/spec/bundler/commands/newgem_spec.rb b/spec/bundler/commands/newgem_spec.rb
index 203b474877..222e6ce2d4 100644
--- a/spec/bundler/commands/newgem_spec.rb
+++ b/spec/bundler/commands/newgem_spec.rb
@@ -177,19 +177,7 @@ RSpec.describe "bundle gem" do
     in_app_root
     bundle! "gem newgem --bin"
 
-    process_file(bundled_app("newgem", "newgem.gemspec")) do |line|
-      # Simulate replacing TODOs with real values
-      case line
-      when /spec\.metadata\["(?:allowed_push_host|homepage_uri|source_code_uri|changelog_uri)"\]/, /spec\.homepage/
-        line.gsub(/\=.*$/, "= 'http://example.org'")
-      when /spec\.summary/
-        line.gsub(/\=.*$/, "= %q{A short summary of my new gem.}")
-      when /spec\.description/
-        line.gsub(/\=.*$/, "= %q{A longer description of my new gem.}")
-      else
-        line
-      end
-    end
+    prepare_gemspec(bundled_app("newgem", "newgem.gemspec"))
 
     Dir.chdir(bundled_app("newgem")) do
       gems = ["rake-12.3.2", :bundler]
diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb
index 478fe60822..cf76a84b7c 100644
--- a/spec/bundler/support/helpers.rb
+++ b/spec/bundler/support/helpers.rb
@@ -548,6 +548,22 @@ module Spec
       Dir[pattern].each(&chmod[0o755, 0o644])
     end
 
+    # Simulate replacing TODOs with real values
+    def prepare_gemspec(pathname)
+      process_file(pathname) do |line|
+        case line
+        when /spec\.metadata\["(?:allowed_push_host|homepage_uri|source_code_uri|changelog_uri)"\]/, /spec\.homepage/
+          line.gsub(/\=.*$/, "= 'http://example.org'")
+        when /spec\.summary/
+          line.gsub(/\=.*$/, "= %q{A short summary of my new gem.}")
+        when /spec\.description/
+          line.gsub(/\=.*$/, "= %q{A longer description of my new gem.}")
+        else
+          line
+        end
+      end
+    end
+
     def process_file(pathname)
       changed_lines = pathname.readlines.map do |line|
         yield line
-- 
cgit v1.2.3