Merge lp:~brendan-donegan/messaging-app/fix_action_items into lp:messaging-app

[Brendan Donegan]

Add objectName's to Action items and fix some test helpers, plus add a few that are useful.

This gives object names to most of the Action items in the messaging app. It also fixes some helpers to use these object names, as they were broken without. Also add helpers for interacting with the Save Contact dialog.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:120
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/229/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/958
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/867/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1715
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1715/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8539
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/749/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1007
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1007/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/229/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:120
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/233/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1003
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/904/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1386
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1773
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1773/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8587
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/779/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1046
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1046/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/233/rebuild

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good to me.
The AP tests failures are unrelated to this change. I will approve this once the
issue causing the failures is fixed.

[Brendan Donegan (brendan-donegan)]

Tiago - can you have a look at this one too? https://code.launchpad.net/~brendan-donegan/messaging-app/python3_autopilot

[lp:~brendan-donegan/messaging-app/fix_action_items]

121. By Brendan Donegan on 2014-06-18

Fixed wrong objectName in emulator

[Brendan Donegan (brendan-donegan)]

Got the name of contactCallAction wrong in the emulator. Fixed now

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:121
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/235/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1016
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/918/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1399
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1791
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1791/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8607
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/792/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1060
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1060/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/235/rebuild

review: Needs Fixing (continuous-integration)

[Brendan Donegan (brendan-donegan)]

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

No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

Yes

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

Yes, on the device

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/messaging-app) on device or emulator?

N/A? Only test code is changed here

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

N/A, no UI changes

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

N/A, no packaging changes

[Tiago Salem Herrmann (tiagosh)]

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

Did CI run pass? If not, please explain why.
No, but the failures are not caused by this change.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

[Brendan Donegan (brendan-donegan)]

This is approved but still hasn't been merged or landed - why?

[lp:~brendan-donegan/messaging-app/fix_action_items]

122. By Brendan Donegan on 2014-07-08

Merged from trunk

[Leo Arias (elopio)]

It is missing tests for:
click_add_to_contact_button
click_create_new_contact_button

cancel_save_button is probably not needed.
on autopilot we are trying to write tests for things that give value to the user.
cancelling a save does not fit well into that description. For that, a QML test sounds better.

review: Needs Fixing (code review)

[Leo Arias (elopio)]

click_add_button and click_call_button also need tests. They got outdated with the new header because they had no test to fail during the transition.

=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2014-06-11 20:13:37 +0000
+++ src/qml/MainPage.qml	2014-07-08 13:38:02 +0000
@@ -88,6 +88,7 @@
             id: searchButton
             objectName: "searchButton"
             action: Action {
+                objectName: "searchAction"
                 iconSource: "image://theme/search"
                 onTriggered: {
                     mainPage.searching = true

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2014-07-01 16:40:20 +0000
+++ src/qml/Messages.qml	2014-07-08 13:38:02 +0000
@@ -217,6 +217,7 @@
              title: i18n.tr("Save contact")
              text: i18n.tr("How do you want to save the contact?")
              Button {
+                 objectName: "addToExistingContact"
                  text: i18n.tr("Add to existing contact")
                  color: UbuntuColors.orange
                  onClicked: {
@@ -226,6 +227,7 @@
                  }
              }
              Button {
+                 objectName: "createNewContact"
                  text: i18n.tr("Create new contact")
                  color: UbuntuColors.orange
                  onClicked: {
@@ -234,6 +236,7 @@
                  }
              }
              Button {
+                 objectName: "cancelSave"
                  text: i18n.tr("Cancel")
                  color: UbuntuColors.warmGrey
                  onClicked: {
@@ -400,6 +403,7 @@
             id: groupChatButton
             objectName: "groupChatButton"
             action: Action {
+                objectName: "groupChatAction"
                 iconSource: "image://theme/navigation-menu"
                 onTriggered: {
                     PopupUtils.open(participantsPopover, messages.header)
@@ -428,6 +432,7 @@
         ToolbarButton {
             objectName: "contactCallButton"
             action: Action {
+                objectName: "contactCallAction"
                 visible: participants.length == 1
                 iconSource: "image://theme/call-start"
                 text: i18n.tr("Call")
@@ -440,6 +445,7 @@
         ToolbarButton {
             objectName: "addContactButton"
             action: Action {
+                objectName: "addContactAction"
                 visible: contactWatcher.isUnknown && participants.length == 1
                 iconSource: "image://theme/new-contact"
                 text: i18n.tr("Add")
@@ -457,6 +463,7 @@
         ToolbarButton {
             objectName: "contactCallButton"
             action: Action {
+                objectName: "contactCallKnownAction"
                 visible: participants.length == 1
                 iconSource: "image://theme/call-start"
                 text: i18n.tr("Call")
@@ -469,6 +476,7 @@
         ToolbarButton {
             objectName: "contactProfileButton"
             action: Action {
+                objectName: "contactProfileAction"
                 visible: !contactWatcher.isUnknown && participants.length == 1
                 iconSource: "image://theme/contact"
                 text: i18n.tr("Contact")

=== modified file 'tests/autopilot/messaging_app/emulators.py'
--- tests/autopilot/messaging_app/emulators.py	2014-06-25 07:21:10 +0000
+++ tests/autopilot/messaging_app/emulators.py	2014-07-08 13:38:02 +0000
@@ -291,19 +291,13 @@
 
     def click_add_button(self):
         """Click add button from toolbar on messages page"""
-
-        toolbar = self.open_toolbar()
-        button = toolbar.wait_select_single("ActionItem", text=u"Add")
-        self.pointing_device.click_object(button)
-        toolbar.animating.wait_for(False)
+        header = self.get_header()
+        header.click_action_button("addContactAction")
 
     def click_call_button(self):
         """Click call button from toolbar on messages page"""
-
-        toolbar = self.open_toolbar()
-        button = toolbar.wait_select_single("ActionItem", text=u"Call")
-        self.pointing_device.click_object(button)
-        toolbar.animating.wait_for(False)
+        header = self.get_header()
+        header.click_action_button("contactCallAction")
 
     def click_back_button(self):
         """Click back button from toolbar on messages page"""
@@ -313,6 +307,30 @@
         self.pointing_device.click_object(button)
         toolbar.animating.wait_for(False)
 
+    def click_add_to_contact_button(self):
+        """
+        Click the 'Add to existing contact' button
+        in the 'Save Contact' dialog.
+        """
+        button = self.wait_select_single('Button',
+                                         objectName="addToExistingContact")
+        self.pointing_device.click_object(button)
+
+    def click_create_new_contact_button(self):
+        """
+        Click the 'Create new contact' button
+        in the 'Save Contact' dialog
+        """
+        button = self.wait_select_single('Button',
+                                         objectName="createNewContact")
+        self.pointing_device.click_object(button)
+
+    def click_cancel_save_button(self):
+        " Click the 'Cancel' button in the 'Save Contact' dialog """
+        button = self.wait_select_single('Button',
+                                         objectName="cancelSave")
+        self.pointing_device.click_object(button)
+
     def click_threads_header_delete(self):
         """Click the header action 'Delete' on Messages view"""
         self.click_header_action('selectionModeDeleteAction')