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

Merge branch '2.3.0' into 2.4.0

Browse Source 
Conflicts:
	AUTHORS
	CMakeLists.txt
	NEWS
	src/A3.cpp
	src/CMakeLists.txt
	src/Config.cpp
	src/Duration.cpp
	src/Duration.h
	src/Nibbler.cpp
	src/Nibbler.h
	src/RX.cpp
	src/RX.h
	src/columns/ColDate.cpp
	src/columns/ColScheduled.cpp
	src/commands/Command.cpp
	src/legacy.cpp
	src/utf8.cpp
	src/utf8.h
	test/CMakeLists.txt
	test/bug.mergedeps.t.postponed
	test/duration.t.cpp
	test/merge.duplicates.t
	test/merge.simple_duplication.t
	test/merge.t
	test/nibbler.t.cpp
	test/roundtrip.t
	test/rx.t.cpp
	test/utf8.t.cpp
This commit is contained in:
Paul Beckingham
2014-01-07 19:10:03 -05:00
parent ab0d929a3c c4ecf613ac
commit 98f740e9d1
550 changed files with 6129 additions and 2976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
test/undo.t
View File

@@ -2,7 +2,7 @@
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,11 @@
use strict;
use warnings;
use Test::More tests => 11;
use Test::More tests => 20;
# Ensure environment has no influence.
delete $ENV{'TASKDATA'};
delete $ENV{'TASKRC'};
# Create the rc file.
if (open my $fh, '>', 'undo.rc')
@@ -39,12 +43,12 @@ if (open my $fh, '>', 'undo.rc')
ok (-r 'undo.rc', 'Created undo.rc');
}
# Test the add/do/undo commands.
# Test the add/done/undo commands.
my $output = qx{../src/task rc:undo.rc add one 2>&1; ../src/task rc:undo.rc info 1 2>&1};
ok (-r 'pending.data', 'pending.data created');
like ($output, qr/Status\s+Pending\n/, 'Pending');
$output = qx{../src/task rc:undo.rc 1 do 2>&1; ../src/task rc:undo.rc info 1 2>&1};
$output = qx{../src/task rc:undo.rc 1 done 2>&1; ../src/task rc:undo.rc info 1 2>&1};
ok (-r 'completed.data', 'completed.data created');
like ($output, qr/Status\s+Completed\n/, 'Completed');
@@ -60,6 +64,37 @@ $output = qx{../src/task rc:undo.rc undo 1 2>&1};
unlike ($output, qr/Unknown error/, 'No unknown error');
like ($output, qr/The undo command does not allow further task modification/, 'Correct error caught and reported');
# Add a new task and undo it.
$output = qx{../src/task rc:undo.rc add two 2>&1; ../src/task rc:undo.rc info 1 2>&1};
unlike ($output, qr/Unknown error/, 'No unknown error');
like ($output, qr/Status\s+Pending\n/, 'Pending');
$output = qx{../src/task rc:undo.rc undo 2>&1; ../src/task rc:undo.rc info 1 2>&1};
like ($output, qr/Task removed\.\n/, 'Task removed');
like ($output, qr/No matches\.\n/, 'No matches');
# Inspect backlog.data
if (open my $fh, '<', 'backlog.data')
{
my @lines = <$fh>;
close $fh;
diag ($_) for @lines;
is (scalar (@lines), 4, '4 lines of backlog');
ok (index ($lines[0], '"status":"pending"') != -1, '[0] pending');
ok (index ($lines[1], '"status":"completed"') != -1, '[1] completed');
ok (index ($lines[2], '"status":"pending"') != -1, '[2] pending');
ok (index ($lines[3], '"status":"completed"') != -1, '[3] completed');
}
else
{
fail ('4 lines of backlog');
fail ('[0] pending');
fail ('[1] completed');
fail ('[2] pending');
fail ('[3] completed');
}
# Cleanup.
unlink qw(pending.data completed.data undo.data backlog.data undo.rc);
ok (! -r 'pending.data' &&