From 93e9fddabaf2d244f4e6278f6423f83360a561ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Mo=CC=88ding?= <stm@kill-9.net>
Date: Thu, 16 Nov 2023 19:34:34 +0100
Subject: [PATCH] More updates to improve test coverage

---
 spec/classes/init_spec.rb | 36 ++++++++++++++++++++++++++++++++++++
 spec/defines/view_spec.rb |  6 ++++++
 2 files changed, 42 insertions(+)

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index 9a90acf..e3b3e81 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -111,6 +111,11 @@
               .with_mode('0640')
               .that_comes_before('Concat::Fragment[bind::key::rndc-key]')
               .that_notifies('Service[bind]')
+
+            is_expected.to contain_concat__fragment('bind::key::rndc-key')
+              .with_target('named.conf.keys')
+              .with_order('10')
+              .with_content("include \"/etc/bind/rndc.key\";")
           }
 
           #
@@ -278,6 +283,12 @@
           it {
             is_expected.to contain_bind__config('named.conf')
 
+            is_expected.to contain_file('/etc/bind/named.conf')
+              .with_ensure('file')
+              .with_owner('root')
+              .with_group('bind')
+              .with_mode('0640')
+
             is_expected.to contain_file('/etc/bind/named.conf.local')
               .with_ensure('file')
               .with_owner('root')
@@ -343,9 +354,13 @@
               .with_file('/etc/bind/db.localhost')
               .with_order('15')
 
+            is_expected.to contain_concat__fragment('named.conf.zones-localhost')
+
             is_expected.to contain_bind__zone__primary('127.in-addr.arpa')
               .with_file('/etc/bind/db.127')
               .with_order('15')
+
+            is_expected.to contain_concat__fragment('named.conf.zones-127.in-addr.arpa')
           }
         end
 
@@ -487,6 +502,8 @@
           is_expected.to contain_bind__zone__hint('.')
             .with_file('/etc/bind/db.root')
             .with_comment('Prime server with knowledge of the root servers')
+
+          is_expected.to contain_concat__fragment('named.conf.zones-.')
         }
       end
 
@@ -623,6 +640,10 @@
             .with_omit_empty_list(true)
             .with_final_empty_line(false)
 
+          is_expected.to contain_concat__fragment('bind::named.conf.options::forwarders')
+            .with_target('named.conf.options')
+            .with_order('20')
+
           is_expected.to contain_concat__fragment('named.conf.options-forward')
             .with_target('named.conf.options')
             .with_order('21')
@@ -660,6 +681,13 @@
             .with_address_match_list(['192.0.2.42'])
             .with_target('named.conf.options')
             .with_order('40')
+            .with_initial_empty_line(true)
+            .with_final_empty_line(false)
+
+          is_expected.to contain_concat__fragment('bind::named.conf.options::blackhole')
+            .with_target('named.conf.options')
+            .with_order('40')
+            .with_content("\n  blackhole { 192.0.2.42; };\n")
         }
       end
 
@@ -674,6 +702,10 @@
             .with_target('named.conf.options')
             .with_order('30')
 
+          is_expected.to contain_concat__fragment('bind::named.conf.options::allow-query')
+            .with_target('named.conf.options')
+            .with_order('30')
+
           is_expected.not_to contain_bind__aml('allow-query-cache')
         }
       end
@@ -690,6 +722,10 @@
             .with_address_match_list(['any'])
             .with_target('named.conf.options')
             .with_order('31')
+
+          is_expected.to contain_concat__fragment('bind::named.conf.options::allow-query-cache')
+            .with_target('named.conf.options')
+            .with_order('31')
         }
       end
 
diff --git a/spec/defines/view_spec.rb b/spec/defines/view_spec.rb
index e5b5823..21aa651 100644
--- a/spec/defines/view_spec.rb
+++ b/spec/defines/view_spec.rb
@@ -214,6 +214,8 @@
             .with_view('internal')
             .with_file('/etc/bind/db.root')
             .with_comment('Prime server with knowledge of the root servers')
+
+          is_expected.to contain_concat__fragment('named.conf.views-internal-50-.')
         }
       end
 
@@ -238,6 +240,8 @@
             .with_view('internal')
             .with_file('/etc/bind/db.localhost')
             .with_order('15')
+
+          is_expected.to contain_concat__fragment('named.conf.views-internal-50-localhost')
         }
       end
 
@@ -262,6 +266,8 @@
             .with_view('internal')
             .with_file('/etc/bind/db.127')
             .with_order('15')
+
+          is_expected.to contain_concat__fragment('named.conf.views-internal-50-127.in-addr.arpa')
         }
       end