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
/
newline_spec.rb
diff --git
a/3rdparty/modules/concat/spec/acceptance/newline_spec.rb
b/3rdparty/modules/concat/spec/acceptance/newline_spec.rb
index
c1fa16a
..
7a8bfdf
100644
(file)
--- a/
3rdparty/modules/concat/spec/acceptance/newline_spec.rb
+++ b/
3rdparty/modules/concat/spec/acceptance/newline_spec.rb
@@
-1,67
+1,54
@@
require 'spec_helper_acceptance'
describe 'concat ensure_newline parameter' do
require 'spec_helper_acceptance'
describe 'concat ensure_newline parameter' do
- basedir = default.tmpdir('concat')
- context '=> false' do
- before(:all) do
- pp = <<-EOS
- file { '#{basedir}':
- ensure => directory
- }
- EOS
-
- apply_manifest(pp)
- end
- pp = <<-EOS
- concat { '#{basedir}/file':
+ before(:all) do
+ @basedir = setup_test_directory
+ end
+ describe 'when false' do
+ let(:pp) do
+ <<-MANIFEST
+ concat { '#{@basedir}/file':
ensure_newline => false,
}
concat::fragment { '1':
ensure_newline => false,
}
concat::fragment { '1':
- target => '#{basedir}/file',
+ target => '#{
@
basedir}/file',
content => '1',
}
concat::fragment { '2':
content => '1',
}
concat::fragment { '2':
- target => '#{basedir}/file',
+ target => '#{
@
basedir}/file',
content => '2',
}
content => '2',
}
- EOS
-
- it 'applies the manifest twice with no stderr' do
- apply_manifest(pp, :catch_failures => true)
- apply_manifest(pp, :catch_changes => true)
+ MANIFEST
end
end
- describe file("#{basedir}/file") do
- it { should be_file }
- its(:content) { should match '12' }
+ 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 '12'
end
end
end
end
- context '=> true' do
- pp = <<-EOS
- concat { '#{basedir}/file':
+ describe 'when true' do
+ let(:pp) do
+ <<-MANIFEST
+ concat { '#{@basedir}/file':
ensure_newline => true,
}
concat::fragment { '1':
ensure_newline => true,
}
concat::fragment { '1':
- target => '#{basedir}/file',
+ target => '#{
@
basedir}/file',
content => '1',
}
concat::fragment { '2':
content => '1',
}
concat::fragment { '2':
- target => '#{basedir}/file',
+ target => '#{
@
basedir}/file',
content => '2',
}
content => '2',
}
- EOS
-
- it 'applies the manifest twice with no stderr' do
- apply_manifest(pp, :catch_failures => true)
- apply_manifest(pp, :catch_changes => true)
+ MANIFEST
end
end
- describe file("#{basedir}/file") do
- it { should be_file }
- its(:content) {
- should match /1\n2\n/
- }
+ 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 %r{1\r?\n2\r?\n}
end
end
end
end
end
end