Skip to content

Commit

Permalink
Fixed spec labels according to the continue/resume change.
Browse files Browse the repository at this point in the history
Changed the readme.
  • Loading branch information
walski authored and samg committed Dec 12, 2010
1 parent 8407c51 commit c4c79cf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -240,13 +240,6 @@ Commands

usage: ``t configure``

**continue**
Start the timer for the current timesheet with the same notes as the last entry.
If there is no last entry the new one has blank notes ore uses the optional
NOTES parameter.

usage: ``t continue [--at TIME] [NOTES]``

**display**
Display a given timesheet. If no timesheet is specified, show the current
timesheet. If ``all`` is passed as SHEET display all timesheets. Accepts
Expand Down Expand Up @@ -298,6 +291,14 @@ Commands
running, non-current sheet.

usage: ``t out [--at TIME] [TIMESHEET]``

**resume**
Start the timer for the current timesheet with the same notes as the last entry.
If there is no last entry the new one has blank notes ore uses the optional
NOTES parameter.

usage: ``t resume [--at TIME] [NOTES]``


**sheet**
Switch to a timesheet creating it if necessary. The default timesheet is
Expand Down
4 changes: 2 additions & 2 deletions spec/timetrap_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -678,14 +678,14 @@ def output
@last_active.should_not be_nil
end

it "should allow to continue the last active sheet" do
it "should allow to resume the last active sheet" do
invoke 'resume'

Timetrap::Timer.active_entry.note.should ==(@last_active.note)
Timetrap::Timer.active_entry.start.should eql(@time)
end

it "should allow to continue the activity with a given time" do
it "should allow to resume the activity with a given time" do
invoke 'resume --at "10am 2008-10-03"'

Timetrap::Timer.active_entry.start.should eql(Time.parse('2008-10-03 10:00'))
Expand Down

0 comments on commit c4c79cf

Please sign in to comment.