Merge lp:~renatofilho/address-book-app/fix-share into lp:address-book-app

[Renato Araujo Oliveira Filho]

Fixed contact export from multi selection.

[lp:~renatofilho/address-book-app/fix-share]

447. By Renato Araujo Oliveira Filho on 2015-06-10

Revert changes on helpers.py

448. By Renato Araujo Oliveira Filho on 2015-06-10

Added missing test file.

449. By Renato Araujo Oliveira Filho on 2015-06-10

Fixed flake8 problems.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:446
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/834/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2646
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3146
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3146/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21107

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:449
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/836/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2649
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3149
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3149/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21113

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

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-app/fix-share]

450. By Renato Araujo Oliveira Filho on 2015-06-11

Added missing file into install list.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:450
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/837/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/140
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3168/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2664/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3166
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21139

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

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected?
NO

Is your branch in sync with latest trunk?
YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan on device or emulator?
YES

If you changed the UI, was the change specified/approved by design?
NO UI CHANGE

If you changed UI labels, did you update the pot file?
NO PACKAGE CHANGE

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2015-05-27 22:49:00 +0000
+++ src/imports/ABContactListPage.qml	2015-06-11 14:00:42 +0000
@@ -24,6 +24,7 @@
 import Ubuntu.Content 1.1 as ContentHub
 
 import Ubuntu.AddressBook.Base 0.1
+import Ubuntu.AddressBook.ContactShare 0.1
 
 ContactsUI.PageWithBottomEdge {
     id: mainPage
@@ -474,8 +475,9 @@
             // Share contacts to an application chosen by the user
             if (!mainPage.pickMode) {
                 contactExporter.dismissBusyDialog()
-                pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
-                               { contactModel: contactExporter.contactModel, contacts: contacts })
+                pageStack.push(contactShareComponent,
+                               { contactModel: contactExporter.contactModel,
+                                 contacts: contacts })
             }
         }
     }
@@ -497,6 +499,14 @@
         }
     }
 
+    Component {
+        id: contactShareComponent
+
+        ContactSharePage {
+            objectName: "contactSharePage"
+        }
+    }
+
     Component.onCompleted: {
         application.elapsed()
         if ((typeof(TEST_DATA) !== "undefined") && (TEST_DATA !== "")) {

=== modified file 'src/imports/CMakeLists.txt'
--- src/imports/CMakeLists.txt	2015-04-29 18:39:01 +0000
+++ src/imports/CMakeLists.txt	2015-06-11 14:00:42 +0000
@@ -6,6 +6,7 @@
     ABContactViewPage.qml
     ContentHubProxy.qml
     MainWindow.qml
+    VCardImportDialog.qml
 )
 
 install(FILES ${ADDRESS_BOOK_APP_QMLS}

=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml'
--- src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml	2015-05-07 17:27:16 +0000
+++ src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml	2015-06-11 14:00:42 +0000
@@ -55,7 +55,14 @@
             console.debug("The contact list is empty")
             done("")
         } else {
-            priv.currentQueryId = contactModel.fetchContacts(ids)
+            if (root.contactModel.manager === "memory") {
+                // memory backend emit contact fetched before return from "fetchContacts" we will use operation = "-2"
+                // to say that we are wainting for a operation from memory manager
+                priv.currentQueryId = -2
+                contactModel.fetchContacts(ids)
+            } else {
+                priv.currentQueryId = contactModel.fetchContacts(ids)
+            }
         }
     }
 

=== modified file 'tests/autopilot/address_book_app/__init__.py'
--- tests/autopilot/address_book_app/__init__.py	2015-05-12 15:43:25 +0000
+++ tests/autopilot/address_book_app/__init__.py	2015-06-11 14:00:42 +0000
@@ -98,6 +98,10 @@
                 return p
         return None
 
+    def get_share_page(self):
+        return self.wait_select_single("ContactSharePage",
+                                       objectName="contactSharePage")
+
     def start_import_contacts(self):
         self.open_header()
         view = self.get_contact_list_view()

=== added file 'tests/autopilot/address_book_app/tests/test_export_contact.py'
--- tests/autopilot/address_book_app/tests/test_export_contact.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/tests/test_export_contact.py	2015-06-11 14:00:42 +0000
@@ -0,0 +1,32 @@
+# -*- 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 autopilot.matchers import Eventually
+from testtools.matchers import Equals
+
+from address_book_app.tests import AddressBookAppTestCase
+
+
+class TestExportContact(AddressBookAppTestCase):
+    """Tests the erxport contact features"""
+
+    PRELOAD_VCARD = True
+
+    def test_export_contacts(self):
+        contact_list = self.app.main_window.get_contact_list_page()
+
+        # select one contact
+        contact_list.select_contacts([1])
+
+        # click on export header action
+        self.app.main_window.click_action_button('share')
+
+        # expect that the share page appears
+        share_page = self.app.main_window.get_share_page()
+        self.assertThat(share_page.active, Eventually(Equals(True)))