Merge lp:~chris.gagnon/dropping-letters/autopilot-1.4 into lp:dropping-letters

[Chris Gagnon]

update autopilot test to work in 1.4, do not merge until autopilot 1.4 is ready on builders/ci

update autopilot test to work in 1.4

[lp:~chris.gagnon/dropping-letters/autopilot-1.4]

44. By Chris Gagnon on 2013-10-28

update debian control for libautopilot-14 >= 1.4 dependancy

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

[lp:~chris.gagnon/dropping-letters/autopilot-1.4]

45. By Chris Gagnon on 2013-11-04

use base.get_launch_commmand from ubuntu-ui-toolkit to get qmlscene

[Christopher Lee (veebers)]

The addition of " base.get_launch_commmand " looks good to me.

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-09-26 17:30:10 +0000
+++ debian/control	2013-11-04 22:52:03 +0000
@@ -20,7 +20,7 @@
 Section: debug
 Priority: extra
 Depends: ${misc:Depends},
-         libautopilot-qt,
+         libautopilot-qt (>= 1.4),
          dropping-letters (>= ${binary:Version}),
          python-autopilot,
          ubuntu-ui-toolkit-autopilot,

=== modified file 'tests/autopilot/dropping_letters_app/emulators.py'
--- tests/autopilot/dropping_letters_app/emulators.py	2013-08-01 18:53:46 +0000
+++ tests/autopilot/dropping_letters_app/emulators.py	2013-11-04 22:52:03 +0000
@@ -32,16 +32,24 @@
         return item
 
     def get_help_button(self):
-        item = self.select_single('QQuickRectangle', objectName='introhelpbutton')
+        item = self.select_single('QQuickRectangle',
+                                  objectName='introhelpbutton')
         return item
 
     def get_help_popover(self):
-        #checking the popup seems to fail -- https://bugs.launchpad.net/autopilot/+bug/1195141?
+        #checking the popup seems to fail
+        # -- https://bugs.launchpad.net/autopilot/+bug/1195141?
         #we can't get the popup by objectname for ??
-        #this works OK because at the moment, there is only one popup -- needs fixed
+        #this works OK because at the moment, there is only one popup
+        #  -- needs fixed
         #item = self.select_single('Label', objectname='helpsheetpopoverlabel')
-        #item = self.select_single('QQuickRectangle', objectname='helpsheetpopoverbox')
+        #item = self.select_single('QQuickRectangle',
+        #                          objectname='helpsheetpopoverbox')
         #item = self.select_single('Popover', objectname='helpsheetpopover')
 
-        item = self.select_single('Popover')
+        item = self.wait_select_single('Popover')
         return item
+
+    def get_many_popover(self):
+        """get a list of open popovers"""
+        return self.select_many('Popover')

=== modified file 'tests/autopilot/dropping_letters_app/tests/__init__.py'
--- tests/autopilot/dropping_letters_app/tests/__init__.py	2013-09-27 16:56:29 +0000
+++ tests/autopilot/dropping_letters_app/tests/__init__.py	2013-11-04 22:52:03 +0000
@@ -22,9 +22,13 @@
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
 
-from ubuntuuitoolkit import emulators as toolkit_emulators
 from dropping_letters_app import emulators
 
+from ubuntuuitoolkit import (
+    base,
+    emulators as toolkit_emulators
+)
+
 
 class DroppingLettersTestCase(AutopilotTestCase):
 
@@ -52,14 +56,14 @@
 
     def launch_test_local(self):
         self.app = self.launch_test_application(
-            "qmlscene",
+            base.get_qmlscene_launch_command(),
             self.local_location,
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_installed(self):
         self.app = self.launch_test_application(
-            "qmlscene",
+            base.get_qmlscene_launch_command(),
             self.installed_location,
             "--desktop_file_hint=/usr/share/applications/"
             "dropping-letters.desktop",

=== modified file 'tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py'
--- tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py	2013-09-27 16:56:29 +0000
+++ tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py	2013-11-04 22:52:03 +0000
@@ -19,7 +19,7 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, NotEquals, LessThan
+from testtools.matchers import Equals, LessThan
 
 from dropping_letters_app.tests import DroppingLettersTestCase
 from time import sleep
@@ -45,16 +45,14 @@
         self.pointing_device.click_object(helpbutton)
 
         #check and ensure help popover appears
-        self.assertThat(self.main_view.get_help_popover,
-                        Eventually(NotEquals(None)))
         helpPopover = self.main_view.get_help_popover()
         properties = helpPopover.get_properties()
         self.assertTrue(properties["visible"])
 
         #check and ensure help popover disappears
         self.pointing_device.click_object(helpbutton)
-        self.assertThat(self.main_view.get_help_popover,
-                        Eventually(Equals(None)))
+        self.assertThat(self.main_view.get_many_popover,
+                        Eventually(Equals([])))
 
     def test_start_new_game(self):
         toolbar = self.main_view.open_toolbar()