Merge lp:~nskaggs/ubuntu-clock-app/fix-ap-mainview into lp:ubuntu-clock-app

[Nicholas Skaggs]

Fix Mainview12 issue

Probably should at least land this change so anyone can work off of it.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:380
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/843/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/188/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/843/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:381
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/844/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/189

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/844/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

LGTM! Thnx for the fix Nicholas!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/317/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-autolanding/74/console

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml	2015-08-26 23:35:50 +0000
+++ app/ubuntu-clock-app.qml	2015-09-14 20:53:59 +0000
@@ -30,7 +30,7 @@
     property bool applicationState: Qt.application.active
 
     // objectName for functional testing purposes (autopilot-qt5)
-    objectName: "clock"
+    objectName: "clockMainView"
 
     // applicationName for click packages (used as an unique app identifier)
     applicationName: "com.ubuntu.clock"

=== modified file 'tests/autopilot/ubuntu_clock_app/__init__.py'
--- tests/autopilot/ubuntu_clock_app/__init__.py	2015-06-17 21:03:43 +0000
+++ tests/autopilot/ubuntu_clock_app/__init__.py	2015-09-14 20:53:59 +0000
@@ -49,6 +49,11 @@
 
 class MainView(ubuntuuitoolkit.MainView):
 
+    # bug 1341671 means AP sees this as MainView12
+    @classmethod
+    def get_type_query_name(cls):
+        return 'MainView12'
+
     @autopilot_logging.log_action(logger.info)
     def open_clock(self):
         """Open the Clock Page.
@@ -68,7 +73,7 @@
         clockPage = self.open_clock()
         clockPage.reveal_bottom_edge_page()
         self.get_header().visible.wait_for(True)
-        return self.wait_select_single(Page11)
+        return self.wait_select_single(AlarmPage)
 
     def get_AlarmList(self):
         """ Get the AlarmList object. """
@@ -92,11 +97,12 @@
         self.main_view = self.get_root_instance().select_single(MainView)
 
 
-class PageWithBottomEdge(MainView):
+class PageWithBottomEdge(Page):
     """
     An emulator class that makes it easy to interact with the bottom edge
     swipe page
     """
+
     def __init__(self, *args):
         super(PageWithBottomEdge, self).__init__(*args)
 
@@ -191,7 +197,7 @@
         self.pointing_device.click_object(deleteButton)
 
 
-class Page11(Page):
+class AlarmPage(Page):
     """Autopilot helper for the Alarm page."""
 
     @autopilot_logging.log_action(logger.info)