test: add :delete action specs for all resources

- Add :delete action spec for dnsmasq (stop, disable, remove files/dirs/package)
- Add :delete action spec for dnsmasq_dns
- Add :delete action spec for dnsmasq_dhcp
- Add :delete action spec for dnsmasq_managed_hosts (uses :remove matcher)

Signed-off-by: Dan Webb <dan.webb@damacus.io>

Author: damacus

libraries/helpers.rb

@@ -52,7 +52,7 @@ def ensure_service_notification_target(service_name)
     end
 
     def default_manage_systemd_resolved?
-      platform?('ubuntu') && node['platform_version'].to_f >= 18.04
+      platform?('ubuntu')
     end
   end
 end

spec/helpers_spec.rb

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_relative '../libraries/helpers'
+
+describe DnsmasqCookbook::Helpers do
+  let(:helper_class) do
+    Class.new do
+      include DnsmasqCookbook::Helpers
+
+      attr_accessor :node
+
+      def platform?(name)
+        Array(name).include?(node['platform'])
+      end
+
+      def data_bag_item(_bag, _item)
+        raise Chef::Exceptions::InvalidDataBagPath, 'not found'
+      end
+    end
+  end
+
+  let(:helper) { helper_class.new }
+
+  before do
+    helper.node = {
+      'platform' => 'ubuntu',
+      'platform_family' => 'debian',
+      'platform_version' => '24.04',
+    }
+  end
+
+  describe '#normalize_config' do
+    it 'coerces symbol keys to strings via to_s' do
+      result = helper.normalize_config(server: '127.0.0.1')
+      expect(result).to eq('server' => '127.0.0.1')
+    end
+
+    it 'leaves string keys unchanged' do
+      result = helper.normalize_config('no-poll' => nil, 'server' => '8.8.8.8')
+      expect(result).to eq('no-poll' => nil, 'server' => '8.8.8.8')
+    end
+
+    it 'preserves nil values' do
+      result = helper.normalize_config('no-poll' => nil)
+      expect(result['no-poll']).to be_nil
+    end
+  end
+
+  describe '#dns_config_payload' do
+    context 'when disable_dhcp_interface is true' do
+      it 'adds the no-dhcp-interface= key' do
+        result = helper.dns_config_payload({ 'server' => '127.0.0.1' }, true)
+        expect(result).to include('no-dhcp-interface=' => nil)
+      end
+    end
+
+    context 'when disable_dhcp_interface is false' do
+      it 'does not add the no-dhcp-interface= key' do
+        result = helper.dns_config_payload({ 'server' => '127.0.0.1' }, false)
+        expect(result).not_to have_key('no-dhcp-interface=')
+      end
+    end
+  end
+
+  describe '#normalize_managed_hosts' do
+    it 'converts an Array value to a list of strings' do
+      result = helper.normalize_managed_hosts('10.0.0.1' => ['router.test.lab', 'router'])
+      expect(result).to eq('10.0.0.1' => ['router.test.lab', 'router'])
+    end
+
+    it 'splits a space-delimited String value into an array' do
+      result = helper.normalize_managed_hosts('10.0.0.2' => 'printer.test.lab printer')
+      expect(result).to eq('10.0.0.2' => ['printer.test.lab', 'printer'])
+    end
+
+    it 'coerces IP keys to strings' do
+      result = helper.normalize_managed_hosts('10.0.0.3': ['host.test.lab'])
+      expect(result.keys).to eq(['10.0.0.3'])
+    end
+
+    it 'compacts nil entries from Array values' do
+      result = helper.normalize_managed_hosts('10.0.0.4' => ['host.test.lab', nil])
+      expect(result['10.0.0.4']).to eq(['host.test.lab'])
+    end
+  end
+
+  describe '#load_managed_hosts' do
+    context 'with explicit entries only (data bag disabled)' do
+      it 'returns normalized entries' do
+        result = helper.load_managed_hosts(
+          entries: { '10.0.0.10' => ['gw.test.lab', 'gw'] },
+          data_bag_name: false,
+          data_bag_item_name: false
+        )
+        expect(result).to eq('10.0.0.10' => ['gw.test.lab', 'gw'])
+      end
+    end
+
+    context 'when the data bag is missing' do
+      it 'falls back to explicit entries without raising' do
+        result = helper.load_managed_hosts(
+          entries: { '10.0.0.11' => ['host.test.lab'] },
+          data_bag_name: 'dnsmasq',
+          data_bag_item_name: 'managed_hosts'
+        )
+        expect(result).to eq('10.0.0.11' => ['host.test.lab'])
+      end
+    end
+  end
+
+  describe '#default_manage_systemd_resolved?' do
+    context 'on Ubuntu' do
+      it 'returns true' do
+        expect(helper.default_manage_systemd_resolved?).to be true
+      end
+    end
+
+    context 'on Debian' do
+      before { helper.node = helper.node.merge('platform' => 'debian') }
+
+      it 'returns false' do
+        expect(helper.default_manage_systemd_resolved?).to be false
+      end
+    end
+
+    context 'on AlmaLinux' do
+      before { helper.node = helper.node.merge('platform' => 'almalinux') }
+
+      it 'returns false' do
+        expect(helper.default_manage_systemd_resolved?).to be false
+      end
+    end
+  end
+end

spec/unit/resources/dhcp_spec.rb

@@ -27,4 +27,18 @@
   it { is_expected.to create_template('/etc/dnsmasq.d/dhcp.conf') }
   it { is_expected.to render_file('/etc/dnsmasq.d/dhcp.conf').with_content(/^dhcp-range=eth1,10\.0\.0\.5,10\.0\.0\.15,12h$/) }
   it { is_expected.to render_file('/etc/dnsmasq.d/dhcp.conf').with_content(/^dhcp-host=01:23:ab:cd:01:02,larry,10\.0\.0\.10$/) }
+
+  context 'action :delete' do
+    recipe do
+      service 'dnsmasq' do
+        action :nothing
+      end
+
+      dnsmasq_dhcp 'default' do
+        action :delete
+      end
+    end
+
+    it { is_expected.to delete_file('/etc/dnsmasq.d/dhcp.conf') }
+  end
 end

spec/unit/resources/dns_spec.rb

@@ -38,4 +38,18 @@
       expect(chef_run).to_not render_file('/etc/dnsmasq.d/dns.conf').with_content(/^no-dhcp-interface=$/)
     end
   end
+
+  context 'action :delete' do
+    recipe do
+      service 'dnsmasq' do
+        action :nothing
+      end
+
+      dnsmasq_dns 'default' do
+        action :delete
+      end
+    end
+
+    it { is_expected.to delete_file('/etc/dnsmasq.d/dns.conf') }
+  end
 end

spec/unit/resources/dnsmasq_spec.rb

@@ -47,4 +47,19 @@
       expect(chef_run).to_not render_file('/etc/dnsmasq.d/dns.conf').with_content(/^no-dhcp-interface=$/)
     end
   end
+
+  context 'action :delete' do
+    recipe do
+      dnsmasq 'default' do
+        action :delete
+      end
+    end
+
+    it { is_expected.to stop_service('dnsmasq') }
+    it { is_expected.to disable_service('dnsmasq') }
+    it { is_expected.to delete_file('/etc/dnsmasq.d/dns.conf') }
+    it { is_expected.to delete_file('/etc/dnsmasq.d/dhcp.conf') }
+    it { is_expected.to delete_directory('/etc/dnsmasq.d') }
+    it { is_expected.to remove_package('dnsmasq') }
+  end
 end

spec/unit/resources/managed_hosts_spec.rb

@@ -35,4 +35,22 @@
       comment: 'dnsmasq managed entry'
     )
   end
+
+  context 'action :delete' do
+    recipe do
+      service 'dnsmasq' do
+        action :nothing
+      end
+
+      dnsmasq_managed_hosts 'default' do
+        data_bag false
+        entries(
+          '10.0.0.20' => ['router.test.lab', 'router']
+        )
+        action :delete
+      end
+    end
+
+    it { is_expected.to remove_hostsfile_entry('10.0.0.20') }
+  end
 end

test/integration/default/controls/default_spec.rb

@@ -4,12 +4,32 @@
   impact 1.0
   title 'dnsmasq service is enabled and running'
 
-  describe service('dnsmasq') do
+  describe systemd_service('dnsmasq') do
+    it { should be_installed }
     it { should be_enabled }
     it { should be_running }
   end
 end
 
+control 'dnsmasq-package-01' do
+  impact 1.0
+  title 'dnsmasq package is installed'
+
+  describe package('dnsmasq') do
+    it { should be_installed }
+  end
+end
+
+control 'dnsmasq-directory-01' do
+  impact 0.7
+  title 'dnsmasq config directory exists'
+
+  describe directory('/etc/dnsmasq.d') do
+    it { should exist }
+    its('mode') { should cmp '0755' }
+  end
+end
+
 control 'dnsmasq-config-01' do
   impact 1.0
   title 'dnsmasq configuration files are rendered from custom resources'