Update stdlib and concat to 6.1.0 both

[mirror/dsa-puppet.git] / 3rdparty / modules / concat / spec / acceptance / symbolic_name_spec.rb

diff --git a/3rdparty/modules/concat/spec/acceptance/symbolic_name_spec.rb b/3rdparty/modules/concat/spec/acceptance/symbolic_name_spec.rb
index df8d54f..1a55a84 100644 (file)
--- a/3rdparty/modules/concat/spec/acceptance/symbolic_name_spec.rb
+++ b/3rdparty/modules/concat/spec/acceptance/symbolic_name_spec.rb
@@ -1,35 +1,34 @@
 require 'spec_helper_acceptance'
 
 describe 'symbolic name' do
-  basedir = default.tmpdir('concat')
-  pp = <<-EOS
-    concat { 'not_abs_path':
-      path => '#{basedir}/file',
-    }
+  before(:all) do
+    @basedir = setup_test_directory
+  end
 
-    concat::fragment { '1':
-      target  => 'not_abs_path',
-      content => '1',
-      order   => '01',
-    }
+  let(:pp) do
+    <<-MANIFEST
+      concat { 'not_abs_path':
+        path => '#{@basedir}/file',
+      }
 
-    concat::fragment { '2':
-      target  => 'not_abs_path',
-      content => '2',
-      order   => '02',
-    }
-  EOS
+      concat::fragment { '1':
+        target  => 'not_abs_path',
+        content => '1',
+        order   => '01',
+      }
 
-  it 'applies the manifest twice with no stderr' do
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
+      concat::fragment { '2':
+        target  => 'not_abs_path',
+        content => '2',
+        order   => '02',
+      }
+    MANIFEST
   end
 
-  describe file("#{basedir}/file") do
-    it { should be_file }
-    its(:content) {
-      should match '1'
-      should match '2'
-    }
+  it 'applies the manifest twice with no stderr' do
+    idempotent_apply(pp)
+    expect(file("#{@basedir}/file")).to be_file
+    expect(file("#{@basedir}/file").content).to match '1'
+    expect(file("#{@basedir}/file").content).to match '2'
   end
 end