Merge branch 'develop'

2 files changed, 20 insertions, 0 deletions

diff --git a/puppet/modules/concat b/puppet/modules/concat
deleted file mode 160000
-Subproject abce1280e07b544d8455f1572dd870bbd2f1489
diff --git a/puppet/modules/concat/spec/defines/init_spec.rb b/puppet/modules/concat/spec/defines/init_spec.rb
new file mode 100644
index 00000000..d968a26c
--- /dev/null
+++ b/puppet/modules/concat/spec/defines/init_spec.rb
@@ -0,0 +1,20 @@
+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 :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   ")
+  }
+end