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

Bug #1036

Browse source 
- Remove the test that prevents 'until' attributes to be modified for
  non-recurring tasks (thanks to Stéphane Pezennec).
- Unit test.

Signed-off-by: Paul Beckingham <paul@beckingham.net>
This commit is contained in:
Louis-Claude Canon 2012-07-24 16:55:59 -04:00 • committed by Paul Beckingham
parent 99849e55b4
commit c71146611c
5 changed files with 66 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -152,4 +152,5 @@ suggestions:
Stanley G
Marek Vitek
Rene Vergara
Stéphane Pezennec

2
ChangeLog
View file

@ -4,6 +4,8 @@
Bugs
+ Fixed bug that caused miplaced commas in JSON export (thanks to greenskeleton).
+ Fixed bug #1036, which prevents 'until' attributes to be modified for
non-recurring tasks (thanks to Stéphane Pezennec).
------ old releases ------------------------------

5
src/commands/CmdModify.cpp
View file

@ -83,11 +83,6 @@ int CmdModify::execute (std::string& output)
!before.has ("due"))
throw std::string (STRING_CMD_MODIFY_NO_DUE);
if (task->has ("until") &&
!task->has ("recur") &&
!before.has ("recur"))
throw std::string (STRING_CMD_MODIFY_UNTIL);
if (before.has ("recur") &&
before.has ("due") &&
(!task->has ("due") ||

1
src/en-US.h
View file

@ -448,7 +448,6 @@
#define STRING_CMD_MODIFY_USAGE1 "Modifies the existing task with provided arguments."
#define STRING_CMD_MODIFY_NO_DUE "You cannot specify a recurring task without a due date."
#define STRING_CMD_MODIFY_UNTIL "You cannot specify an until date for a non-recurring task."
#define STRING_CMD_MODIFY_REM_DUE "You cannot remove the due date from a recurring task."
#define STRING_CMD_MODIFY_REC_ALWAYS "You cannot remove the recurrence from a recurring task."
#define STRING_CMD_MODIFY_TASK "Modifying task {1} '{2}'."

63
test/bug.1036.t Executable file
View file

@ -0,0 +1,63 @@
#! /usr/bin/perl
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, 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
## in the Software without restriction, including without limitation the rights
## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
## copies of the Software, and to permit persons to whom the Software is
## furnished to do so, subject to the following conditions:
##
## The above copyright notice and this permission notice shall be included
## in all copies or substantial portions of the Software.
##
## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
## SOFTWARE.
##
## http://www.opensource.org/licenses/mit-license.php
##
################################################################################
use strict;
use warnings;
use Test::More tests => 4;
# Create the rc file.
if (open my $fh, '>', 'bug.rc')
{
print $fh "data.location=.\n";
close $fh;
ok (-r 'bug.rc', 'Created bug.rc');
}
# Bug #1036: prevents 'until' attributes to be modified for non-recurring
# tasks.
# Check that until attribute may be modified
qx{../src/task rc:bug.rc add test 2>&1};
my $output = qx{../src/task rc:bug.rc 1 mod until:1/1/2020 2>&1};
like ($output, qr/^Modifying task 1 'test'.$/ms, '"until" attribute added');
qx{../src/task rc:bug.rc add test until:1/1/2020 2>&1};
$output = qx{../src/task rc:bug.rc 1 mod /test/Test/ 2>&1};
like ($output, qr/^Modifying task 1 'Test'.$/ms, 'Task with "until" attribute modified');
# Cleanup.
unlink qw(pending.data completed.data undo.data backlog.data synch.key bug.rc);
ok (! -r 'pending.data' &&
! -r 'completed.data' &&
! -r 'undo.data' &&
! -r 'backlog.data' &&
! -r 'synch.key' &&
! -r 'bug.rc', 'Cleanup');
exit 0;