whenever 0.9.2 → 0.9.3

data/test/functional/output_defined_job_test.rb

@@ -1,111 +1,85 @@
-require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
+require 'test_helper'
 
-class OutputDefinedJobTest < Test::Unit::TestCase
+class OutputDefinedJobTest < Whenever::TestCase
+  test "defined job with a :task" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      job_type :some_job, "before :task after"
+      every 2.hours do
+        some_job "during"
+      end
+    file
 
-  context "A defined job with a :task" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        job_type :some_job, "before :task after"
-        every 2.hours do
-          some_job "during"
-        end
-      file
-    end
-
-    should "output the defined job with the task" do
-      assert_match /^.+ .+ .+ .+ before during after$/, @output
-    end
+    assert_match /^.+ .+ .+ .+ before during after$/, output
   end
 
-  context "A defined job with a :task and some options" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        job_type :some_job, "before :task after :option1 :option2"
-        every 2.hours do
-          some_job "during", :option1 => 'happy', :option2 => 'birthday'
-        end
-      file
-    end
+  test "defined job with a :task and some options" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      job_type :some_job, "before :task after :option1 :option2"
+      every 2.hours do
+        some_job "during", :option1 => 'happy', :option2 => 'birthday'
+      end
+    file
 
-    should "output the defined job with the task and options" do
-      assert_match /^.+ .+ .+ .+ before during after happy birthday$/, @output
-    end
+    assert_match /^.+ .+ .+ .+ before during after happy birthday$/, output
   end
 
-  context "A defined job with a :task and an option where the option is set globally" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        job_type :some_job, "before :task after :option1"
-        set :option1, 'happy'
-        every 2.hours do
-          some_job "during"
-        end
-      file
-    end
+  test "defined job with a :task and an option where the option is set globally" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      job_type :some_job, "before :task after :option1"
+      set :option1, 'happy'
+      every 2.hours do
+        some_job "during"
+      end
+    file
 
-    should "output the defined job with the task and options" do
-      assert_match /^.+ .+ .+ .+ before during after happy$/, @output
-    end
+    assert_match /^.+ .+ .+ .+ before during after happy$/, output
   end
 
-  context "A defined job with a :task and an option where the option is set globally and locally" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        job_type :some_job, "before :task after :option1"
-        set :option1, 'global'
-        every 2.hours do
-          some_job "during", :option1 => 'local'
-        end
-      file
-    end
+  test "defined job with a :task and an option where the option is set globally and locally" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      job_type :some_job, "before :task after :option1"
+      set :option1, 'global'
+      every 2.hours do
+        some_job "during", :option1 => 'local'
+      end
+    file
 
-    should "output the defined job using the local option" do
-      assert_match /^.+ .+ .+ .+ before during after local$/, @output
-    end
+    assert_match /^.+ .+ .+ .+ before during after local$/, output
   end
 
-  context "A defined job with a :task and an option that is not set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        job_type :some_job, "before :task after :option1"
-        every 2.hours do
-          some_job "during", :option2 => 'happy'
-        end
-      file
-    end
+  test "defined job with a :task and an option that is not set" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      job_type :some_job, "before :task after :option1"
+      every 2.hours do
+        some_job "during", :option2 => 'happy'
+      end
+    file
 
-    should "output the defined job with that option left untouched" do
-      assert_match /^.+ .+ .+ .+ before during after :option1$/, @output
-    end
+    assert_match /^.+ .+ .+ .+ before during after :option1$/, output
   end
 
-  context "A defined job that uses a :path where none is explicitly set" do
-    setup do
-      Whenever.stubs(:path).returns('/my/path')
+  test "defined job that uses a :path where none is explicitly set" do
+    Whenever.stubs(:path).returns('/my/path')
 
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        job_type :some_job, "cd :path && :task"
-        every 2.hours do
-          some_job 'blahblah'
-        end
-      file
-    end
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      job_type :some_job, "cd :path && :task"
+      every 2.hours do
+        some_job 'blahblah'
+      end
+    file
 
-    should "default to using the Whenever.path" do
-      assert_match two_hours + %( cd /my/path && blahblah), @output
-    end
+    assert_match two_hours + %( cd /my/path && blahblah), output
   end
-
 end

data/test/functional/output_env_test.rb

@@ -1,33 +1,29 @@
-require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
+require 'test_helper'
 
-class OutputEnvTest < Test::Unit::TestCase
-
-  context "The output from Whenever with environment variables set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        env :MYVAR, 'blah'
-        env 'MAILTO', "someone@example.com"
-        env :BLANKVAR, ''
-        env :NILVAR, nil
-      file
-    end
+class OutputEnvTest < Whenever::TestCase
+  setup do
+    @output = Whenever.cron \
+    <<-file
+      env :MYVAR, 'blah'
+      env 'MAILTO', "someone@example.com"
+      env :BLANKVAR, ''
+      env :NILVAR, nil
+    file
+  end
 
-    should "output MYVAR environment variable" do
-      assert_match "MYVAR=blah", @output
-    end
-  
-    should "output MAILTO environment variable" do
-      assert_match "MAILTO=someone@example.com", @output
-    end
+  should "output MYVAR environment variable" do
+    assert_match "MYVAR=blah", @output
+  end
 
-    should "output BLANKVAR environment variable" do
-      assert_match "BLANKVAR=\"\"", @output
-    end
+  should "output MAILTO environment variable" do
+    assert_match "MAILTO=someone@example.com", @output
+  end
 
-    should "output NILVAR environment variable" do
-      assert_match "NILVAR=\"\"", @output
-    end
+  should "output BLANKVAR environment variable" do
+    assert_match "BLANKVAR=\"\"", @output
   end
 
+  should "output NILVAR environment variable" do
+    assert_match "NILVAR=\"\"", @output
+  end
 end

data/test/functional/output_jobs_for_roles_test.rb

@@ -1,85 +1,65 @@
-require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
+require 'test_helper'
 
-class OutputJobsForRolesTest < Test::Unit::TestCase
-  context "with one role requested and specified on the job" do
-    setup do
-      @output = Whenever.cron :roles => [:role1], :string => \
-      <<-file
-        every 2.hours, :roles => [:role1] do
-          command "blahblah"
-        end
-      file
-    end
+class OutputJobsForRolesTest < Whenever::TestCase
+  test "one role requested and specified on the job" do
+    output = Whenever.cron :roles => [:role1], :string => \
+    <<-file
+      every 2.hours, :roles => [:role1] do
+        command "blahblah"
+      end
+    file
 
-    should "output the cron job" do
-      assert_equal two_hours + " /bin/bash -l -c 'blahblah'\n\n", @output
-    end
+    assert_equal two_hours + " /bin/bash -l -c 'blahblah'\n\n", output
   end
 
-  context "with one role requested but none specified on the job" do
-    setup do
-      @output = Whenever.cron :roles => [:role1], :string => \
-      <<-file
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
+  test "one role requested but none specified on the job" do
+    output = Whenever.cron :roles => [:role1], :string => \
+    <<-file
+      every 2.hours do
+        command "blahblah"
+      end
+    file
 
     # this should output the job because not specifying a role means "all roles"
-    should "output the cron job" do
-      assert_equal two_hours + " /bin/bash -l -c 'blahblah'\n\n", @output
-    end
+    assert_equal two_hours + " /bin/bash -l -c 'blahblah'\n\n", output
   end
 
-  context "with no roles requested but one specified on the job" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        every 2.hours, :roles => [:role1] do
-          command "blahblah"
-        end
-      file
-    end
+  test "no roles requested but one specified on the job" do
+    output = Whenever.cron \
+    <<-file
+      every 2.hours, :roles => [:role1] do
+        command "blahblah"
+      end
+    file
 
     # this should output the job because not requesting roles means "all roles"
-    should "output the cron job" do
-      assert_equal two_hours + " /bin/bash -l -c 'blahblah'\n\n", @output
-    end
+    assert_equal two_hours + " /bin/bash -l -c 'blahblah'\n\n", output
   end
 
-  context "with a different role requested than the one specified on the job" do
-    setup do
-      @output = Whenever.cron :roles => [:role1], :string => \
-      <<-file
-        every 2.hours, :roles => [:role2] do
-          command "blahblah"
-        end
-      file
-    end
+  test "a different role requested than the one specified on the job" do
+    output = Whenever.cron :roles => [:role1], :string => \
+    <<-file
+      every 2.hours, :roles => [:role2] do
+        command "blahblah"
+      end
+    file
 
-    should "not output the cron job" do
-      assert_equal "", @output
-    end
+    assert_equal "", output
   end
 
-  context "with 2 roles requested and a job defined for each" do
-    setup do
-      @output = Whenever.cron :roles => [:role1, :role2], :string => \
-      <<-file
-        every 2.hours, :roles => [:role1] do
-          command "role1_cmd"
-        end
+  test "with 2 roles requested and a job defined for each" do
+    output = Whenever.cron :roles => [:role1, :role2], :string => \
+    <<-file
+      every 2.hours, :roles => [:role1] do
+        command "role1_cmd"
+      end
 
-        every :hour, :roles => [:role2] do
-          command "role2_cmd"
-        end
-      file
-    end
+      every :hour, :roles => [:role2] do
+        command "role2_cmd"
+      end
+    file
 
-    should "output both jobs" do
-      assert_match two_hours + " /bin/bash -l -c 'role1_cmd'", @output
-      assert_match "0 * * * * /bin/bash -l -c 'role2_cmd'", @output
-    end
+    assert_match two_hours + " /bin/bash -l -c 'role1_cmd'", output
+    assert_match "0 * * * * /bin/bash -l -c 'role2_cmd'", output
   end
 end

data/test/functional/output_redirection_test.rb

@@ -1,326 +1,248 @@
-require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
-
-class OutputRedirectionTest < Test::Unit::TestCase
-
-  context "A command when the output is set to nil" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, nil
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-  
-    should "output the command with the log syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> \/dev\/null 2>&1$/, @output
-    end
-  end
-
-
-  context "A command when the output is set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, 'logfile.log'
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-  
-    should "output the command with the log syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> logfile.log 2>&1$/, @output
-    end
-  end
-
-  context "A command when the error and standard output is set by the command" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:standard => 'dev_null', :error => 'dev_err'}
-        end
-      file
-    end
-
-    should "output the command without the log syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, @output
-    end
-  end
-
-  context "A command when the output is set and the comand overrides it" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, 'logfile.log'
-        every 2.hours do
-          command "blahblah", :output => 'otherlog.log'
-        end
-      file
-    end
-  
-    should "output the command with the command syntax appended" do
-      assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, @output
-      assert_match /^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1$/, @output
-    end
-  end
-
-  context "A command when the output is set and the comand overrides with standard and error" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, 'logfile.log'
-        every 2.hours do
-          command "blahblah", :output => {:error => 'dev_err', :standard => 'dev_null' }
-        end
-      file
-    end
-  
-    should "output the command with the overridden redirection syntax appended" do
-      assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, @output
-      assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, @output
-    end
-  end
-
-  context "A command when the output is set and the comand rejects it" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, 'logfile.log'
-        every 2.hours do
-          command "blahblah", :output => false
-        end
-      file
-    end
-
-    should "output the command without the log syntax appended" do
-      assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, @output
-      assert_match /^.+ .+ .+ .+ blahblah$/, @output
-    end
-  end
+require 'test_helper'
+
+class OutputRedirectionTest < Whenever::TestCase
+  test "command when the output is set to nil" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, nil
+      every 2.hours do
+        command "blahblah"
+      end
+    file
+
+    assert_match /^.+ .+ .+ .+ blahblah >> \/dev\/null 2>&1$/, output
+  end
+
+
+  test "command when the output is set" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, 'logfile.log'
+      every 2.hours do
+        command "blahblah"
+      end
+    file
+
+    assert_match /^.+ .+ .+ .+ blahblah >> logfile.log 2>&1$/, output
+  end
+
+  test "command when the error and standard output is set by the command" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:standard => 'dev_null', :error => 'dev_err'}
+      end
+    file
+
+    assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, output
+  end
+
+  test "command when the output is set and the comand overrides it" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, 'logfile.log'
+      every 2.hours do
+        command "blahblah", :output => 'otherlog.log'
+      end
+    file
+
+    assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output
+    assert_match /^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1$/, output
+  end
+
+  test "command when the output is set and the comand overrides with standard and error" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, 'logfile.log'
+      every 2.hours do
+        command "blahblah", :output => {:error => 'dev_err', :standard => 'dev_null' }
+      end
+    file
+
+    assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output
+    assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, output
+  end
+
+  test "command when the output is set and the comand rejects it" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, 'logfile.log'
+      every 2.hours do
+        command "blahblah", :output => false
+      end
+    file
+
+    assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output
+    assert_match /^.+ .+ .+ .+ blahblah$/, output
+  end
+
+  test "command when the output is set and is overridden by the :set option" do
+    output = Whenever.cron :set => 'output=otherlog.log', :string => \
+    <<-file
+      set :job_template, nil
+      set :output, 'logfile.log'
+      every 2.hours do
+        command "blahblah"
+      end
+    file
+
+    assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output
+    assert_match /^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1/, output
+  end
+
+  test "command when the error and standard output is set" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, {:error => 'dev_err', :standard => 'dev_null' }
+      every 2.hours do
+        command "blahblah"
+      end
+    file
+
+    assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, output
+  end
+
+  test "command when error output is set" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, {:error => 'dev_null'}
+      every 2.hours do
+        command "blahblah"
+      end
+    file
+
+    assert_match /^.+ .+ .+ .+ blahblah 2>> dev_null$/, output
+  end
+
+  test "command when the standard output is set" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, {:standard => 'dev_out'}
+      every 2.hours do
+        command "blahblah"
+      end
+    file
+
+    assert_match /^.+ .+ .+ .+ blahblah >> dev_out$/, output
+  end
+
+  test "command when error output is set by the command" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:error => 'dev_err'}
+      end
+    file
+
+    assert_match /^.+ .+ .+ .+ blahblah 2>> dev_err$/, output
+  end
+
+  test "command when standard output is set by the command" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:standard => 'dev_out'}
+      end
+    file
+
+    assert_match /^.+ .+ .+ .+ blahblah >> dev_out$/, output
+  end
+
+  test "command when standard output is set to nil" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:standard => nil}
+      end
+    file
+
+    assert_match /^.+ .+ .+ .+ blahblah > \/dev\/null$/, output
+  end
+
+  test "command when standard error is set to nil" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:error => nil}
+      end
+    file
 
-  context "A command when the output is set and is overridden by the :set option" do
-    setup do
-      @output = Whenever.cron :set => 'output=otherlog.log', :string => \
-      <<-file
-        set :job_template, nil
-        set :output, 'logfile.log'
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-
-    should "output the otherlog.log as the log file" do
-      assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, @output
-      assert_match /^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1/, @output
-    end
-  end
-
-  context "A command when the error and standard output is set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, {:error => 'dev_err', :standard => 'dev_null' }
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-
-    should "output the command without the redirection syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, @output
-    end
-  end
-
-  context "A command when error output is set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, {:error => 'dev_null'}
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-
-    should "output the command without the standard error syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah 2>> dev_null$/, @output
-    end
-  end
-
-  context "A command when the standard output is set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, {:standard => 'dev_out'}
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-
-    should "output the command with standard output syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> dev_out$/, @output
-    end
-  end
+    assert_match /^.+ .+ .+ .+ blahblah 2> \/dev\/null$/, output
+  end
+
+  test "command when standard output and standard error is set to nil" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:error => nil, :standard => nil}
+      end
+    file
 
-  context "A command when error output is set by the command" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:error => 'dev_err'}
-        end
-      file
-    end
-
-    should "output the command without the log syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah 2>> dev_err$/, @output
-    end
+    assert_match /^.+ .+ .+ .+ blahblah > \/dev\/null 2>&1$/, output
   end
 
-  context "A command when standard output is set by the command" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:standard => 'dev_out'}
-        end
-      file
-    end
-
-    should "output the command without the log syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> dev_out$/, @output
-    end
-  end
+  test "command when standard output is set and standard error is set to nil" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:error => nil, :standard => 'my.log'}
+      end
+    file
 
-  context "A command when standard output is set to nil" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:standard => nil}
-        end
-      file
-    end
-
-    should "output the command with stdout directed to /dev/null" do
-      assert_match /^.+ .+ .+ .+ blahblah > \/dev\/null$/, @output
-    end
+    assert_match /^.+ .+ .+ .+ blahblah >> my.log 2> \/dev\/null$/, output
   end
 
-  context "A command when standard error is set to nil" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:error => nil}
-        end
-      file
-    end
-
-    should "output the command with stderr directed to /dev/null" do
-      assert_match /^.+ .+ .+ .+ blahblah 2> \/dev\/null$/, @output
-    end
-  end
+  test "command when standard output is nil and standard error is set" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:error => 'my_error.log', :standard => nil}
+      end
+    file
 
-  context "A command when standard output and standard error is set to nil" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:error => nil, :standard => nil}
-        end
-      file
-    end
-
-    should "output the command with stderr directed to /dev/null" do
-      assert_match /^.+ .+ .+ .+ blahblah > \/dev\/null 2>&1$/, @output
-    end
+    assert_match /^.+ .+ .+ .+ blahblah >> \/dev\/null 2>> my_error.log$/, output
   end
 
-  context "A command when standard output is set and standard error is set to nil" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:error => nil, :standard => 'my.log'}
-        end
-      file
-    end
-
-    should "output the command with stderr directed to /dev/null" do
-      assert_match /^.+ .+ .+ .+ blahblah >> my.log 2> \/dev\/null$/, @output
-    end
-  end
+  test "command when the deprecated :cron_log is set" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :cron_log, "cron.log"
+      every 2.hours do
+        command "blahblah"
+      end
+    file
 
-  context "A command when standard output is nil and standard error is set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:error => 'my_error.log', :standard => nil}
-        end
-      file
-    end
-
-    should "output the command with stderr directed to /dev/null" do
-      assert_match /^.+ .+ .+ .+ blahblah >> \/dev\/null 2>> my_error.log$/, @output
-    end
+    assert_match /^.+ .+ .+ .+ blahblah >> cron.log 2>&1$/, output
   end
 
-  context "A command when the deprecated :cron_log is set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :cron_log, "cron.log"
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-
-    should "output the command with with the stdout and stderr going to the log" do
-      assert_match /^.+ .+ .+ .+ blahblah >> cron.log 2>&1$/, @output
-    end
-  end
 
+  test "a command when the standard output is set to a lambda" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, lambda { "2>&1 | logger -t whenever_cron" }
+      every 2.hours do
+        command "blahblah"
+      end
+    file
 
-  context "A command when the standard output is set to a lambda" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, lambda { "2>&1 | logger -t whenever_cron" }
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-
-    should "output the command by result of the lambda evaluated" do
-      assert_match /^.+ .+ .+ .+ blahblah 2>&1 | logger -t whenever_cron$/, @output
-    end
+    assert_match /^.+ .+ .+ .+ blahblah 2>&1 | logger -t whenever_cron$/, output
   end
-
 end