Merge 30939f2 into 4101df8

voxpupuli · Jun 25, 2018 · d71f2bc · d71f2bc
2 parents 4101df8 + 30939f2
commit d71f2bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/facter/rabbitmq_version.rb b/lib/facter/rabbitmq_version.rb
@@ -2,7 +2,7 @@
   setcode do
     if Facter::Util::Resolution.which('rabbitmqadmin')
       rabbitmq_version = Facter::Core::Execution.execute('rabbitmqadmin --version 2>&1')
-      %r{^rabbitmqadmin ([\w\.]+)}.match(rabbitmq_version)[1]
+      %r{^rabbitmqadmin ([\w\.]+)}.match(rabbitmq_version).to_a[1]
     end
   end
 end
diff --git a/spec/unit/facter/util/fact_rabbitmq_version_spec.rb b/spec/unit/facter/util/fact_rabbitmq_version_spec.rb
@@ -19,6 +19,15 @@
         expect(Facter.fact(:rabbitmq_version).value).to eq('3.6.0')
       end
     end
+    context 'with invalid value' do
+      before do
+        allow(Facter::Util::Resolution).to receive(:which).with('rabbitmqadmin') { true }
+        allow(Facter::Core::Execution).to receive(:execute).with('rabbitmqadmin --version 2>&1') { 'rabbitmqadmin %%VSN%%' }
+      end
+      it do
+        expect(Facter.fact(:rabbitmq_version).value).to be_nil
+      end
+    end
     context 'rabbitmqadmin is not in path' do
       before do
         allow(Facter::Util::Resolution).to receive(:which).with('rabbitmqadmin') { false }