ubuntu-touch-coreapps-reviewers team mailing list archive

[spookje <spookbox13@xxxxxxxxx>]

spookje has proposed merging lp:~thomir/dropping-letters/autopilot-click-package-support into lp:dropping-letters.

Requested reviews:
  Dropping Letters developers (dropping-letters-devs)

For more details, see:
https://code.launchpad.net/~thomir/dropping-letters/autopilot-click-package-support/+merge/330471
-- 
Your team Dropping Letters developers is requested to review the proposed merge of lp:~thomir/dropping-letters/autopilot-click-package-support into lp:dropping-letters.

=== modified file 'tests/autopilot/dropping_letters_app/tests/__init__.py'
--- tests/autopilot/dropping_letters_app/tests/__init__.py	2013-11-04 22:51:06 +0000
+++ tests/autopilot/dropping_letters_app/tests/__init__.py	2017-09-09 05:43:28 +0000
@@ -55,19 +55,29 @@
             self.launch_test_click()
 
     def launch_test_local(self):
+<<<<<<< TREE
         self.app = self.launch_test_application(
             base.get_qmlscene_launch_command(),
             self.local_location,
             app_type='qt',
+=======
+        self.app = self.launch_click_package(
+            "com.ubuntu.dropping-letters",
+>>>>>>> MERGE-SOURCE
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_installed(self):
+<<<<<<< TREE
         self.app = self.launch_test_application(
             base.get_qmlscene_launch_command(),
             self.installed_location,
             "--desktop_file_hint=/usr/share/applications/"
             "dropping-letters.desktop",
             app_type='qt',
+=======
+        self.app = self.launch_click_package(
+            "com.ubuntu.dropping-letters",
+>>>>>>> MERGE-SOURCE
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_click(self):

=== modified file 'tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py'
--- tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py	2014-06-27 15:16:03 +0000
+++ tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py	2017-09-09 05:43:28 +0000
@@ -44,15 +44,27 @@
         # open the popup
         self.pointing_device.click_object(helpbutton)
 
+<<<<<<< TREE
         # check and ensure help popover appears
         helpPopover = self.main_view.get_help_popover()
         properties = helpPopover.get_properties()
         self.assertTrue(properties["visible"])
+=======
+        #check and ensure help popover appears
+        get_help_popover_fn = self.main_view.get_help_popover
+        self.assertThat(get_help_popover_fn, Eventually(NotEquals(None)))
+        popover = get_help_popover_fn()
+        self.assertThat(popover.visible, Eventually(Equals(True)))
+>>>>>>> MERGE-SOURCE
 
         # check and ensure help popover disappears
         self.pointing_device.click_object(helpbutton)
+<<<<<<< TREE
         self.assertThat(self.main_view.get_many_popover,
                         Eventually(Equals([])))
+=======
+        self.assertThat(get_help_popover_fn, Eventually(Equals(None)))
+>>>>>>> MERGE-SOURCE
 
     def test_start_new_game(self):
         toolbar = self.main_view.open_toolbar()