Merge pull request #30 from mbornoz/improvements

Improvements

6 files changed, 154 insertions, 159 deletions

diff --git a/spec/classes/rsyslog_config_spec.rb b/spec/classes/rsyslog_config_spec.rb
deleted file mode 100644
index 640da2d..0000000
--- a/spec/classes/rsyslog_config_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'spec_helper'
-
-describe 'rsyslog::config', :type => :class do
-  context "osfamily = RedHat" do
-    let :facts do
-      {
-        :osfamily        => 'RedHat',
-      }
-    end
-
-    context "default usage (osfamily = RedHat)" do
-      let(:title) { 'rsyslog-basic' }
-
-      it 'should compile' do
-        should contain_file('/etc/rsyslog.conf')
-        should contain_file('/etc/rsyslog.d/')
-      end
-    end
-  end
-
-  context "osfamily = Debian" do
-    let :facts do
-      {
-        :osfamily        => 'Debian',
-      }
-    end
-
-    context "default usage (osfamily = Debian)" do
-      let(:title) { 'rsyslog-basic' }
-
-      it 'should compile' do
-        should contain_file('/etc/rsyslog.conf')
-        should contain_file('/etc/rsyslog.d/')
-      end
-    end
-  end
-
-  context "osfamily = FreeBSD" do
-    let :facts do
-      {
-        :osfamily        => 'freebsd',
-      }
-    end
-
-    context "default usage (osfamily = Debian)" do
-      let(:title) { 'rsyslog-basic' }
-
-      it 'should compile' do
-        should contain_file('/etc/syslog.conf')
-        should contain_file('/etc/syslog.d/')
-      end
-    end
-  end
-end
diff --git a/spec/classes/rsyslog_install_spec.rb b/spec/classes/rsyslog_install_spec.rb
deleted file mode 100644
index a1baea3..0000000
--- a/spec/classes/rsyslog_install_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'spec_helper'
-
-describe 'rsyslog::install', :type => :class do
-  context "osfamily = RedHat" do
-    let :facts do
-      {
-        :osfamily        => 'RedHat',
-      }
-    end
-
-    context "default usage (osfamily = RedHat)" do
-      let(:title) { 'rsyslog-install-basic' }
-
-      it 'should compile' do
-        should contain_package('rsyslog')
-        should contain_package('rsyslog-relp')
-      end
-    end
-  end
-
-  context "osfamily = Debian" do
-    let :facts do
-      {
-        :osfamily        => 'Debian',
-      }
-    end
-
-    context "default usage (osfamily = Debian)" do
-      let(:title) { 'rsyslog-install-basic' }
-
-      it 'should compile' do
-        should contain_package('rsyslog')
-        should contain_package('rsyslog-relp')
-      end
-    end
-  end
-
-  context "osfamily = FreeBSD" do
-    let :facts do
-      {
-        :osfamily        => 'freebsd',
-      }
-    end
-
-    context "default usage (osfamily = Debian)" do
-      let(:title) { 'rsyslog-install-basic' }
-
-      it 'should compile' do
-        should contain_package('sysutils/rsyslog5')
-        should contain_package('sysutils/rsyslog5-relp')
-      end
-    end
-  end
-end
diff --git a/spec/classes/rsyslog_service_spec.rb b/spec/classes/rsyslog_service_spec.rb
deleted file mode 100644
index 411f8c1..0000000
--- a/spec/classes/rsyslog_service_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe 'rsyslog::service', :type => :class do
-  context "osfamily = RedHat" do
-    let :facts do
-      {
-        :osfamily        => 'RedHat',
-      }
-    end
-
-    context "default usage (osfamily = RedHat)" do
-      let(:title) { 'rsyslog-service-basic' }
-
-      it 'should compile' do
-        should contain_service('rsyslog')
-      end
-    end
-  end
-
-  context "osfamily = Debian" do
-    let :facts do
-      {
-        :osfamily        => 'Debian',
-      }
-    end
-
-    context "default usage (osfamily = Debian)" do
-      let(:title) { 'rsyslog-service-basic' }
-
-      it 'should compile' do
-        should contain_service('rsyslog')
-      end
-    end
-  end
-
-  context "osfamily = FreeBSD" do
-    let :facts do
-      {
-        :osfamily        => 'freebsd',
-      }
-    end
-
-    context "default usage (osfamily = Debian)" do
-      let(:title) { 'rsyslog-service-basic' }
-
-      it 'should compile' do
-        should contain_service('syslogd')
-      end
-    end
-  end
-end
diff --git a/spec/classes/rsyslog_spec.rb b/spec/classes/rsyslog_spec.rb
index d6a6bf7..1daf9aa 100644
--- a/spec/classes/rsyslog_spec.rb
+++ b/spec/classes/rsyslog_spec.rb
@@ -54,4 +54,154 @@ describe 'rsyslog', :type => :class do
       end
     end
   end
+
+  context "osfamily = RedHat" do
+    let :facts do
+      {
+        :osfamily        => 'RedHat',
+      }
+    end
+
+    context "default usage (osfamily = RedHat)" do
+      let(:title) { 'rsyslog-basic' }
+
+      it 'should compile' do
+        should contain_file('/etc/rsyslog.conf')
+        should contain_file('/etc/rsyslog.d/')
+      end
+    end
+  end
+
+  context "osfamily = Debian" do
+    let :facts do
+      {
+        :osfamily        => 'Debian',
+      }
+    end
+
+    context "default usage (osfamily = Debian)" do
+      let(:title) { 'rsyslog-basic' }
+
+      it 'should compile' do
+        should contain_file('/etc/rsyslog.conf')
+        should contain_file('/etc/rsyslog.d/')
+      end
+    end
+  end
+
+  context "osfamily = FreeBSD" do
+    let :facts do
+      {
+        :osfamily        => 'freebsd',
+      }
+    end
+
+    context "default usage (osfamily = Debian)" do
+      let(:title) { 'rsyslog-basic' }
+
+      it 'should compile' do
+        should contain_file('/etc/syslog.conf')
+        should contain_file('/etc/syslog.d/')
+      end
+    end
+  end
+
+  context "osfamily = RedHat" do
+    let :facts do
+      {
+        :osfamily        => 'RedHat',
+      }
+    end
+
+    context "default usage (osfamily = RedHat)" do
+      let(:title) { 'rsyslog-install-basic' }
+
+      it 'should compile' do
+        should contain_package('rsyslog')
+        should contain_package('rsyslog-relp')
+      end
+    end
+  end
+
+  context "osfamily = Debian" do
+    let :facts do
+      {
+        :osfamily        => 'Debian',
+      }
+    end
+
+    context "default usage (osfamily = Debian)" do
+      let(:title) { 'rsyslog-install-basic' }
+
+      it 'should compile' do
+        should contain_package('rsyslog')
+        should contain_package('rsyslog-relp')
+      end
+    end
+  end
+
+  context "osfamily = FreeBSD" do
+    let :facts do
+      {
+        :osfamily        => 'freebsd',
+      }
+    end
+
+    context "default usage (osfamily = Debian)" do
+      let(:title) { 'rsyslog-install-basic' }
+
+      it 'should compile' do
+        should contain_package('sysutils/rsyslog5')
+        should contain_package('sysutils/rsyslog5-relp')
+      end
+    end
+  end
+
+  context "osfamily = RedHat" do
+    let :facts do
+      {
+        :osfamily        => 'RedHat',
+      }
+    end
+
+    context "default usage (osfamily = RedHat)" do
+      let(:title) { 'rsyslog-service-basic' }
+
+      it 'should compile' do
+        should contain_service('rsyslog')
+      end
+    end
+  end
+
+  context "osfamily = Debian" do
+    let :facts do
+      {
+        :osfamily        => 'Debian',
+      }
+    end
+
+    context "default usage (osfamily = Debian)" do
+      let(:title) { 'rsyslog-service-basic' }
+
+      it 'should compile' do
+        should contain_service('rsyslog')
+      end
+    end
+  end
+
+  context "osfamily = FreeBSD" do
+    let :facts do
+      {
+        :osfamily        => 'freebsd',
+      }
+    end
+
+    context "default usage (osfamily = Debian)" do
+      let(:title) { 'rsyslog-service-basic' }
+
+      it 'should compile' do
+        should contain_service('syslogd')
+      end
+    end
+  end
 end
diff --git a/spec/fixtures/.gitignore b/spec/fixtures/.gitignore
index d6b7ef3..a4e73f9 100644
--- a/spec/fixtures/.gitignore
+++ b/spec/fixtures/.gitignore
@@ -1,2 +1,3 @@
 *
+!manifests/site.pp
 !.gitignore
diff --git a/spec/fixtures/manifests/site.pp b/spec/fixtures/manifests/site.pp
new file mode 100644
index 0000000..56d4561
--- /dev/null
+++ b/spec/fixtures/manifests/site.pp
@@ -0,0 +1,3 @@
+node default {
+  include ::rsyslog
+}