gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch '1.8.5' of tasktools.org:task into 1.8.5

Browse Source
This commit is contained in:
Paul Beckingham
2010-01-12 08:24:30 -05:00
parent 78778c2819 8d8f7ddb40
commit db1a6601eb
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tests/bug.327.t
View File

@@ -47,7 +47,7 @@ qx{../task rc:bug.rc 2 due:};
# Result: Somehow the due date is incremented and wraps around to 12/31/1969, # Result: Somehow the due date is incremented and wraps around to 12/31/1969,
# then keeps going back to today. # then keeps going back to today.
my $output = qx{../task rc:bug.rc li}; my $output = qx{../task rc:bug.rc li};
like ($output, qr/^1 task$/ms, 'Should only be one task'); unlike ($output, qr/1969/ms, 'Should not display 12/31/1969');
# Cleanup. # Cleanup.
unlink 'pending.data'; unlink 'pending.data';

8
src/tests/cal.t
View File

@@ -68,7 +68,15 @@ $output = qx{../task rc:cal.rc rc.weekstart:Monday cal};
like ($output, qr/Fr Sa Su/, 'Week starts on Monday'); like ($output, qr/Fr Sa Su/, 'Week starts on Monday');
$output = qx{../task rc:cal.rc cal y}; $output = qx{../task rc:cal.rc cal y};
like ($output, qr/$month\w+?\s+?$year/, 'Current month and year are displayed'); like ($output, qr/$month\w+?\s+?$year/, 'Current month and year are displayed');
if ( $month eq "Jan")
{
$nextyear = $nextyear - 1;
}
like ($output, qr/$prevmonth\w+?\s+?$nextyear/, 'Month and year one year ahead are displayed'); like ($output, qr/$prevmonth\w+?\s+?$nextyear/, 'Month and year one year ahead are displayed');
if ( $month eq "Jan")
{
$nextyear = $nextyear + 1;
}
unlike ($output, qr/$month\w+?\s+?$nextyear/, 'Current month and year ahead are not displayed'); unlike ($output, qr/$month\w+?\s+?$nextyear/, 'Current month and year ahead are not displayed');
# task cal due and task cal due y # task cal due and task cal due y