Convert acceptance tests to Rspec

17 files changed, 333 insertions, 344 deletions

diff --git a/spec/acceptance/tests/resource/cron/should_allow_changing_parameters.rb b/spec/acceptance/tests/resource/cron/should_allow_changing_parameters.rb
deleted file mode 100644
index 0e0821d..0000000
--- a/spec/acceptance/tests/resource/cron/should_allow_changing_parameters.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-test_name 'Cron: should allow changing parameters after creation'
-confine :except, platform: 'windows'
-confine :except, platform: %r{^eos-} # See PUP-5500
-confine :except, platform: %r{^fedora-28}
-tag 'audit:medium',
-    'audit:refactor',  # Use block style `test_name`
-    'audit:acceptance' # Could be done at the integration (or unit) layer though
-                       # actual changing of resources could irreparably damage a
-                       # host running this, or require special permissions.
-
-require 'puppet/acceptance/common_utils'
-extend Puppet::Acceptance::CronUtils
-
-teardown do
-  step 'Cron: cleanup'
-  agents.each do |agent|
-    clean agent
-  end
-end
-
-agents.each do |agent|
-  step 'ensure the user exist via puppet'
-  setup agent
-
-  step 'Cron: basic - verify that it can be created'
-  apply_manifest_on(agent, 'cron { "myjob": command => "/bin/false", user    => "tstuser", hour    => "*", minute  => [1], ensure  => present,}') do
-    assert_match(%r{ensure: created}, result.stdout, "err: #{agent}")
-  end
-  run_cron_on(agent, :list, 'tstuser') do
-    assert_match(%r{.bin.false}, result.stdout, "err: #{agent}")
-  end
-
-  step 'Cron: allow changing command'
-  apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => "*", minute  => [1], ensure  => present,}') do
-    assert_match(%r{command changed '.bin.false'.* to '.bin.true'}, result.stdout, "err: #{agent}")
-  end
-  run_cron_on(agent, :list, 'tstuser') do
-    assert_match(%r{1 . . . . .bin.true}, result.stdout, "err: #{agent}")
-  end
-
-  step 'Cron: allow changing time'
-  apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => "1", minute  => [1], ensure  => present,}') do
-    assert_match(%r{hour: defined 'hour' as \['1'\]}, result.stdout, "err: #{agent}")
-  end
-  run_cron_on(agent, :list, 'tstuser') do
-    assert_match(%r{1 1 . . . .bin.true}, result.stdout, "err: #{agent}")
-  end
-
-  step 'Cron: allow changing time(array)'
-  apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => ["1","2"], minute  => [1], ensure  => present,}') do
-    assert_match(%r{hour: hour changed \['1'\].* to \['1', '2'\]}, result.stdout, "err: #{agent}")
-  end
-  run_cron_on(agent, :list, 'tstuser') do
-    assert_match(%r{1 1,2 . . . .bin.true}, result.stdout, "err: #{agent}")
-  end
-
-  step 'Cron: allow changing time(array modification)'
-  apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => ["3","2"], minute  => [1], ensure  => present,}') do
-    assert_match(%r{hour: hour changed \['1', '2'\].* to \['3', '2'\]}, result.stdout, "err: #{agent}")
-  end
-  run_cron_on(agent, :list, 'tstuser') do
-    assert_match(%r{1 3,2 . . . .bin.true}, result.stdout, "err: #{agent}")
-  end
-  step 'Cron: allow changing time(array modification to *)'
-  apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => "*", minute  => "*", ensure  => present,}') do
-    assert_match(%r{minute: undefined 'minute' from \['1'\]}, result.stdout, "err: #{agent}")
-    assert_match(%r{hour: undefined 'hour' from \['3', '2'\]}, result.stdout, "err: #{agent}")
-  end
-  run_cron_on(agent, :list, 'tstuser') do
-    assert_match(%r{\* \* . . . .bin.true}, result.stdout, "err: #{agent}")
-  end
-end
diff --git a/spec/acceptance/tests/resource/cron/should_allow_changing_parameters_spec.rb b/spec/acceptance/tests/resource/cron/should_allow_changing_parameters_spec.rb
new file mode 100644
index 0000000..2ff0dc4
--- /dev/null
+++ b/spec/acceptance/tests/resource/cron/should_allow_changing_parameters_spec.rb
@@ -0,0 +1,71 @@
+require 'spec_helper_acceptance'
+require 'puppet/acceptance/common_utils'
+extend Puppet::Acceptance::CronUtils
+
+Rspec.context 'when changing parameters' do
+  before(:each) do
+    compatible_agents.each do |agent|
+      step 'ensure the user exists via puppet'
+      setup(agent)
+    end
+  end
+
+  after(:each) do
+    compatible_agents.each do |agent|
+      step 'Cron: cleanup'
+      clean(agent)
+    end
+  end
+
+  compatible_agents.each do |agent|
+    it "manages cron entries on #{agent}" do
+      step 'Cron: basic - verify that it can be created'
+      apply_manifest_on(agent, 'cron { "myjob": command => "/bin/false", user    => "tstuser", hour    => "*", minute  => [1], ensure  => present,}') do
+        expect(result.stdout).to match(%r{ensure: created})
+      end
+      run_cron_on(agent, :list, 'tstuser') do
+        expect(result.stdout).to match(%r{.bin.false})
+      end
+
+      step 'Cron: allow changing command'
+      apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => "*", minute  => [1], ensure  => present,}') do
+        expect(result.stdout).to match(%r{command changed '.bin.false'.* to '.bin.true'})
+      end
+      run_cron_on(agent, :list, 'tstuser') do
+        expect(result.stdout).to match(%r{1 . . . . .bin.true})
+      end
+
+      step 'Cron: allow changing time'
+      apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => "1", minute  => [1], ensure  => present,}') do
+        expect(result.stdout).to match(%r{hour: defined 'hour' as \['1'\]})
+      end
+      run_cron_on(agent, :list, 'tstuser') do
+        expect(result.stdout).to match(%r{1 1 . . . .bin.true})
+      end
+
+      step 'Cron: allow changing time(array)'
+      apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => ["1","2"], minute  => [1], ensure  => present,}') do
+        expect(result.stdout).to match(%r{hour: hour changed \['1'\].* to \['1', '2'\]})
+      end
+      run_cron_on(agent, :list, 'tstuser') do
+        expect(result.stdout).to match(%r{1 1,2 . . . .bin.true})
+      end
+
+      step 'Cron: allow changing time(array modification)'
+      apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => ["3","2"], minute  => [1], ensure  => present,}') do
+        expect(result.stdout).to match(%r{hour: hour changed \['1', '2'\].* to \['3', '2'\]})
+      end
+      run_cron_on(agent, :list, 'tstuser') do
+        expect(result.stdout).to match(%r{1 3,2 . . . .bin.true})
+      end
+      step 'Cron: allow changing time(array modification to *)'
+      apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => "*", minute  => "*", ensure  => present,}') do
+        expect(result.stdout).to match(%r{minute: undefined 'minute' from \['1'\]})
+        expect(result.stdout).to match(%r{hour: undefined 'hour' from \['3', '2'\]})
+      end
+      run_cron_on(agent, :list, 'tstuser') do
+        expect(result.stdout).to match(%r{\* \* . . . .bin.true})
+      end
+    end
+  end
+end
diff --git a/spec/acceptance/tests/resource/cron/should_be_idempotent.rb b/spec/acceptance/tests/resource/cron/should_be_idempotent.rb
deleted file mode 100644
index 9b286f7..0000000
--- a/spec/acceptance/tests/resource/cron/should_be_idempotent.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-test_name 'Cron: check idempotency'
-confine :except, platform: 'windows'
-confine :except, platform: %r{^eos-} # See PUP-5500
-confine :except, platform: %r{^fedora-28}
-tag 'audit:medium',
-    'audit:refactor',  # Use block style `test_name`
-    'audit:acceptance' # Could be done at the integration (or unit) layer though
-                       # actual changing of resources could irreparably damage a
-                       # host running this, or require special permissions.
-
-require 'puppet/acceptance/common_utils'
-extend Puppet::Acceptance::CronUtils
-
-teardown do
-  step 'Cron: cleanup'
-  agents.each do |agent|
-    clean agent
-  end
-end
-
-agents.each do |agent|
-  step 'ensure the user exist via puppet'
-  setup agent
-
-  step 'Cron: basic - verify that it can be created'
-  apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => "*", minute  => [1], ensure  => present,}') do
-    assert_match(%r{ensure: created}, result.stdout, "err: #{agent}")
-  end
-  run_cron_on(agent, :list, 'tstuser') do
-    assert_match(%r{. . . . . .bin.true}, result.stdout, "err: #{agent}")
-  end
-
-  step 'Cron: basic - should not create again'
-  apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => "*", minute  => [1], ensure  => present,}') do
-    assert_no_match(%r{ensure: created}, result.stdout, "err: #{agent}")
-  end
-end
diff --git a/spec/acceptance/tests/resource/cron/should_be_idempotent_spec.rb b/spec/acceptance/tests/resource/cron/should_be_idempotent_spec.rb
new file mode 100644
index 0000000..7d4d386
--- /dev/null
+++ b/spec/acceptance/tests/resource/cron/should_be_idempotent_spec.rb
@@ -0,0 +1,36 @@
+require 'spec_helper_acceptance'
+require 'puppet/acceptance/common_utils'
+extend Puppet::Acceptance::CronUtils
+
+Rspec.context 'when checking idempotency' do
+  before(:each) do
+    compatible_agents.each do |agent|
+      step 'ensure the user exists via puppet'
+      setup(agent)
+    end
+  end
+
+  after(:each) do
+    compatible_agents.each do |agent|
+      step 'Cron: cleanup'
+      clean(agent)
+    end
+  end
+
+  compatible_agents.each do |agent|
+    it "ensures idempotency on #{agent}" do
+      step 'Cron: basic - verify that it can be created'
+      apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => "*", minute  => [1], ensure  => present,}') do
+        expect(result.stdout).to match(%r{ensure: created})
+      end
+      run_cron_on(agent, :list, 'tstuser') do
+        expect(result.stdout).to match(%r{. . . . . .bin.true})
+      end
+
+      step 'Cron: basic - should not create again'
+      apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => "*", minute  => [1], ensure  => present,}') do
+        expect(result.stdout).not_to match(%r{ensure: created})
+      end
+    end
+  end
+end
diff --git a/spec/acceptance/tests/resource/cron/should_create_cron.rb b/spec/acceptance/tests/resource/cron/should_create_cron.rb
deleted file mode 100644
index d01c091..0000000
--- a/spec/acceptance/tests/resource/cron/should_create_cron.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-test_name 'should create cron'
-confine :except, platform: 'windows'
-confine :except, platform: %r{^eos-} # See PUP-5500
-confine :except, platform: %r{^fedora-28}
-tag 'audit:medium',
-    'audit:refactor',  # Use block style `test_name`
-    'audit:acceptance' # Could be done at the integration (or unit) layer though
-                       # actual changing of resources could irreparably damage a
-                       # host running this, or require special permissions.
-
-require 'puppet/acceptance/common_utils'
-extend Puppet::Acceptance::CronUtils
-
-teardown do
-  step 'Cron: cleanup'
-  agents.each do |agent|
-    clean agent
-  end
-end
-
-agents.each do |host|
-  step 'ensure the user exist via puppet'
-  setup host
-
-  step 'apply the resource on the host using puppet resource'
-  on(host, puppet_resource('cron', 'crontest', 'user=tstuser',
-                           'command=/bin/true', 'ensure=present')) do
-    assert_match(%r{created}, stdout, "Did not create crontab for tstuser on #{host}")
-  end
-
-  step 'verify that crontab -l contains what you expected'
-  run_cron_on(host, :list, 'tstuser') do
-    assert_match(%r{\* \* \* \* \* /bin/true}, stdout, "Incorrect crontab for tstuser on #{host}")
-  end
-end
diff --git a/spec/acceptance/tests/resource/cron/should_create_cron_spec.rb b/spec/acceptance/tests/resource/cron/should_create_cron_spec.rb
new file mode 100644
index 0000000..b1623a4
--- /dev/null
+++ b/spec/acceptance/tests/resource/cron/should_create_cron_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper_acceptance'
+require 'puppet/acceptance/common_utils'
+extend Puppet::Acceptance::CronUtils
+
+Rspec.context 'when creating cron' do
+  before(:each) do
+    compatible_agents.each do |agent|
+      step 'ensure the user exists via puppet'
+      setup(agent)
+    end
+  end
+
+  after(:each) do
+    compatible_agents.each do |agent|
+      step 'Cron: cleanup'
+      clean(agent)
+    end
+  end
+
+  compatible_agents.each do |host|
+    it 'creates a cron' do
+      step 'apply the resource on the host using puppet resource'
+      on(host, puppet_resource('cron', 'crontest', 'user=tstuser', 'command=/bin/true', 'ensure=present')) do
+        expect(stdout).to match(%r{created})
+      end
+
+      step 'verify that crontab -l contains what you expected'
+      run_cron_on(host, :list, 'tstuser') do
+        expect(stdout).to match(%r{\* \* \* \* \* /bin/true})
+      end
+    end
+  end
+end
diff --git a/spec/acceptance/tests/resource/cron/should_match_existing.rb b/spec/acceptance/tests/resource/cron/should_match_existing.rb
deleted file mode 100644
index 96545e3..0000000
--- a/spec/acceptance/tests/resource/cron/should_match_existing.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-test_name 'puppet should match existing job'
-confine :except, platform: 'windows'
-confine :except, platform: %r{^eos-} # See PUP-5500
-confine :except, platform: %r{^fedora-28}
-tag 'audit:medium',
-    'audit:refactor', # Use block style `test_name`
-    'audit:unit'
-
-require 'puppet/acceptance/common_utils'
-extend Puppet::Acceptance::CronUtils
-
-teardown do
-  step 'Cron: cleanup'
-  agents.each do |agent|
-    clean agent
-  end
-end
-
-agents.each do |host|
-  step 'ensure the user exist via puppet'
-  setup host
-
-  step 'Create the existing cron job by hand...'
-  run_cron_on(host, :add, 'tstuser', '* * * * * /bin/true')
-
-  step 'Apply the resource on the host using puppet resource'
-  on(host, puppet_resource('cron', 'crontest', 'user=tstuser',
-                           'command=/bin/true', 'ensure=present')) do
-    assert_match(%r{present}, stdout, "Failed creating crontab for tstuser on #{host}")
-  end
-
-  step 'Verify that crontab -l contains what you expected'
-  run_cron_on(host, :list, 'tstuser') do
-    assert_match(%r{\* \* \* \* \* /bin/true}, stdout, "Did not find crontab for tstuser on #{host}")
-  end
-end
diff --git a/spec/acceptance/tests/resource/cron/should_match_existing_spec.rb b/spec/acceptance/tests/resource/cron/should_match_existing_spec.rb
new file mode 100644
index 0000000..8097714
--- /dev/null
+++ b/spec/acceptance/tests/resource/cron/should_match_existing_spec.rb
@@ -0,0 +1,35 @@
+require 'spec_helper_acceptance'
+require 'puppet/acceptance/common_utils'
+extend Puppet::Acceptance::CronUtils
+
+Rspec.context 'when matching cron' do
+  before(:each) do
+    compatible_agents.each do |agent|
+      step 'ensure the user exists via puppet'
+      setup(agent)
+      step 'Create the existing cron job by hand...'
+      run_cron_on(agent, :add, 'tstuser', '* * * * * /bin/true')
+    end
+  end
+
+  after(:each) do
+    compatible_agents.each do |agent|
+      step 'Cron: cleanup'
+      clean(agent)
+    end
+  end
+
+  compatible_agents.each do |host|
+    it 'matches existing cron jobs' do
+      step 'Apply the resource on the host using puppet resource'
+      on(host, puppet_resource('cron', 'crontest', 'user=tstuser', 'command=/bin/true', 'ensure=present')) do
+        expect(stdout).to match(%r{present})
+      end
+
+      step 'Verify that crontab -l contains what you expected'
+      run_cron_on(host, :list, 'tstuser') do
+        expect(stdout).to match(%r{\* \* \* \* \* /bin/true})
+      end
+    end
+  end
+end
diff --git a/spec/acceptance/tests/resource/cron/should_remove_cron.rb b/spec/acceptance/tests/resource/cron/should_remove_cron.rb
deleted file mode 100644
index 0713c95..0000000
--- a/spec/acceptance/tests/resource/cron/should_remove_cron.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-test_name 'puppet should remove a crontab entry as expected'
-confine :except, platform: 'windows'
-confine :except, platform: %r{^eos-} # See PUP-5500
-confine :except, platform: %r{^fedora-28}
-tag 'audit:medium',
-    'audit:refactor',  # Use block style `test_name`
-    'audit:acceptance' # Could be done at the integration (or unit) layer though
-                       # actual changing of resources could irreparably damage a
-                       # host running this, or require special permissions.
-
-require 'puppet/acceptance/common_utils'
-extend Puppet::Acceptance::CronUtils
-
-teardown do
-  step 'Cron: cleanup'
-  agents.each do |agent|
-    clean agent
-  end
-end
-
-agents.each do |host|
-  step 'ensure the user exist via puppet'
-  setup host
-
-  step 'create the existing job by hand...'
-  run_cron_on(host, :add, 'tstuser', '* * * * * /bin/true')
-
-  step 'apply the resource on the host using puppet resource'
-  on(host, puppet_resource('cron', 'crontest', 'user=tstuser',
-                           'command=/bin/true', 'ensure=absent')) do
-    assert_match(%r{crontest\D+ensure:\s+removed}, stdout, "Didn't remove crobtab entry for tstuser on #{host}")
-  end
-
-  step 'verify that crontab -l contains what you expected'
-  run_cron_on(host, :list, 'tstuser') do
-    assert_no_match(%r{/bin/true}, stderr, "Error: Found entry for tstuser on #{host}")
-  end
-end
diff --git a/spec/acceptance/tests/resource/cron/should_remove_cron_spec.rb b/spec/acceptance/tests/resource/cron/should_remove_cron_spec.rb
new file mode 100644
index 0000000..89190a5
--- /dev/null
+++ b/spec/acceptance/tests/resource/cron/should_remove_cron_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper_acceptance'
+require 'puppet/acceptance/common_utils'
+extend Puppet::Acceptance::CronUtils
+
+Rspec.context 'when removing crontab' do
+  before(:each) do
+    compatible_agents.each do |agent|
+      step 'ensure the user exists via puppet'
+      setup(agent)
+    end
+  end
+
+  after(:each) do
+    compatible_agents.each do |agent|
+      step 'Cron: cleanup'
+      clean(agent)
+    end
+  end
+
+  compatible_agents.each do |host|
+    it 'removes existing crontabs' do
+      step 'create the existing job by hand...'
+      run_cron_on(host, :add, 'tstuser', '* * * * * /bin/true')
+
+      step 'apply the resource on the host using puppet resource'
+      on(host, puppet_resource('cron', 'crontest', 'user=tstuser',
+                               'command=/bin/true', 'ensure=absent')) do
+        expect(stdout).to match(%r{crontest\D+ensure:\s+removed})
+      end
+
+      step 'verify that crontab -l contains what you expected'
+      run_cron_on(host, :list, 'tstuser') do
+        expect(stderr).to match(%r{/bin/true})
+      end
+    end
+  end
+end
diff --git a/spec/acceptance/tests/resource/cron/should_remove_leading_and_trailing_whitespace.rb b/spec/acceptance/tests/resource/cron/should_remove_leading_and_trailing_whitespace.rb
deleted file mode 100644
index b643156..0000000
--- a/spec/acceptance/tests/resource/cron/should_remove_leading_and_trailing_whitespace.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-test_name '(#656) leading and trailing whitespace in cron entries should should be stripped'
-confine :except, platform: 'windows'
-confine :except, platform: %r{^eos-} # See PUP-5500
-confine :except, platform: %r{^fedora-28}
-tag 'audit:medium',
-    'audit:refactor', # Use block style `test_name`
-    'audit:unit'
-
-require 'puppet/acceptance/common_utils'
-extend Puppet::Acceptance::CronUtils
-
-teardown do
-  step 'Cron: cleanup'
-  agents.each do |agent|
-    clean agent
-  end
-end
-
-agents.each do |host|
-  step 'create user account for testing cron entries'
-  setup host
-
-  step 'apply the resource on the host using puppet resource'
-  on(host, puppet_resource('cron', 'crontest', 'user=tstuser', "command='   date > /dev/null    '", 'ensure=present')) do
-    assert_match(%r{created}, stdout, "Did not create crontab for tstuser on #{host}")
-  end
-
-  step 'verify the added crontab entry has stripped whitespace'
-  run_cron_on(host, :list, 'tstuser') do
-    assert_match(%r{\* \* \* \* \* date > .dev.null}, stdout, "Incorrect crontab for tstuser on #{host}")
-  end
-
-  step 'apply the resource with trailing whitespace and check nothing happened'
-  on(host, puppet_resource('cron', 'crontest', 'user=tstuser', "command='date > /dev/null    '", 'ensure=present')) do
-    assert_no_match(%r{ensure: created}, stdout, "Rewrote the line with trailing space in crontab for tstuser on #{host}")
-  end
-
-  step 'apply the resource with leading whitespace and check nothing happened'
-  on(host, puppet_resource('cron', 'crontest', 'user=tstuser', "command='     date > /dev/null'", 'ensure=present')) do
-    assert_no_match(%r{ensure: created}, stdout, "Rewrote the line with trailing space in crontab for tstuser on #{host}")
-  end
-end
diff --git a/spec/acceptance/tests/resource/cron/should_remove_leading_and_trailing_whitespace_spec.rb b/spec/acceptance/tests/resource/cron/should_remove_leading_and_trailing_whitespace_spec.rb
new file mode 100644
index 0000000..c840166
--- /dev/null
+++ b/spec/acceptance/tests/resource/cron/should_remove_leading_and_trailing_whitespace_spec.rb
@@ -0,0 +1,43 @@
+require 'spec_helper_acceptance'
+require 'puppet/acceptance/common_utils'
+extend Puppet::Acceptance::CronUtils
+
+Rspec.context 'when stripping whitespace from cron jobs' do
+  before(:each) do
+    compatible_agents.each do |agent|
+      step 'ensure the user exists via puppet'
+      setup(agent)
+    end
+  end
+
+  after(:each) do
+    compatible_agents.each do |agent|
+      step 'Cron: cleanup'
+      clean(agent)
+    end
+  end
+
+  agents.each do |host|
+    it 'removes leading and trailing whitespace from cron jobs' do
+      step 'apply the resource on the host using puppet resource'
+      on(host, puppet_resource('cron', 'crontest', 'user=tstuser', "command='   date > /dev/null    '", 'ensure=present')) do
+        expect(stdout).to match(%r{created})
+      end
+
+      step 'verify the added crontab entry has stripped whitespace'
+      run_cron_on(host, :list, 'tstuser') do
+        expect(stdout).to match(%r{\* \* \* \* \* date > .dev.null})
+      end
+
+      step 'apply the resource with trailing whitespace and check nothing happened'
+      on(host, puppet_resource('cron', 'crontest', 'user=tstuser', "command='date > /dev/null    '", 'ensure=present')) do
+        expect(stdout).not_to match(%r{ensure: created})
+      end
+
+      step 'apply the resource with leading whitespace and check nothing happened'
+      on(host, puppet_resource('cron', 'crontest', 'user=tstuser', "command='     date > /dev/null'", 'ensure=present')) do
+        expect(stdout).not_to match(%r{ensure: created})
+      end
+    end
+  end
+end
diff --git a/spec/acceptance/tests/resource/cron/should_remove_matching.rb b/spec/acceptance/tests/resource/cron/should_remove_matching.rb
deleted file mode 100644
index cfa3c17..0000000
--- a/spec/acceptance/tests/resource/cron/should_remove_matching.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-test_name 'puppet should remove a crontab entry based on command matching'
-confine :except, platform: 'windows'
-confine :except, platform: %r{^eos-} # See PUP-5500
-confine :except, platform: %r{^fedora-28}
-tag 'audit:medium',
-    'audit:refactor',  # Use block style `test_name`
-    'audit:acceptance' # Could be done at the integration (or unit) layer though
-                       # actual changing of resources could irreparably damage a
-                       # host running this, or require special permissions.
-
-require 'puppet/acceptance/common_utils'
-extend Puppet::Acceptance::CronUtils
-
-teardown do
-  step 'Cron: cleanup'
-  agents.each do |agent|
-    clean agent
-  end
-end
-
-agents.each do |host|
-  step 'ensure the user exist via puppet'
-  setup host
-
-  step 'create the existing job by hand...'
-  run_cron_on(host, :add, 'tstuser', '* * * * * /bin/true')
-
-  step 'Remove cron resource'
-  on(host, puppet_resource('cron', 'bogus', 'user=tstuser',
-                           'command=/bin/true', 'ensure=absent')) do
-    assert_match(%r{bogus\D+ensure: removed}, stdout, "Removing cron entry failed for tstuser on #{host}")
-  end
-
-  step 'verify that crontab -l contains what you expected'
-  run_cron_on(host, :list, 'tstuser') do
-    count = stdout.scan('/bin/true').length
-    fail_test "found /bin/true the wrong number of times (#{count})" unless count == 0
-  end
-end
diff --git a/spec/acceptance/tests/resource/cron/should_remove_matching_spec.rb b/spec/acceptance/tests/resource/cron/should_remove_matching_spec.rb
new file mode 100644
index 0000000..5a814ae
--- /dev/null
+++ b/spec/acceptance/tests/resource/cron/should_remove_matching_spec.rb
@@ -0,0 +1,36 @@
+require 'spec_helper_acceptance'
+require 'puppet/acceptance/common_utils'
+extend Puppet::Acceptance::CronUtils
+
+Rspec.context 'when removing crontabs' do
+  before(:each) do
+    compatible_agents.each do |agent|
+      step 'ensure the user exists via puppet'
+      setup(agent)
+
+      step 'create the existing job by hand...'
+      run_cron_on(agent, :add, 'tstuser', '* * * * * /bin/true')
+    end
+  end
+
+  after(:each) do
+    compatible_agents.each do |agent|
+      step 'Cron: cleanup'
+      clean(agent)
+    end
+  end
+
+  compatible_agents.each do |host|
+    it 'removes crontabs based on matching' do
+      step 'Remove cron resource'
+      on(host, puppet_resource('cron', 'bogus', 'user=tstuser', 'command=/bin/true', 'ensure=absent')) do
+        expect(stdout).to match(%r{bogus\D+ensure: removed})
+      end
+
+      step 'verify that crontab -l contains what you expected'
+      run_cron_on(host, :list, 'tstuser') do
+        expect(stdout.scan('/bin/true').length).to eq(0)
+      end
+    end
+  end
+end
diff --git a/spec/acceptance/tests/resource/cron/should_update_existing.rb b/spec/acceptance/tests/resource/cron/should_update_existing.rb
deleted file mode 100644
index b9b9bec..0000000
--- a/spec/acceptance/tests/resource/cron/should_update_existing.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-test_name 'puppet should update existing crontab entry'
-confine :except, platform: 'windows'
-confine :except, platform: %r{^eos-} # See PUP-5500
-confine :except, platform: %r{^fedora-28}
-tag 'audit:medium',
-    'audit:refactor',  # Use block style `test_name`
-    'audit:acceptance' # Could be done at the integration (or unit) layer though
-                       # actual changing of resources could irreparably damage a
-                       # host running this, or require special permissions.
-
-require 'puppet/acceptance/common_utils'
-extend Puppet::Acceptance::CronUtils
-
-teardown do
-  step 'Cron: cleanup'
-  agents.each do |agent|
-    clean agent
-  end
-end
-
-agents.each do |host|
-  step 'ensure the user exist via puppet'
-  setup host
-
-  step 'create the existing job by hand...'
-  run_cron_on(host, :add, 'tstuser', '* * * * * /bin/true')
-
-  step 'verify that crontab -l contains what you expected'
-  run_cron_on(host, :list, 'tstuser') do
-    assert_match(%r{\* \* \* \* \* /bin/true}, stdout, "Didn't find correct crobtab entry for tstuser on #{host}")
-  end
-
-  step 'apply the resource change on the host'
-  on(host, puppet_resource('cron', 'crontest', 'user=tstuser', 'command=/bin/true', 'ensure=present', "hour='0-6'")) do
-    assert_match(%r{hour\s+=>\s+\['0-6'\]}, stdout, "Modifying cron entry failed for tstuser on #{host}")
-  end
-
-  step 'verify that crontab -l contains what you expected'
-  run_cron_on(host, :list, 'tstuser') do
-    assert_match(%r{\* 0-6 \* \* \* /bin/true}, stdout, "Didn't find correctly modified time entry in crobtab entry for tstuser on #{host}")
-  end
-end
diff --git a/spec/acceptance/tests/resource/cron/should_update_existing_spec.rb b/spec/acceptance/tests/resource/cron/should_update_existing_spec.rb
new file mode 100644
index 0000000..9f0731b
--- /dev/null
+++ b/spec/acceptance/tests/resource/cron/should_update_existing_spec.rb
@@ -0,0 +1,41 @@
+require 'spec_helper_acceptance'
+require 'puppet/acceptance/common_utils'
+extend Puppet::Acceptance::CronUtils
+
+Rspec.context 'when updating cron jobs' do
+  before(:each) do
+    compatible_agents.each do |agent|
+      step 'ensure the user exists via puppet'
+      setup(agent)
+
+      step 'create the existing job by hand...'
+      run_cron_on(agent, :add, 'tstuser', '* * * * * /bin/true')
+    end
+  end
+
+  after(:each) do
+    compatible_agents.each do |agent|
+      step 'Cron: cleanup'
+      clean(agent)
+    end
+  end
+
+  compatible_agents.each do |host|
+    it 'updates existing cron entries' do
+      step 'verify that crontab -l contains what you expected'
+      run_cron_on(host, :list, 'tstuser') do
+        expect(stdout).to match(%r{\* \* \* \* \* /bin/true})
+      end
+
+      step 'apply the resource change on the host'
+      on(host, puppet_resource('cron', 'crontest', 'user=tstuser', 'command=/bin/true', 'ensure=present', "hour='0-6'")) do
+        expect(stdout).to match(%r{hour\s+=>\s+\['0-6'\]})
+      end
+
+      step 'verify that crontab -l contains what you expected'
+      run_cron_on(host, :list, 'tstuser') do
+        expect(stdout).to match(%r{\* 0-6 \* \* \* /bin/true})
+      end
+    end
+  end
+end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index c41d7a6..e0a23cb 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -11,8 +11,6 @@ def compatible_agents
   agents.reject { |agent| agent['platform'].include?('windows') || agent['platform'].include?('eos-') || agent['platform'].include?('fedora-28') }
 end
 
-
-
 RSpec.configure do |c|
   c.before :suite do
     unless ENV['BEAKER_provision'] == 'no'
@@ -21,4 +19,4 @@ RSpec.configure do |c|
       install_module_dependencies_on(hosts)
     end
   end
-end
\ No newline at end of file
+end