Merge pull request #24 from pabelanger/improvements

Improvements

3 files changed, 48 insertions, 19 deletions

diff --git a/spec/defines/init_spec.rb b/spec/defines/init_spec.rb
index d968a26..34fb24b 100644
--- a/spec/defines/init_spec.rb
+++ b/spec/defines/init_spec.rb
@@ -3,18 +3,55 @@ require 'spec_helper'
 describe 'concat' do
   basedir = '/var/lib/puppet/concat'
   let(:title) { '/etc/foo.bar' }
-  let(:facts) { { :concat_basedir => '/var/lib/puppet/concat' } }
+  let(:facts) { { 
+    :concat_basedir => '/var/lib/puppet/concat',
+    :id             => 'root',
+  } }
   let :pre_condition do
     'include concat::setup'
   end
-  it { should contain_file("#{basedir}/_etc_foo.bar").with('ensure' => 'directory') }
-  it { should contain_file("#{basedir}/_etc_foo.bar/fragments").with('ensure' => 'directory') }
 
-  it { should contain_file("#{basedir}/_etc_foo.bar/fragments.concat").with('ensure' => 'present') }
-  it { should contain_file("/etc/foo.bar").with('ensure' => 'present') }
-  it { should contain_exec("concat_/etc/foo.bar").with_command(
-                                        "#{basedir}/bin/concatfragments.sh "+
-                                        "-o #{basedir}/_etc_foo.bar/fragments.concat.out "+
-                                        "-d #{basedir}/_etc_foo.bar   ")
-  }
+  directories = [
+    "#{basedir}/_etc_foo.bar",
+    "#{basedir}/_etc_foo.bar/fragments",
+  ]
+
+  directories.each do |dirs|
+    it do
+      should contain_file(dirs).with({
+        'ensure'  => 'directory',
+        'backup'  => 'puppet',
+        'group'   => 0,
+        'mode'    => '0644',
+        'owner'   => 'root',
+      })
+    end
+  end
+
+  files = [
+    "/etc/foo.bar",
+    "#{basedir}/_etc_foo.bar/fragments.concat",
+  ]
+
+  files.each do |file|
+    it do
+      should contain_file(file).with({
+        'ensure'  => 'present',
+        'backup'  => 'puppet',
+        'group'   => 0,
+        'mode'    => '0644',
+        'owner'   => 'root',
+      })
+    end
+  end
+
+  it do
+    should contain_exec("concat_/etc/foo.bar").with_command(
+      "#{basedir}/bin/concatfragments.sh " +
+      "-o #{basedir}/_etc_foo.bar/fragments.concat.out " +
+      "-d #{basedir}/_etc_foo.bar   "
+    )
+  end
 end
+
+# vim:sw=2:ts=2:expandtab:textwidth=79
diff --git a/spec/fixtures/manifests/site.pp b/spec/fixtures/manifests/site.pp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/spec/fixtures/manifests/site.pp
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e6e9309..2c6f566 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1 @@
-require 'puppet'
-require 'rspec'
-require 'rspec-puppet'
-
-RSpec.configure do |c|
-  c.module_path = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures/modules/'))
-  # Using an empty site.pp file to avoid: https://github.com/rodjek/rspec-puppet/issues/15
-  c.manifest_dir = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures/manifests'))
-end
+require 'puppetlabs_spec_helper/module_spec_helper'