test(_mapdata_spec): perform comparison using describe yaml instead

openssh/_mapdata/init.sls

@@ -5,14 +5,15 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata with context %}
 
-{%- set output_file = '/tmp/salt_mapdata_dump.yaml' %}
+{%- set map = mapdata %}
+{%- do salt['log.debug']('### MAP.JINJA DUMP ###\n' ~ map | yaml(False)) %}
 
-{%- do salt['log.debug']( mapdata | yaml(False) ) %}
+{%- set output_file = '/tmp/salt_mapdata_dump.yaml' %}
 
 {{ tplroot }}-mapdata-dump:
   file.managed:
     - name: {{ output_file }}
     - source: salt://{{ tplroot }}/_mapdata/_mapdata.jinja
     - template: jinja
     - context:
-        map: {{ mapdata | yaml }}
+        map: {{ map | yaml }}

test/integration/default/controls/_mapdata_spec.rb

@@ -1,13 +1,19 @@
 # frozen_string_literal: true
 
-mapdata_file = "_mapdata/#{system.platform[:finger].split('.').first}.yaml"
-mapdata_dump = inspec.profile.file(mapdata_file)
+require 'yaml'
+
+# Replace per minion strings
+replacement = {
+  hostname: system.hostname
+}
 
 control '`map.jinja` YAML dump' do
-  title 'should contain the lines'
+  title 'should contain exactly the same data as the comparison file'
+
+  mapdata_file = "_mapdata/#{system.platform[:finger].split('.').first}.yaml"
+  mapdata_dump = YAML.safe_load(inspec.profile.file(mapdata_file) % replacement)
 
-  describe file('/tmp/salt_mapdata_dump.yaml') do
-    it { should exist }
-    its('content') { should eq mapdata_dump }
+  describe yaml('/tmp/salt_mapdata_dump.yaml').params do
+    it { should eq mapdata_dump }
   end
 end