From 2a9d9b54817f555cedf432fc19c3716b85a68777 Mon Sep 17 00:00:00 2001
From: Alex Pop <apop@chef.io>
Date: Wed, 11 May 2016 22:21:22 +0100
Subject: [PATCH] return empty array instead of nil to be .each friendly

---
 lib/resources/port.rb            |  8 ++++----
 test/unit/resources/port_test.rb | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/resources/port.rb b/lib/resources/port.rb
index ad108535a..6b8ca9756 100644
--- a/lib/resources/port.rb
+++ b/lib/resources/port.rb
@@ -59,22 +59,22 @@ module Inspec::Resources
 
     def protocols
       res = info.map { |x| x[:protocol] }.uniq.compact
-      res.size > 0 ? res : nil
+      res.size > 0 ? res : []
     end
 
     def processes
       res = info.map { |x| x[:process] }.uniq.compact
-      res.size > 0 ? res : nil
+      res.size > 0 ? res : []
     end
 
     def addresses
       res = info.map { |x| x[:address] }.uniq.compact
-      res.size > 0 ? res : nil
+      res.size > 0 ? res : []
     end
 
     def pids
       res = info.map { |x| x[:pid] }.uniq.compact
-      res.size > 0 ? res : nil
+      res.size > 0 ? res : []
     end
 
     def to_s
diff --git a/test/unit/resources/port_test.rb b/test/unit/resources/port_test.rb
index 168a5b352..6af2859cc 100644
--- a/test/unit/resources/port_test.rb
+++ b/test/unit/resources/port_test.rb
@@ -36,7 +36,7 @@ describe 'Inspec::Resources::Port' do
     resource = MockLoader.new(:windows).load_resource('port', 135)
     _(resource.listening?).must_equal true
     _(resource.protocols).must_equal ['tcp']
-    _(resource.processes).must_equal nil
+    _(resource.processes).must_equal []
     _(resource.addresses).must_equal ["::", "192.168.10.157"]
   end
 
@@ -60,10 +60,10 @@ describe 'Inspec::Resources::Port' do
   it 'verify running on undefined' do
     resource = MockLoader.new(:undefined).load_resource('port', 22)
     _(resource.listening?).must_equal false
-    _(resource.protocols).must_equal nil
-    _(resource.pids).must_equal nil
-    _(resource.processes).must_equal nil
-    _(resource.addresses).must_equal nil
+    _(resource.protocols).must_equal []
+    _(resource.pids).must_equal []
+    _(resource.processes).must_equal []
+    _(resource.addresses).must_equal []
   end
 
   it 'verify port and interface on Ubuntu 14.04' do
@@ -78,7 +78,7 @@ describe 'Inspec::Resources::Port' do
   it 'verify not listening port on interface on Ubuntu 14.04' do
     resource = MockLoader.new(:ubuntu1404).load_resource('port', '127.0.0.1', 22)
     _(resource.listening?).must_equal false
-    _(resource.addresses).must_equal nil
+    _(resource.addresses).must_equal []
   end
 
   it 'verify port on Solaris 10' do
@@ -103,7 +103,7 @@ describe 'Inspec::Resources::Port' do
   it 'verify not listening port on hpux' do
     resource = MockLoader.new(:hpux).load_resource('port', 23)
     _(resource.listening?).must_equal false
-    _(resource.protocols).must_equal nil
-    _(resource.addresses).must_equal nil
+    _(resource.protocols).must_equal []
+    _(resource.addresses).must_equal []
   end
 end