Merge lp:~brandontschaefer/unity/menu-accelerator-ap-test-fix into lp:unity

Proposed by Brandon Schaefer
Status: Merged
Approved by: Thomi Richards
Approved revision: no longer in the source branch.
Merged at revision: 2739
Proposed branch: lp:~brandontschaefer/unity/menu-accelerator-ap-test-fix
Merge into: lp:unity
Diff against target: 39 lines (+6/-6)
1 file modified
tests/autopilot/unity/tests/test_panel.py (+6/-6)
To merge this branch: bzr merge lp:~brandontschaefer/unity/menu-accelerator-ap-test-fix
Reviewer Review Type Date Requested Status
Thomi Richards (community) Approve
Review via email: mp+125613@code.launchpad.net

Commit message

Fix broken AP test due to gcalc not having menu accelerators anymore.

Description of the change

Fix broken AP test due to gcalc not having menu accelerators anymore.

To post a comment you must log in.
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/unity/tests/test_panel.py'
2--- tests/autopilot/unity/tests/test_panel.py 2012-08-23 16:59:06 +0000
3+++ tests/autopilot/unity/tests/test_panel.py 2012-09-21 00:33:30 +0000
4@@ -628,15 +628,15 @@
5 self.keyboard.type("World")
6
7 self.assertThat(self.hud.search_string, Eventually(Equals("HelloWorld")))
8-
9+
10 def test_double_click_unmaximize_window(self):
11 """Double clicking the grab area must unmaximize a maximized window."""
12 gedit_win = self.open_new_application_window("Text Editor", maximized=True)
13-
14+
15 self.panel.move_mouse_over_grab_area()
16 self.mouse.click()
17 self.mouse.click()
18-
19+
20 self.assertThat(self.panel.title, Eventually(Equals(gedit_win.application.name)))
21
22
23@@ -976,13 +976,13 @@
24
25 def test_panel_menu_accelerators_work(self):
26 """Pressing a valid menu accelerator must open the correct menu item."""
27- self.open_new_application_window("Calculator")
28+ self.open_new_application_window("Text Editor")
29 sleep(1)
30- self.keyboard.press_and_release("Alt+c")
31+ self.keyboard.press_and_release("Alt+f")
32 self.addCleanup(self.keyboard.press_and_release, "Escape")
33
34 open_indicator = self.get_active_indicator()
35- self.assertThat(open_indicator.label, Eventually(Equals("_Calculator")))
36+ self.assertThat(open_indicator.label, Eventually(Equals("_File")))
37
38 def test_panel_indicators_key_navigation_next_works(self):
39 """Right arrow key must open the next menu."""