@@ -547,6 +547,13 @@ describe 'punch command' do run_command('log', @project, '-m', @message) end + it 'should use the message option specified with --message over the command-line argument' do + other_message = 'some other message' + Punch.stub!(:write) + Punch.should.receive(:log).with(@project, other_message, {}) + run_command('log', @project, @message, '-m', other_message) + end + it 'should pass a time if specified on the command line (with --time)' do time_option = '2008-08-23 15:39' time = Time.local(2008, 8, 23, 15, 39) spec/punch_command_spec.rb 65c493aa17be65be9b12e957c644af799bdc31be Yossef Mendelssohn ymendel@pobox.com http://github.com/ymendel/one_inch_punch/commit/f18f159c8ce7e031b0bf652a573566967030ccac f18f159c8ce7e031b0bf652a573566967030ccac 2009-08-25T22:37:24-07:00 2009-08-25T22:37:24-07:00 Explicit spec for log behavior with argument and -m. Not a huge fan of either message taking precedence over the other, but this way is easier and at least there's a spec now to say exactly what happens. d132c183ddcc3c17d645cba4caeb200c9732a47f Yossef Mendelssohn ymendel@pobox.com