diff --git a/spec/acceptance/backup_spec.rb b/spec/acceptance/backup_spec.rb index 5a740b0..7b2858d 100644 --- a/spec/acceptance/backup_spec.rb +++ b/spec/acceptance/backup_spec.rb @@ -3,12 +3,10 @@ require 'spec_helper_acceptance' describe 'concat backup parameter' do context '=> puppet' do before :all do + shell('rm -rf /tmp/concat') shell('mkdir -p /tmp/concat') shell("/bin/echo 'old contents' > /tmp/concat/file") end - after :all do - shell('rm -rf /tmp/concat') - end pp = <<-EOS concat { '/tmp/concat/file': @@ -36,12 +34,10 @@ describe 'concat backup parameter' do context '=> .backup' do before :all do + shell('rm -rf /tmp/concat') shell('mkdir -p /tmp/concat') shell("/bin/echo 'old contents' > /tmp/concat/file") end - after :all do - shell('rm -rf /tmp/concat') - end pp = <<-EOS concat { '/tmp/concat/file': @@ -74,12 +70,10 @@ describe 'concat backup parameter' do # boolean false value, but the string 'false' has the same effect in Puppet 3 context "=> 'false'" do before :all do + shell('rm -rf /tmp/concat') shell('mkdir -p /tmp/concat') shell("/bin/echo 'old contents' > /tmp/concat/file") end - after :all do - shell('rm -rf /tmp/concat') - end pp = <<-EOS concat { '/tmp/concat/file': diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb deleted file mode 100644 index 5d78d7b..0000000 --- a/spec/acceptance/basic_spec.rb +++ /dev/null @@ -1,12 +0,0 @@ -require 'spec_helper_acceptance' - -# Here we put the more basic fundamental tests, ultra obvious stuff. -describe "basic tests:" do - it 'copies the module across' do - # No point diagnosing any more if the module wasn't copied properly - shell "ls #{default['distmoduledir']}/concat" do |r| - expect(r.stdout).to match(/Modulefile/) - expect(r.stderr).to be_empty - end - end -end