Merge pull request #632 from jfryman/update-upstream-tests

spec: update upstream_spec for puppetlabs-concat 2
voxpupuli · May 19, 2015 · c092c5a · c092c5a
2 parents 9d45695 + c143078
commit c092c5a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/spec/defines/resource_upstream_spec.rb b/spec/defines/resource_upstream_spec.rb
@@ -27,8 +27,7 @@
     describe 'basic assumptions' do
       let :params do default_params end
 
-      it { is_expected.to contain_class('concat::setup') }
-      it { is_expected.to contain_file("/etc/nginx/conf.d/#{title}-upstream.conf") }
+      it { is_expected.to contain_concat("/etc/nginx/conf.d/#{title}-upstream.conf") }
       it { is_expected.to contain_concat__fragment("#{title}_upstream_header").with_content(/upstream #{title}/) }
 
       it {
@@ -96,7 +95,7 @@
         context "when #{param[:attr]} is #{param[:value]}" do
           let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
 
-          it { is_expected.to contain_file("/etc/nginx/conf.d/#{title}-upstream.conf").with_mode('0644') }
+          it { is_expected.to contain_concat("/etc/nginx/conf.d/#{title}-upstream.conf").with_mode('0644') }
           it { is_expected.to contain_concat__fragment("#{title}_upstream_#{param[:fragment]}") }
           it param[:title] do
             lines = catalogue.resource('concat::fragment', "#{title}_upstream_#{param[:fragment]}").send(:parameters)[:content].split("\n")
@@ -115,7 +114,7 @@
           }
         ) end
 
-        it { is_expected.to contain_file("/etc/nginx/conf.d/#{title}-upstream.conf").with_ensure('absent') }
+        it { is_expected.to contain_concat("/etc/nginx/conf.d/#{title}-upstream.conf").with_ensure('absent') }
       end
     end
   end