Skip including an empty stanza if one is generated.

Also move unit tests down a level to avoid Foodcritic/foodcritic#148

libraries/splunk_app.rb

@@ -23,7 +23,7 @@ def self.merge_hashes(*hashes)
           app_hash.merge!(to_merge, &merger)
         end
 
-        result[app_name] = app_hash
+        result[app_name] = app_hash unless app_hash.empty?
       end
     end
   end

spec/libraries/splunk_app_spec.rb → spec/unit/libraries/splunk_app_spec.rb

@@ -12,11 +12,11 @@
   end
 
   context 'when given different keys' do
-    let(:one) { { foo: {} } }
-    let(:two) { { bar: {} } }
+    let(:one) { { foo: { a: 'foo' } } }
+    let(:two) { { bar: { a: 'foo' } } }
     let(:three) { { baz: {} } }
 
-    it { is_expected.to eq(foo: {}, bar: {}, baz: {}) }
+    it { is_expected.to eq(foo: { a: 'foo' }, bar: { a: 'foo' }) }
   end
 
   context 'when given same keys' do
@@ -27,8 +27,15 @@
     it { is_expected.to eq(foo: { a: 'baz' }) }
   end
 
+  context 'when given different subkeys' do
+    let(:one) { { foo: { a: 'foo' } } }
+    let(:two) { { foo: { b: { a: 'foo' } } } }
+    let(:three) { { foo: { b: { b: 'bar' }, c: 'baz' } } }
+
+    it { is_expected.to eq(foo: { a: 'foo', b: { a: 'foo', b: 'bar' }, c: 'baz' }) }
+  end
+
   context 'when given a key with a non-hash value' do
-    before { pending 'when issue #36 is fixed' }
     let(:one) { { foo: 'bar' } }
 
     it { is_expected.to eq({}) }

spec/spec_helper.rb → spec/unit/spec_helper.rb

@@ -1,6 +1,6 @@
 # coding: UTF-8
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'libraries'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'libraries'))
 require 'rspec'
 
 RSpec.configure do |config|