Dropping Letters

Merge lp:~thomir-deactivatedaccount/dropping-letters/autopilot-click-package-support into lp:dropping-letters

  1. autopilot-click-package-support
  2. Merge into trunk
Proposed by spookje
Status: Needs review
Proposed branch: lp:~thomir-deactivatedaccount/dropping-letters/autopilot-click-package-support
Merge into: lp:dropping-letters
Diff against target: 65 lines (+22/-0) (has conflicts)
2 files modified
tests/autopilot/dropping_letters_app/tests/__init__.py (+10/-0)
tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py (+12/-0)
Text conflict in tests/autopilot/dropping_letters_app/tests/__init__.py
Text conflict in tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/dropping-letters/autopilot-click-package-support
Reviewer Review Type Date Requested Status
Dropping Letters developers Pending
Review via email: mp+330471@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

40. By Thomi Richards

Fixes for the dropping-letters tests.

39. By Thomi Richards

Port dropping letters app autopilot tests to use click package support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/dropping_letters_app/tests/__init__.py'
2--- tests/autopilot/dropping_letters_app/tests/__init__.py 2013-11-04 22:51:06 +0000
3+++ tests/autopilot/dropping_letters_app/tests/__init__.py 2017-09-09 05:43:28 +0000
4@@ -55,19 +55,29 @@
5 self.launch_test_click()
6
7 def launch_test_local(self):
8+<<<<<<< TREE
9 self.app = self.launch_test_application(
10 base.get_qmlscene_launch_command(),
11 self.local_location,
12 app_type='qt',
13+=======
14+ self.app = self.launch_click_package(
15+ "com.ubuntu.dropping-letters",
16+>>>>>>> MERGE-SOURCE
17 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
18
19 def launch_test_installed(self):
20+<<<<<<< TREE
21 self.app = self.launch_test_application(
22 base.get_qmlscene_launch_command(),
23 self.installed_location,
24 "--desktop_file_hint=/usr/share/applications/"
25 "dropping-letters.desktop",
26 app_type='qt',
27+=======
28+ self.app = self.launch_click_package(
29+ "com.ubuntu.dropping-letters",
30+>>>>>>> MERGE-SOURCE
31 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
32
33 def launch_test_click(self):
34
35=== modified file 'tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py'
36--- tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py 2014-06-27 15:16:03 +0000
37+++ tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py 2017-09-09 05:43:28 +0000
38@@ -44,15 +44,27 @@
39 # open the popup
40 self.pointing_device.click_object(helpbutton)
41
42+<<<<<<< TREE
43 # check and ensure help popover appears
44 helpPopover = self.main_view.get_help_popover()
45 properties = helpPopover.get_properties()
46 self.assertTrue(properties["visible"])
47+=======
48+ #check and ensure help popover appears
49+ get_help_popover_fn = self.main_view.get_help_popover
50+ self.assertThat(get_help_popover_fn, Eventually(NotEquals(None)))
51+ popover = get_help_popover_fn()
52+ self.assertThat(popover.visible, Eventually(Equals(True)))
53+>>>>>>> MERGE-SOURCE
54
55 # check and ensure help popover disappears
56 self.pointing_device.click_object(helpbutton)
57+<<<<<<< TREE
58 self.assertThat(self.main_view.get_many_popover,
59 Eventually(Equals([])))
60+=======
61+ self.assertThat(get_help_popover_fn, Eventually(Equals(None)))
62+>>>>>>> MERGE-SOURCE
63
64 def test_start_new_game(self):
65 toolbar = self.main_view.open_toolbar()

Subscribers

People subscribed via source and target branches