projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update stdlib and concat to 6.1.0 both
[mirror/dsa-puppet.git]
/
3rdparty
/
modules
/
concat
/
spec
/
acceptance
/
fragments_are_always_replaced_spec.rb
diff --git
a/3rdparty/modules/concat/spec/acceptance/fragments_are_always_replaced_spec.rb
b/3rdparty/modules/concat/spec/acceptance/fragments_are_always_replaced_spec.rb
index
70d7382
..
fc3f96a
100644
(file)
--- a/
3rdparty/modules/concat/spec/acceptance/fragments_are_always_replaced_spec.rb
+++ b/
3rdparty/modules/concat/spec/acceptance/fragments_are_always_replaced_spec.rb
@@
-1,139
+1,101
@@
require 'spec_helper_acceptance'
describe 'concat::fragment replace' do
require 'spec_helper_acceptance'
describe 'concat::fragment replace' do
- basedir = default.tmpdir('concat')
-
- context 'should create fragment files' do
- before(:all) do
- pp = <<-EOS
- file { '#{basedir}':
- ensure => directory,
- }
- EOS
- apply_manifest(pp)
- end
-
- pp1 = <<-EOS
- concat { '#{basedir}/foo': }
-
+ before(:all) do
+ @basedir = setup_test_directory
+ end
+
+ describe 'when run should create fragment files' do
+ let(:pp1) do
+ <<-MANIFEST
+ concat { '#{@basedir}/foo': }
concat::fragment { '1':
concat::fragment { '1':
- target => '#{basedir}/foo',
+ target => '#{
@
basedir}/foo',
content => 'caller has replace unset run 1',
}
content => 'caller has replace unset run 1',
}
- EOS
- pp2 = <<-EOS
- concat { '#{basedir}/foo': }
-
+ MANIFEST
+ end
+ let(:pp2) do
+ <<-MANIFEST
+ concat { '#{@basedir}/foo': }
concat::fragment { '1':
concat::fragment { '1':
- target => '#{basedir}/foo',
+ target => '#{
@
basedir}/foo',
content => 'caller has replace unset run 2',
}
content => 'caller has replace unset run 2',
}
- EOS
-
- it 'applies the manifest twice with no stderr' do
- apply_manifest(pp1, :catch_failures => true)
- apply_manifest(pp1, :catch_changes => true)
- apply_manifest(pp2, :catch_failures => true)
- apply_manifest(pp2, :catch_changes => true)
+ MANIFEST
end
end
- describe file("#{basedir}/foo") do
- it { should be_file }
- its(:content) {
- should_not match 'caller has replace unset run 1'
- should match 'caller has replace unset run 2'
- }
- end
- end # should create fragment files
-
- context 'should replace its own fragment files when caller has File { replace=>true } set' do
- before(:all) do
- pp = <<-EOS
- file { '#{basedir}':
- ensure => directory,
- }
- EOS
- apply_manifest(pp)
+ it 'applies the manifest twice with no stderr' do
+ idempotent_apply(pp1)
+ idempotent_apply(pp2)
+ expect(file("#{@basedir}/foo")).to be_file
+ expect(file("#{@basedir}/foo").content).not_to match 'caller has replace unset run 1'
+ expect(file("#{@basedir}/foo").content).to match 'caller has replace unset run 2'
end
end
+ end
+ # should create fragment files
- pp1 = <<-EOS
+ describe 'when run should replace its own fragment files when caller has File { replace=>true } set' do
+ let(:pp1) do
+ <<-MANIFEST
File { replace=>true }
File { replace=>true }
- concat { '#{basedir}/foo': }
-
+ concat { '#{@basedir}/foo': }
concat::fragment { '1':
concat::fragment { '1':
- target => '#{basedir}/foo',
+ target => '#{
@
basedir}/foo',
content => 'caller has replace true set run 1',
}
content => 'caller has replace true set run 1',
}
- EOS
- pp2 = <<-EOS
+ MANIFEST
+ end
+ let(:pp2) do
+ <<-MANIFEST
File { replace=>true }
File { replace=>true }
- concat { '#{basedir}/foo': }
-
+ concat { '#{@basedir}/foo': }
concat::fragment { '1':
concat::fragment { '1':
- target => '#{basedir}/foo',
+ target => '#{
@
basedir}/foo',
content => 'caller has replace true set run 2',
}
content => 'caller has replace true set run 2',
}
- EOS
-
- it 'applies the manifest twice with no stderr' do
- apply_manifest(pp1, :catch_failures => true)
- apply_manifest(pp1, :catch_changes => true)
- apply_manifest(pp2, :catch_failures => true)
- apply_manifest(pp2, :catch_changes => true)
+ MANIFEST
end
end
- describe file("#{basedir}/foo") do
- it { should be_file }
- its(:content) {
- should_not match 'caller has replace true set run 1'
- should match 'caller has replace true set run 2'
- }
- end
- end # should replace its own fragment files when caller has File(replace=>true) set
-
- context 'should replace its own fragment files even when caller has File { replace=>false } set' do
- before(:all) do
- pp = <<-EOS
- file { '#{basedir}':
- ensure => directory,
- }
- EOS
- apply_manifest(pp)
+ it 'applies the manifest twice with no stderr' do
+ idempotent_apply(pp1)
+ idempotent_apply(pp2)
+ expect(file("#{@basedir}/foo")).to be_file
+ expect(file("#{@basedir}/foo").content).not_to match 'caller has replace true set run 1'
+ expect(file("#{@basedir}/foo").content).to match 'caller has replace true set run 2'
end
end
+ end
+ # should replace its own fragment files when caller has File(replace=>true) set
- pp1 = <<-EOS
+ describe 'when run should replace its own fragment files even when caller has File { replace=>false } set' do
+ let(:pp1) do
+ <<-MANIFEST
File { replace=>false }
File { replace=>false }
- concat { '#{basedir}/foo': }
-
+ concat { '#{@basedir}/foo': }
concat::fragment { '1':
concat::fragment { '1':
- target => '#{basedir}/foo',
+ target => '#{
@
basedir}/foo',
content => 'caller has replace false set run 1',
}
content => 'caller has replace false set run 1',
}
- EOS
- pp2 = <<-EOS
+ MANIFEST
+ end
+ let(:pp2) do
+ <<-MANIFEST
File { replace=>false }
File { replace=>false }
- concat { '#{basedir}/foo': }
-
+ concat { '#{@basedir}/foo': }
concat::fragment { '1':
concat::fragment { '1':
- target => '#{basedir}/foo',
+ target => '#{
@
basedir}/foo',
content => 'caller has replace false set run 2',
}
content => 'caller has replace false set run 2',
}
- EOS
-
- it 'applies the manifest twice with no stderr' do
- apply_manifest(pp1, :catch_failures => true)
- apply_manifest(pp1, :catch_changes => true)
- apply_manifest(pp2, :catch_failures => true)
- apply_manifest(pp2, :catch_changes => true)
+ MANIFEST
end
end
-
describe file("#{basedir}/foo")
do
- i
t { should be_file }
- i
ts(:content) {
- should_not match 'caller has replace false set run 1'
-
should match 'caller has replace false set run 2
'
- }
+
it 'applies the manifest twice with no stderr'
do
+ i
dempotent_apply(pp1)
+ i
dempotent_apply(pp2)
+ expect(file("#{@basedir}/foo")).to be_file
+
expect(file("#{@basedir}/foo").content).not_to match 'caller has replace false set run 1
'
+ expect(file("#{@basedir}/foo").content).to match 'caller has replace false set run 2'
end
end
- end
# should replace its own fragment files even when caller has File(replace=>false) set
-
+ end
+ # should replace its own fragment files even when caller has File(replace=>false) set
end
end