Merge pull request #9523 from mhashizume/maint/main/test-fixes

JSON and URI updates
puppetlabs · Nov 26, 2024 · e967115 · e967115
2 parents 4224d1d + 295d2f9
commit e967115
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/lib/puppet/face/facts.rb b/lib/puppet/face/facts.rb
@@ -167,7 +167,15 @@
 
       case result
       when Array, Hash
-        Puppet::Util::Json.dump(result, :pretty => true)
+        # JSON < 2.8.0 would pretty print empty arrays and hashes with newlines
+        # Maintain that behavior for our users for now
+        if result.is_a?(Array) && result.empty?
+          "[\n\n]"
+        elsif result.is_a?(Hash) && result.empty?
+          "{\n}"
+        else
+          Puppet::Util::Json.dump(result, :pretty => true)
+        end
       else # one of VALID_TYPES above
         result
       end

diff --git a/spec/unit/application/facts_spec.rb b/spec/unit/application/facts_spec.rb
@@ -91,6 +91,7 @@
 
     {
       "type_hash" => [{'a' => 2}, "{\n  \"a\": 2\n}"],
+      "type_empty_hash" => [{}, "{\n}"],
       "type_array" => [[], "[\n\n]"],
       "type_string" => ["str", "str"],
       "type_int" => [1, "1"],

diff --git a/spec/unit/provider/package/puppetserver_gem_spec.rb b/spec/unit/provider/package/puppetserver_gem_spec.rb
@@ -77,7 +77,7 @@
 
       it "raises if given an invalid URI" do
         resource[:source] = 'h;ttp://rubygems.com'
-        expect { provider.install }.to raise_error(Puppet::Error, /Invalid source '': bad URI\(is not URI\?\)/)
+        expect { provider.install }.to raise_error(Puppet::Error, /Invalid source '': bad URI \(is not URI\?\)/)
       end
     end
   end