1 files changed, 58 insertions, 25 deletions
diff --git a/spec/classes/rsyslog_server_spec.rb b/spec/classes/rsyslog_server_spec.rb
index 4f8bb62..ec2b523 100644
--- a/spec/classes/rsyslog_server_spec.rb
+++ b/spec/classes/rsyslog_server_spec.rb
@@ -1,51 +1,84 @@
 require 'spec_helper'
 
 describe 'rsyslog::server', :type => :class do
-  context "osfamily = RedHat" do
-    let :facts do
-      {
-        :osfamily        => 'RedHat',
-      }
-    end
 
-    context "default usage (osfamily = RedHat)" do
-      let(:title) { 'rsyslog-server-basic' }
+  ['RedHat', 'Debian'].each do |osfamily|
+    context "osfamily = #{osfamily}" do
+      let :facts do
+        {
+          :osfamily        => osfamily,
+        }
+      end
 
-      it 'should compile' do
-        should contain_file('/etc/rsyslog.d/server.conf')
+      context "default usage (osfamily = #{osfamily})" do
+        let(:title) { 'rsyslog-server-basic' }
+      
+        it 'should compile' do
+          should contain_file('/etc/rsyslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/auth.log/)
+          should contain_file('/etc/rsyslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/messages/)
+        end
       end
+
+      context "enable_onefile (osfamily = #{osfamily})" do
+        let(:title) { 'rsyslog-server-onefile' }
+        let(:params) { {'enable_onefile' => 'true'} }
+  
+        it 'should compile' do
+          should_not contain_file('/etc/rsyslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/auth.log/)
+          should contain_file('/etc/rsyslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/messages/)
+        end
+      end
+
+      context "hostname_template (osfamily = #{osfamily})" do
+        let(:title) { 'rsyslog-server-onefile' }
+        let(:params) { {'custom_config' => 'rsyslog/server-hostname.conf.erb'} }
+  
+        it 'should compile' do
+          should contain_file('/etc/rsyslog.d/server.conf').with_content(/%hostname%\/auth.log/)
+          should contain_file('/etc/rsyslog.d/server.conf').with_content(/%hostname%\/messages/)
+        end
+      end
+
     end
   end
 
-  context "osfamily = Debian" do
+
+  context "osfamily = FreeBSD" do
     let :facts do
       {
-        :osfamily        => 'Debian',
+        :osfamily        => 'freebsd',
       }
     end
 
-    context "default usage (osfamily = Debian)" do
+    context "default usage (osfamily = FreeBSD)" do
       let(:title) { 'rsyslog-server-basic' }
 
       it 'should compile' do
-        should contain_file('/etc/rsyslog.d/server.conf')
+        should contain_file('/etc/syslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/auth.log/)
+        should contain_file('/etc/syslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/messages/)
       end
     end
-  end
 
-  context "osfamily = FreeBSD" do
-    let :facts do
-      {
-        :osfamily        => 'freebsd',
-      }
+    context "enable_onefile (osfamily = FreeBSD)" do
+      let(:title) { 'rsyslog-server-onefile' }
+      let(:params) { {'enable_onefile' => 'true'} }
+ 
+      it 'should compile' do
+        should_not contain_file('/etc/syslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/auth.log/)
+        should contain_file('/etc/syslog.d/server.conf').with_content(/\(\[A-Za-z-\]\*\)--end%\/messages/)
+      end
     end
 
-    context "default usage (osfamily = Debian)" do
-      let(:title) { 'rsyslog-server-basic' }
-
+    context "hostname_template (osfamily = FreeBSD)" do
+      let(:title) { 'rsyslog-server-onefile' }
+      let(:params) { {'custom_config' => 'rsyslog/server-hostname.conf.erb'} }
+ 
       it 'should compile' do
-        should contain_file('/etc/syslog.d/server.conf')
+        should contain_file('/etc/syslog.d/server.conf').with_content(/%hostname%\/auth.log/)
+        should contain_file('/etc/syslog.d/server.conf').with_content(/%hostname%\/messages/)
       end
     end
+
   end
-end
+
+end # describe 'rsyslog::server'