From aceb682f183db800ee9d287610829e96574a425e Mon Sep 17 00:00:00 2001
From: Rob Bavey <rob.bavey@elastic.co>
Date: Fri, 11 Feb 2022 09:13:11 -0500
Subject: [PATCH] Unpin bundler, fix gem installer tests (#13762)

Fix gem installer tests to enable unpinning the version of bundler

This commit removes changes the gem installer to use real gems, rather than
use `allow_instance_of` during testing, which appears to be problematic with the
latest version of bundler
---
 build.gradle                                     |   4 ++--
 .../valid-pack/logstash-input-packtest.gemspec   |   1 -
 .../logstash-input-packtest_pim-0.0.1.gem        | Bin 0 -> 4096 bytes
 .../logstash-input-packtest_pim.gemspec          |  12 ++++++++++++
 spec/unit/plugin_manager/gem_installer_spec.rb   |   6 ++----
 .../plugin_manager/pack_installer/pack_spec.rb   |   8 ++++----
 6 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest_pim-0.0.1.gem
 create mode 100644 spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest_pim.gemspec

diff --git a/build.gradle b/build.gradle
index fd28b9984..00514ff38 100644
--- a/build.gradle
+++ b/build.gradle
@@ -307,7 +307,7 @@ tasks.register("installBundler") {
     dependsOn assemblyDeps
     outputs.files file("${projectDir}/vendor/bundle/jruby/2.5.0/bin/bundle")
     doLast {
-      gem(projectDir, buildDir, "bundler", "= 2.3.6", "${projectDir}/vendor/bundle/jruby/2.5.0")
+      gem(projectDir, buildDir, "bundler", "~> 2", "${projectDir}/vendor/bundle/jruby/2.5.0")
   }
 }
 
@@ -435,7 +435,7 @@ tasks.register("installIntegrationTestBundler"){
     dependsOn unpackTarDistribution
     outputs.files file("${qaBundleBin}")
   doLast {
-      gem(projectDir, buildDir, "bundler", "= 2.3.6", qaBundledGemPath)
+      gem(projectDir, buildDir, "bundler", "~> 2", qaBundledGemPath)
   }
 }
 
diff --git a/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest.gemspec b/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest.gemspec
index 78a7a1d48..49d8922c0 100644
--- a/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest.gemspec
+++ b/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest.gemspec
@@ -4,7 +4,6 @@ Gem::Specification.new do |spec|
   spec.version       = "0.0.1"
   spec.authors       = ["Elastic"]
   spec.email         = ["info@elastic.co"]
-
   spec.summary       = "a summary"
   spec.description   = "a description"
   spec.homepage      = "https://elastic.co"
diff --git a/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest_pim-0.0.1.gem b/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest_pim-0.0.1.gem
new file mode 100644
index 0000000000000000000000000000000000000000..a7ecc37be954727f3402293fa1926a35f4144da0
GIT binary patch
literal 4096
zcmc~zElEsCEJ@T$uVSDTFaQD*6B7my4Fu@4fw_qpgQ1C$fuXU1nW2F>1CU{2Y|fxy
zKr06!n_F63l2`<EQh7#dY7Vjl8k>+j#BT`Cp=lqiT={Me2KOG;B&PpILwxhE7zphB
z9X=zj%FB#5W&_J3h9+YV83&C|R+G;L)F=7}C?Ba$pL6$Z-mNT4vrduoKT>V#-X9GO
zJt>}f>)h-Oe>vN(xEFZUb|w@!Eaq$$kFyTA)E28Y_c&MWoE2TS?g*v4QnLCe9hA1D
zYSESJf2U0NBzNVCZ>{p8t0pZ^rs&+~u)Qb|6t-xR{F-wu%a%Ab#S5ziBz5mQzC>kz
zYop6tNz<Z@@9kaIcmB?vy>0ERZM!m4F0XjHa`t1@{he}3Kjii}Mub(~dG%X4=~*5>
zxAliFSGL*BUnaSysrc)pl|S}X{eG6k=~dA=`)}#_3#G+pPj>J5TqYqTtg>N&F*AFv
zaY5g+6BE5AtCtig?Th~UL#O(c;_Q}*(^{sbFJxGLQ7rZX|3ld~x&gBl9`K!UsmhMr
zw#e*`;E$kBc0RkjYYpx;xSz>1VPg+`KV!l~jkK*d=S<y}vEvHk%LWr`Pwk)2*LO6|
z?VZ=TeOvK_&q0rbBcz{9Xqs%o#6RJ0QhKC`pf`8o%`^KRH15;Ok`g~2c}H$?ZFt9P
zy+7vJhH_pTg&zGkTH_M2bp!MC`CEINrMct#Z&gNaFZ~^ra;Ngk?ssBos-J#dENR*&
zR9WP=eCLl>1|p|_mV7#7?;bXB!5bEQX%C$DfjM9x^S^<KF?#+7767C9A78vtOAe9$
zlM*CY7bl4Hgn*3x|DTybZ~fNy40sa{wHz^O&VYqLaz<)$c5!KLv0i0jZVqiq0Z`S5
zul_eNF-Ob)CT0es`JXOn0+IhyCunaIao}P7yC%uZV2;XM|L2x6^F)_?c1*Nb9ASHQ
za)R=zyr*BQZ1>gw_F5$0|NL|M{>6`E<LmzXt4QjscqsG4_d@I2lh-a>&YJA1B#?E9
z#jx<$OmA5a<qgSSpVn@=_wn`Q<Esu^ObAHadE$-%XSFq#TH3L#PfDAnJz_b$R8f}W
zQ}wa^)~ql0&wZZYG2NRdxV1mK?L<<Lroh8Pr_RYbPw1YkSJxw4rW3>EZNBWCiPes+
zT;=m`oY7L>n|7IJzEQS$6x)rxpZ_gUb-Z@)bN=%w0ZZKEXE1us?UBCbCerqF*|jy-
z=Pk8-Td?iq!JDkx=Nxd>z8)}tG54DM^VeFX_F4Njs`{8I2L0x+(qGl-sQPZ}4*7Zp
arT<xiR~YFM6Qh=lhQMeDjD`SxLjVA2^wMGg

literal 0
HcmV?d00001

diff --git a/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest_pim.gemspec b/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest_pim.gemspec
new file mode 100644
index 000000000..fbb1c92cb
--- /dev/null
+++ b/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest_pim.gemspec
@@ -0,0 +1,12 @@
+# coding: utf-8
+Gem::Specification.new do |spec|
+  spec.name                 = "logstash-input-packtest_pim"
+  spec.version              = "0.0.1"
+  spec.authors              = ["Elastic"]
+  spec.email                = ["info@elastic.co"]
+  spec.post_install_message = "Hello from the friendly pack"
+  spec.summary              = "a summary"
+  spec.description          = "a description"
+  spec.homepage             = "https://elastic.co"
+  spec.add_runtime_dependency "logstash-input-packtestdep"
+end
diff --git a/spec/unit/plugin_manager/gem_installer_spec.rb b/spec/unit/plugin_manager/gem_installer_spec.rb
index cf57c9c4a..dd85009df 100644
--- a/spec/unit/plugin_manager/gem_installer_spec.rb
+++ b/spec/unit/plugin_manager/gem_installer_spec.rb
@@ -46,9 +46,7 @@ describe LogStash::PluginManager::GemInstaller do
     let(:message) { "Hello from the friendly pack" }
 
     context "when present" do
-      before do
-        allow_any_instance_of(::Gem::Specification).to receive(:post_install_message).and_return(message)
-      end
+      let(:plugin_name) { 'logstash-input-packtest_pim-0.0.1' }
 
       context "when we want the message" do
         it "display the message" do
@@ -64,7 +62,7 @@ describe LogStash::PluginManager::GemInstaller do
     end
 
     context "when not present" do
-      context "when we want the message" do
+      context "when we don't want the message" do
         it "doesn't display the message" do
           expect(LogStash::PluginManager.ui).not_to receive(:info).with(message)
           subject.install(simple_gem, true, temporary_gem_home)
diff --git a/spec/unit/plugin_manager/pack_installer/pack_spec.rb b/spec/unit/plugin_manager/pack_installer/pack_spec.rb
index 617c0adc0..5467dd2f8 100644
--- a/spec/unit/plugin_manager/pack_installer/pack_spec.rb
+++ b/spec/unit/plugin_manager/pack_installer/pack_spec.rb
@@ -29,8 +29,8 @@ describe LogStash::PluginManager::PackInstaller::Pack do
     end
 
     it "returns the plugins" do
-      expect(subject.plugins.size).to eq(1)
-      expect(subject.plugins.collect(&:name)).to include("logstash-input-packtest")
+      expect(subject.plugins.size).to eq(2)
+      expect(subject.plugins.collect(&:name)).to include("logstash-input-packtest_pim", "logstash-input-packtest")
     end
 
     it "returns the dependencies" do
@@ -39,8 +39,8 @@ describe LogStash::PluginManager::PackInstaller::Pack do
     end
 
     it "returns all the gems" do
-      expect(subject.gems.size).to eq(2)
-      expect(subject.gems.collect(&:name)).to include("logstash-input-packtest", "logstash-input-packtestdep")
+      expect(subject.gems.size).to eq(3)
+      expect(subject.gems.collect(&:name)).to include("logstash-input-packtest", "logstash-input-packtest_pim", "logstash-input-packtestdep")
     end
   end