Merge lp:~renatofilho/address-book-app/autopilot-remove-contact into lp:address-book-app

[Renato Araujo Oliveira Filho]

Added test for remove contacts.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:128
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/303/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/13
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/855
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/843/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/770
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/855
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/855/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/843
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/843/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3447/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1536

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/303/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:129
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/311/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1001
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/985
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1001
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1001/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/985
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/985/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3576
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1682

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/311/rebuild

review: Approve (continuous-integration)

[Omer Akram (om26er)]

Please merge it with trunk, has conflicts. otherwise code looks fine to me.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:130
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/356/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/66
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/66/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/66
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2358
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2231
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2070
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2360
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2360/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2231
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4688
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3114

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/356/rebuild

review: Needs Fixing (continuous-integration)

[Omer Akram (om26er)]

Fine by me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/address-book-app-autolanding/142/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-autolanding/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-autolanding/19
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-autolanding/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-autolanding/19
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2362
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2235
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2073
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2364
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2364/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2235
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2235/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4691
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3117

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/address-book-app-autolanding/143/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-autolanding/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-autolanding/20
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-autolanding/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-autolanding/20
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2249
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2085
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2378
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2249
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2249/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4702
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3129

review: Needs Fixing (continuous-integration)

Unmerged revisions

130. By Renato Araujo Oliveira Filho on 2014-01-15

Merged mainline.

129. By Renato Araujo Oliveira Filho on 2013-11-22

Merged parent branch.

128. By Renato Araujo Oliveira Filho on 2013-11-19

Updated swipe to delete test to check if the removed contact was the correct one.

127. By Renato Araujo Oliveira Filho on 2013-11-19

Added test for remove contacts.

=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2013-12-17 23:47:28 +0000
+++ src/imports/ContactList/ContactListPage.qml	2014-01-15 12:23:31 +0000
@@ -140,6 +140,8 @@
 
         locked: contactList.isInSelectionMode
         ToolbarButton {
+            objectName: "select"
+
             action: Action {
                 objectName: "selectButton"
                 text: i18n.tr("Select")
@@ -149,6 +151,7 @@
         }
         ToolbarButton {
             objectName: "Add"
+
             action: Action {
                 text: i18n.tr("Add")
                 iconSource: "artwork:/add.png"

=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDelegate.qml	2013-12-12 15:55:19 +0000
+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-01-15 12:23:31 +0000
@@ -32,6 +32,7 @@
    property int titleDetail: ContactDetail.Name
    property variant titleFields: [ Name.FirstName, Name.LastName ]
    property bool detailsShown: false
+   readonly property alias text: name.text
 
    signal contactClicked(var index, var contact)
    signal pressAndHold(var index, var contact)
@@ -42,6 +43,7 @@
 
     ListItem.Empty {
         id: delegate
+        objectName: "listItem"
 
         height: units.gu(6)
         showDivider: false

=== modified file 'src/imports/Ubuntu/Contacts/DialogButtons.qml'
--- src/imports/Ubuntu/Contacts/DialogButtons.qml	2013-12-12 15:55:19 +0000
+++ src/imports/Ubuntu/Contacts/DialogButtons.qml	2014-01-15 12:23:31 +0000
@@ -31,7 +31,7 @@
 
     Button {
         id: reject
-        objectName: "DialogButtons.rejectButton"
+        objectName: root.visible ? "DialogButtons.rejectButton" : ""
 
         action: Action {
             text: i18n.tr("Cancel")
@@ -47,7 +47,7 @@
 
     Button {
         id: accept
-        objectName: "DialogButtons.acceptButton"
+        objectName: root.visible ? "DialogButtons.acceptButton" : ""
 
         action: Action {
             text: i18n.tr("Done")

=== added file 'tests/autopilot/address_book_app/tests/test_remove_contact.py'
--- tests/autopilot/address_book_app/tests/test_remove_contact.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/tests/test_remove_contact.py	2014-01-15 12:23:31 +0000
@@ -0,0 +1,75 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2013 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+"""Tests for the Addressbook App"""
+
+from __future__ import absolute_import
+
+from testtools.matchers import Equals
+from autopilot.matchers import Eventually
+
+from address_book_app.tests import AddressBookAppTestCase
+
+
+class TestRemoveContact(AddressBookAppTestCase):
+    """ Tests remove contact """
+
+    def test_swipe_to_delete_contact(self):
+        self.add_contact("Fulano", "de Tal")
+        self.add_contact("Fulano2", "de Tal2")
+        self.add_contact("Fulano3", "de Tal3")
+
+        # swipe to delete a specific contact
+        contacts = self.main_window.select_many("ContactDelegate")
+        for contact in contacts:
+            if contact.text == "Fulano2 de Tal2":
+                list_item = contact.select_single("Empty", objectName="listItem")
+                list_item.swipe_to_delete()
+                list_item.confirm_removal()
+
+        # check if contact removed was the correct one
+        list_view = self.main_window.select_single(
+            "ContactListView",
+            objectName="contactListView")
+        self.assertThat(list_view.count, Eventually(Equals(2)))
+
+        contacts = self.main_window.select_many("ContactDelegate")
+        remaining = ["Fulano de Tal", "Fulano3 de Tal3"]
+        for contact in contacts:
+            if contact.text in remaining:
+                remaining.remove(contact.text)
+        self.assertThat(len(remaining), Equals(0))
+
+    def test_delete_selected_contact(self):
+        self.add_contact("Fulano", "de Tal")
+        self.add_contact("Fulano2", "de Tal2")
+        self.add_contact("Fulano3", "de Tal3")
+
+        # enter select mode
+        self.main_window.open_toolbar().click_button("select")
+
+        # select two contacts
+        contacts = self.main_window.select_many("ContactDelegate")
+        for contact in contacts:
+            if contact.text in ["Fulano2 de Tal2", "Fulano3 de Tal3"]:
+                self.pointing_device.click_object(contact)
+
+        # delete
+        list_view = self.main_window.select_single(
+            "ContactListView",
+            objectName="contactListView")
+        accept_button = list_view.select_single(
+            "Button",
+            objectName="DialogButtons.acceptButton")
+        self.pointing_device.click_object(accept_button)
+
+        # check if contact was removed
+        self.assertThat(list_view.count, Eventually(Equals(1)))
+
+        # check if remaining contact is the correct one
+        contacts = self.main_window.select_many("ContactDelegate")
+        self.assertThat(contacts[0].text, Eventually(Equals("Fulano de Tal")))