fix unit specslcg/snap_package_support

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

2 files changed, 9 insertions, 9 deletions

diff --git a/lib/chef/provider/package/snap.rb b/lib/chef/provider/package/snap.rb
index c8cdb7f5ca..7bfb065a84 100644
--- a/lib/chef/provider/package/snap.rb
+++ b/lib/chef/provider/package/snap.rb
@@ -236,19 +236,19 @@ class Chef
         #   @param path [String] Path to the package on disk
         #   @param content_length [Integer] byte size of the snap file
         def generate_multipart_form_data(snap_name, action, options, path, content_length)
-          snap_options = []
-          options.each do |k, v|
-            snap_option = <<~SNAP_OPTION
-                Content-Disposition: form-data; name="#{k}"
+          snap_options = options.map do |k, v|
+            <<~SNAP_OPTION
+              Content-Disposition: form-data; name="#{k}"
 
               #{v}
               --#{snap_name}
             SNAP_OPTION
-            snap_options.push(snap_option)
           end
 
+          pp snap_options
+
           multipart_form_data = <<~SNAP_S
-              Host:
+            Host:
             Content-Type: multipart/form-data; boundary=#{snap_name}
             Content-Length: #{content_length}
 
@@ -257,7 +257,7 @@ class Chef
 
             #{action}
             --#{snap_name}
-            #{snap_options.join("\n")}
+            #{snap_options.join("\n").chomp}
             Content-Disposition: form-data; name="snap"; filename="#{path}"
 
             <#{content_length} bytes of snap file data>
diff --git a/spec/unit/provider/package/snap_spec.rb b/spec/unit/provider/package/snap_spec.rb
index 89c2a649d9..674870824b 100644
--- a/spec/unit/provider/package/snap_spec.rb
+++ b/spec/unit/provider/package/snap_spec.rb
@@ -1,5 +1,5 @@
 # Author:: S.Cavallo (smcavallo@hotmail.com)
-# Copyright 2014-2018, Chef Software, Inc. <legal@chef.io>
+# Copyright 2014-2018, Chef Software Inc. <legal@chef.io>
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -177,7 +177,7 @@ describe Chef::Provider::Package::Snap do
   describe "when calling async operations" do
 
     it "should should throw if the async response is an error" do
-      expect { provider.send(:get_id_from_async_response, result_fail) }.to raise_error
+      expect { provider.send(:get_id_from_async_response, result_fail) }.to raise_error(RuntimeError)
     end
 
     it "should get the id from an async response" do