(antonlindstrom#21) Fix FormatStringToken in all tests

Author: ju5t

spec/classes/powerdns_init_spec.rb

@@ -65,7 +65,7 @@
           it { is_expected.to contain_package(authoritative_package_name).with('ensure' => 'installed') }
           it { is_expected.to contain_service(authoritative_service_name).with('ensure' => 'running') }
           it { is_expected.to contain_service(authoritative_service_name).with('enable' => 'true') }
-          it { is_expected.to contain_service(authoritative_service_name).that_requires(format('Package[%s]', authoritative_package_name)) }
+          it { is_expected.to contain_service(authoritative_service_name).that_requires(format('Package[%<package>s]', package: authoritative_package_name)) }
         end
 
         context 'powerdns class with mysql backend' do
@@ -114,10 +114,10 @@
           it { is_expected.to contain_powerdns__config('gmysql-user').with('value' => 'foo') }
           it { is_expected.to contain_powerdns__config('launch').with('value' => 'gmysql') }
 
-          it { is_expected.to contain_file_line(format('powerdns-config-gmysql-dbname-%s', authoritative_config)) }
-          it { is_expected.to contain_file_line(format('powerdns-config-gmysql-password-%s', authoritative_config)) }
-          it { is_expected.to contain_file_line(format('powerdns-config-gmysql-user-%s', authoritative_config)) }
-          it { is_expected.to contain_file_line(format('powerdns-config-launch-%s', authoritative_config)) }
+          it { is_expected.to contain_file_line(format('powerdns-config-gmysql-dbname-%<config>s', config: authoritative_config)) }
+          it { is_expected.to contain_file_line(format('powerdns-config-gmysql-password-%<config>s', config: authoritative_config)) }
+          it { is_expected.to contain_file_line(format('powerdns-config-gmysql-user-%<config>s', config: authoritative_config)) }
+          it { is_expected.to contain_file_line(format('powerdns-config-launch-%<config>s', config: authoritative_config)) }
         end
 
         # Test the recursor
@@ -140,7 +140,7 @@
           it { is_expected.to contain_package(recursor_package_name).with('ensure' => 'installed') }
           it { is_expected.to contain_service(recursor_service_name).with('ensure' => 'running') }
           it { is_expected.to contain_service(recursor_service_name).with('enable' => 'true') }
-          it { is_expected.to contain_service(recursor_service_name).that_requires(format('Package[%s]', recursor_package_name)) }
+          it { is_expected.to contain_service(recursor_service_name).that_requires(format('Package[%<package>s]', package: recursor_package_name)) }
         end
 
         # Test errors

spec/defines/powerdns_config_spec.rb

@@ -44,12 +44,12 @@
             }
           end
 
-          it { is_expected.to contain_file_line(format('powerdns-config-foo-%s', authoritative_config)) }
-          it { is_expected.to contain_file_line(format('powerdns-config-foo-%s', authoritative_config)).with_ensure('present') }
-          it { is_expected.to contain_file_line(format('powerdns-config-foo-%s', authoritative_config)).with_path(authoritative_config) }
-          it { is_expected.to contain_file_line(format('powerdns-config-foo-%s', authoritative_config)).with_line('foo=bar') }
-          it { is_expected.to contain_file_line(format('powerdns-config-foo-%s', authoritative_config)).with_match('^foo=') }
-          it { is_expected.to contain_file_line(format('powerdns-config-foo-%s', authoritative_config)).that_notifies(format('Service[%s]', authoritative_service_name)) }
+          it { is_expected.to contain_file_line(format('powerdns-config-foo-%<config>s', config: authoritative_config)) }
+          it { is_expected.to contain_file_line(format('powerdns-config-foo-%<config>s', config: authoritative_config)).with_ensure('present') }
+          it { is_expected.to contain_file_line(format('powerdns-config-foo-%<config>s', config: authoritative_config)).with_path(authoritative_config) }
+          it { is_expected.to contain_file_line(format('powerdns-config-foo-%<config>s', config: authoritative_config)).with_line('foo=bar') }
+          it { is_expected.to contain_file_line(format('powerdns-config-foo-%<config>s', config: authoritative_config)).with_match('^foo=') }
+          it { is_expected.to contain_file_line(format('powerdns-config-foo-%<config>s', config: authoritative_config)).that_notifies(format('Service[%<service>s]', service: authoritative_service_name)) }
         end
 
         context 'powerdns::config with recursor type' do
@@ -61,7 +61,7 @@
             }
           end
 
-          it { is_expected.to contain_file_line(format('powerdns-config-foo-%s', recursor_config)) }
+          it { is_expected.to contain_file_line(format('powerdns-config-foo-%<config>s', config: recursor_config)) }
         end
 
         # Test for empty values
@@ -72,7 +72,7 @@
             }
           end
 
-          it { is_expected.to contain_file_line(format('powerdns-config-gmysql-dnssec-%s', authoritative_config)) }
+          it { is_expected.to contain_file_line(format('powerdns-config-gmysql-dnssec-%<config>s', config: authoritative_config)) }
         end
 
         context 'powerdns::config with empty value for only-notify' do
@@ -82,7 +82,7 @@
             }
           end
 
-          it { is_expected.to contain_file_line(format('powerdns-config-only-notify-%s', authoritative_config)) }
+          it { is_expected.to contain_file_line(format('powerdns-config-only-notify-%<config>s', config: authoritative_config)) }
         end
 
         context 'powerdns::config with empty value' do