X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fconcat%2Fspec%2Facceptance%2Freplace_spec.rb;h=c9e28ecc4a1361b10e7ff0d002aa67e4a35f4512;hb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;hp=bd597ed19a25eeffac0678b78503bc6cfc0e8a98;hpb=917f80937c03a7f486d25fa70373f1f4d4b02958;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/concat/spec/acceptance/replace_spec.rb b/3rdparty/modules/concat/spec/acceptance/replace_spec.rb
index bd597ed19..c9e28ecc4 100644
--- a/3rdparty/modules/concat/spec/acceptance/replace_spec.rb
+++ b/3rdparty/modules/concat/spec/acceptance/replace_spec.rb
@@ -217,8 +217,8 @@ describe 'replacement of' do
       EOS
 
       it 'applies the manifest twice with stderr for changing to file' do
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from directory to file failed/)
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from directory to file failed/)
+        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from '?directory'? to '?file'? failed/)
+        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from '?directory'? to '?file'? failed/)
       end
 
       describe file("#{basedir}/file") do
@@ -226,7 +226,7 @@ describe 'replacement of' do
       end
     end
 
-    # XXX concat's force param currently enables the creation of empty files
+    # XXX 
     # when there are no fragments, and the replace param will only replace
     # files and symlinks, not directories.  The semantics either need to be
     # changed, extended, or a new param introduced to control directory
@@ -234,7 +234,6 @@ describe 'replacement of' do
     context 'should succeed', :pending => 'not yet implemented' do
       pp = <<-EOS
         concat { '#{basedir}/file':
-          force => true,
         }
 
         concat::fragment { '1':