Added regression test and updated changelog

simp · Mar 16, 2018 · 12e1456 · 12e1456
1 parent ced23e1
commit 12e1456
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 35 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+* Fri Mar 16 2018 Philippe Muller <[email protected]> 7.1.1-0
+- Fixed several cases where literal '\n' was contained in file output
+
 * Mon Jul 31 2017 Liz Nemsick <[email protected]> - 7.1.0-0
 - Add ability to specify full rule content for rsyslog::rule::local
   and rsyslog::rule::remote defined types.

diff --git a/build/rpm_metadata/requires b/build/rpm_metadata/requires
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "simp-rsyslog",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "author": "SIMP Team",
   "summary": "A puppet module to support RSyslog versions 7 and higher using new style RainerScript.",
   "license": "Apache-2.0",

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -34,27 +34,25 @@
           end
         end
 
-        context 'rsyslog class without any parameters' do
-          let(:params) {{ }}
-          it_behaves_like 'a structured module'
-          it { is_expected.to contain_class('rsyslog').with_trusted_nets(['127.0.0.1/32']) }
-          it { is_expected.to contain_class('rsyslog').with_service_name('rsyslog') }
-          it { is_expected.to contain_class('rsyslog').with_package_name(rsyslog_package_name) }
-          it { is_expected.to contain_class('rsyslog').with_tls_package_name("#{rsyslog_package_name}-gnutls") }
-          it { is_expected.to contain_package("#{rsyslog_package_name}.x86_64").with_ensure('latest') }
-          it { is_expected.to contain_package("#{rsyslog_package_name}.i386").with_ensure('absent') }
-
-          if facts[:operatingsystemmajrelease] == '6'
-            it {
-              is_expected.to contain_rsyslog__rule('00_simp_pre_logging/global.conf')
-                .without_content(/ModLoad imjournal/)
-            }
-          else
-            it {
-              is_expected.to contain_rsyslog__rule('00_simp_pre_logging/global.conf')
-                .with_content(/ModLoad imjournal/)
-            }
-          end
+        let(:params) {{ }}
+        it_behaves_like 'a structured module'
+        it { is_expected.to contain_class('rsyslog').with_trusted_nets(['127.0.0.1/32']) }
+        it { is_expected.to contain_class('rsyslog').with_service_name('rsyslog') }
+        it { is_expected.to contain_class('rsyslog').with_package_name(rsyslog_package_name) }
+        it { is_expected.to contain_class('rsyslog').with_tls_package_name("#{rsyslog_package_name}-gnutls") }
+        it { is_expected.to contain_package("#{rsyslog_package_name}.x86_64").with_ensure('latest') }
+        it { is_expected.to contain_package("#{rsyslog_package_name}.i386").with_ensure('absent') }
+
+        if facts[:operatingsystemmajrelease] == '6'
+          it {
+            is_expected.to contain_rsyslog__rule('00_simp_pre_logging/global.conf')
+              .without_content(/ModLoad imjournal/)
+          }
+        else
+          it {
+            is_expected.to contain_rsyslog__rule('00_simp_pre_logging/global.conf')
+              .with_content(/ModLoad imjournal/)
+          }
         end
 
         context 'rsyslog class with logrotate enabled' do
@@ -74,6 +72,16 @@
           end
         end
 
+        it 'no file resources should have a literal \n' do
+          expect(
+            catalogue.resources.select { |resource|
+              resource.type == 'File' &&
+                resource[:content] &&
+                resource[:content].include?('\n')
+            }
+          ).to be_empty
+        end
+
         context 'rsyslog class with pki = simp' do
           let(:params) {{
             :pki => 'simp'