GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-24 18:06:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge Errors

Browse source 
- Fixed errors from merge mistakes.
This commit is contained in:
Paul Beckingham 2014-01-07 19:23:54 -05:00
parent 98f740e9d1
commit 9c41610f56
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
test/roundtrip.t
View file

@ -61,14 +61,15 @@ unlink 'pending.data', 'completed.data', 'undo.data';
qx{../src/task rc:roundtrip.rc import ./roundtrip2.json 2>&1};
# Examine.
#
# ID Created P Project Tags Description
# -- ---------- - ------- --------- -----------
# 1 1/7/2014 H A one/1
# 2 1/7/2014 tag1 tag2 two
# ID Project Pri Added Started Due Recur Countdown Age Deps Tags Description
# -- ------- --- -------- ------- --- ----- --------- --- ---- --------- ---------
# 1 A H 8/7/2010 - one/1
# 2 8/7/2010 - tag1 tag2 two
my $output = qx{../src/task rc:roundtrip.rc long 2>&1};
like ($output, qr/1.+A.+H.+\d+\/\d+\/\d+.+(?:-|\d+).+one\/1/, '2 round trips task 1 identical');
like ($output, qr/2.+\d+\/\d+\/\d+.+(?:-|\d+).+tag1\stag2\stwo/, '2 round trips task 2 identical');
like ($output, qr/1\s+\d+\/\d+\/\d+\s+H\s+A\s+one\/1/, '2 round trips task 1 identical');
like ($output, qr/2\s+\d+\/\d+\/\d+\s+tag1\s+tag2\s+two/, '2 round trips task 2 identical');
# Compare the actual JSON files.
$output = qx{diff ./roundtrip1.json ./roundtrip2.json 2>&1};