@@ -11,13 +11,13 @@ class CommandLineTest < Test::Unit::TestCase end should "output the cron job with identifier blocks" do - output = <<-expected - # Begin Whenever generated tasks for: My identifier - #{@task} - # End Whenever generated tasks for: My identifier - expected + output = <<-EXPECTED +# Begin Whenever generated tasks for: My identifier +#{@task} +# End Whenever generated tasks for: My identifier +EXPECTED - assert_equal unindent(output).chomp, @command.send(:whenever_cron).chomp + assert_equal output, @command.send(:whenever_cron) end should "write the crontab when run" do @@ -38,49 +38,50 @@ class CommandLineTest < Test::Unit::TestCase existing = '# Existing crontab' @command.expects(:read_crontab).at_least_once.returns(existing) - new_cron = <<-expected - #{existing} - - # Begin Whenever generated tasks for: My identifier - #{@task} - # End Whenever generated tasks for: My identifier - expected + new_cron = <<-EXPECTED +#{existing} + +# Begin Whenever generated tasks for: My identifier +#{@task} +# End Whenever generated tasks for: My identifier +EXPECTED - assert_equal unindent(new_cron).chomp, @command.send(:updated_crontab).chomp + assert_equal new_cron, @command.send(:updated_crontab) - @command.expects(:write_crontab).with(unindent(new_cron)).returns(true) + @command.expects(:write_crontab).with(new_cron).returns(true) assert @command.run end should "replace an existing block if the identifier matches" do - existing = <<-existing - # Something - - # Begin Whenever generated tasks for: My identifier - My whenever job that was already here - # End Whenever generated tasks for: My identifier - - # Begin Whenever generated tasks for: Other identifier - This shouldn't get replaced - # End Whenever generated tasks for: Other identifier - existing - @command.expects(:read_crontab).at_least_once.returns(unindent(existing)) - - new_cron = <<-new_cron - # Something - - # Begin Whenever generated tasks for: My identifier - #{@task} - # End Whenever generated tasks for: My identifier + existing = <<-EXISTING_CRON +# Something + +# Begin Whenever generated tasks for: My identifier +My whenever job that was already here +# End Whenever generated tasks for: My identifier + +# Begin Whenever generated tasks for: Other identifier +This shouldn't get replaced +# End Whenever generated tasks for: Other identifier +EXISTING_CRON + + @command.expects(:read_crontab).at_least_once.returns(existing) - # Begin Whenever generated tasks for: Other identifier - This shouldn't get replaced - # End Whenever generated tasks for: Other identifier - new_cron + new_cron = <<-NEW_CRON +# Something + +# Begin Whenever generated tasks for: My identifier +#{@task} +# End Whenever generated tasks for: My identifier + +# Begin Whenever generated tasks for: Other identifier +This shouldn't get replaced +# End Whenever generated tasks for: Other identifier +NEW_CRON - assert_equal unindent(new_cron).chomp, @command.send(:updated_crontab).chomp + assert_equal new_cron, @command.send(:updated_crontab) - @command.expects(:write_crontab).with(unindent(new_cron)).returns(true) + @command.expects(:write_crontab).with(new_cron).returns(true) assert @command.run end end @@ -97,11 +98,4 @@ class CommandLineTest < Test::Unit::TestCase end end -private - - def unindent(string) - indentation = string[/\A\s*/] - string.strip.gsub(/^#{indentation}/, "") - end - end \ No newline at end of file test/command_line_test.rb whenever.gemspec 5ad11bd6425585a029a3fa044e13715522f60ae2 434423f22d525955dbb30bcb24cac62e89f90426 Javan Makhmali javan@javan.us http://github.com/javan/whenever/commit/8d3b02861af2268876e64a3b1c0d48be4c5161fc 8d3b02861af2268876e64a3b1c0d48be4c5161fc 2009-07-13T19:24:10-07:00 2009-07-13T19:24:10-07:00 Merge branch 'new_line_after_closing_comment' eaccc4d2370332c61c4e5cbebd4713ba94a90095 Javan Makhmali javan@javan.us