1 files changed, 31 insertions, 37 deletions
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
index 2df0ea2..615d617 100644
--- a/spec/acceptance/tests/resource/cron/should_allow_changing_parameters_spec.rb
+++ b/spec/acceptance/tests/resource/cron/should_allow_changing_parameters_spec.rb
@@ -18,52 +18,46 @@ RSpec.context 'when changing parameters' do
   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
+      result = apply_manifest_on(agent, 'cron { "myjob": command => "/bin/false", user    => "tstuser", hour    => "*", minute  => [1], ensure  => present,}')
+      expect(result.stdout).to match(%r{ensure: created})
+      result = run_cron_on(agent, :list, 'tstuser')
+      expect(result.stdout).to match(%r{.bin.false})
 
       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
+      result = apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => "*", minute  => [1], ensure  => present,}')
+      expect(result.stdout).to match(%r{command changed '.bin.false'.* to '.bin.true'})
+
+      result = run_cron_on(agent, :list, 'tstuser')
+      expect(result.stdout).to match(%r{1 . . . . .bin.true})
 
       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
+      result = apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => "1", minute  => [1], ensure  => present,}')
+      expect(result.stdout).to match(%r{hour: defined 'hour' as \['1'\]})
+
+      result = run_cron_on(agent, :list, 'tstuser')
+      expect(result.stdout).to match(%r{1 1 . . . .bin.true})
 
       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
+      result = apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => ["1","2"], minute  => [1], ensure  => present,}')
+      expect(result.stdout).to match(%r{hour: hour changed \['1'\].* to \['1', '2'\]})
+
+      result = run_cron_on(agent, :list, 'tstuser')
+      expect(result.stdout).to match(%r{1 1,2 . . . .bin.true})
 
       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
+      result = apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => ["3","2"], minute  => [1], ensure  => present,}')
+      expect(result.stdout).to match(%r{hour: hour changed \['1', '2'\].* to \['3', '2'\]})
+
+      result = run_cron_on(agent, :list, 'tstuser')
+      expect(result.stdout).to match(%r{1 3,2 . . . .bin.true})
+
       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
+      result = apply_manifest_on(agent, 'cron { "myjob": command => "/bin/true", user    => "tstuser", hour    => "*", minute  => "*", ensure  => present,}')
+      expect(result.stdout).to match(%r{minute: undefined 'minute' from \['1'\]})
+      expect(result.stdout).to match(%r{hour: undefined 'hour' from \['3', '2'\]})
+
+      result = run_cron_on(agent, :list, 'tstuser')
+      expect(result.stdout).to match(%r{\* \* . . . .bin.true})
     end
   end
 end