From 846e09cfc3a896b36b6eb9520141743cd9a17f9a Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc+taskw@gmail.com>
Date: Fri, 24 Jul 2015 16:09:16 +0100
Subject: [PATCH] Test: Convert bug.955.t and merge with recurrence.t

---
 test/bug.955.t    | 65 -----------------------------------------------
 test/recurrence.t | 29 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 65 deletions(-)
 delete mode 100755 test/bug.955.t

diff --git a/test/bug.955.t b/test/bug.955.t
deleted file mode 100755
index aacb0ba1e..000000000
--- a/test/bug.955.t
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /usr/bin/env perl
-################################################################################
-##
-## Copyright 2006 - 2015, 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 => 3;
-
-# Ensure environment has no influence.
-delete $ENV{'TASKDATA'};
-delete $ENV{'TASKRC'};
-
-use File::Basename;
-my $ut = basename ($0);
-my $rc = $ut . '.rc';
-
-# Create the rc file.
-if (open my $fh, '>', $rc)
-{
-  print $fh "data.location=.\n",
-            "confirmation=on\n";
-  close $fh;
-}
-
-# Bug 955: When deleting the child of a recurring task, taskwarrior does not ask
-#          whether it should delete the parent.
-qx{../src/task rc:$rc add foo due:now recur:1day 2>&1};
-my $output = qx{../src/task rc:$rc ls 2>&1};
-like ($output, qr/^2 tasks/ms, "$ut: 2 child tasks created");
-
-qx{printf 'y\nn\n' | ../src/task rc:$rc 2 delete 2>&1};
-$output = qx{../src/task rc:$rc ls 2>&1};
-like ($output, qr/^1 task/ms, "$ut: 1 child task remaining");
-
-qx{printf 'y\ny\n' | ../src/task rc:$rc 2 delete 2>&1};
-$output = qx{../src/task rc:$rc ls 2>&1};
-like ($output, qr/^No matches/ms, "$ut: No tasks remaining");
-
-# Cleanup.
-unlink qw(pending.data completed.data undo.data backlog.data), $rc;
-exit 0;
-
diff --git a/test/recurrence.t b/test/recurrence.t
index 8d1cd3c0f..0daa9e11f 100755
--- a/test/recurrence.t
+++ b/test/recurrence.t
@@ -28,6 +28,7 @@
 
 import sys
 import os
+import re
 import unittest
 # Ensure python finds the local simpletap module
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
@@ -306,6 +307,34 @@ class TestBug932(TestCase):
         self.assertIn("4 H P", out)
 
 
+class TestBug955(TestCase):
+    def setUp(self):
+        self.t = Task()
+
+    def test_no_prompt_for_parent_on_child_delete(self):
+        """Deleting a child of a recurring task doesn't prompt for parent deletion
+
+        Previously bug.955.t
+        """
+        self.t("add foo due:now recur:1day")
+        code, out, err = self.t("ls")
+        self.assertRegexpMatches(out, re.compile("^2 tasks", re.MULTILINE))
+
+        code, out, err = self.t("2 delete", input="y\nn\n")
+        self.assertIn("Deleting task 2", out)
+        self.assertIn("Deleted 1 task", out)
+
+        code, out, err = self.t("ls")
+        self.assertRegexpMatches(out, re.compile("^1 task", re.MULTILINE))
+
+        code, out, err = self.t("2 delete", input="y\ny\n")
+        self.assertIn("Deleting task 2", out)
+        self.assertIn("Deleted 1 task", out)
+
+        code, out, err = self.t.runError("ls")
+        self.assertIn("No matches", err)
+
+
 # TODO Wait a recurring task
 # TODO Upgrade a task to a recurring task
 # TODO Upgrade a task to a recurring task, but omit the due date (error handling)