Merge lp:~osomon/webbrowser-app/autopilot-fixes-desktop-narrow-mode into lp:webbrowser-app

Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1238
Merged at revision: 1241
Proposed branch: lp:~osomon/webbrowser-app/autopilot-fixes-desktop-narrow-mode
Merge into: lp:webbrowser-app
Diff against target: 31 lines (+10/-3)
1 file modified
tests/autopilot/webbrowser_app/tests/test_keyboard.py (+10/-3)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/autopilot-fixes-desktop-narrow-mode
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+274719@code.launchpad.net

Commit message

Fix a couple of autopilot failures on desktop in narrow mode.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/autopilot/webbrowser_app/tests/test_keyboard.py'
--- tests/autopilot/webbrowser_app/tests/test_keyboard.py 2015-09-29 13:15:01 +0000
+++ tests/autopilot/webbrowser_app/tests/test_keyboard.py 2015-10-16 14:38:05 +0000
@@ -105,9 +105,15 @@
105 self.main_window.press_key('Ctrl+Page_Down')105 self.main_window.press_key('Ctrl+Page_Down')
106 self.check_tab_number(0)106 self.check_tab_number(0)
107 self.main_window.press_key('Shift+Ctrl+Tab')107 self.main_window.press_key('Shift+Ctrl+Tab')
108 self.check_tab_number(2)108 if self.main_window.wide:
109 self.check_tab_number(2)
110 else:
111 self.check_tab_number(1)
109 self.main_window.press_key('Ctrl+Page_Up')112 self.main_window.press_key('Ctrl+Page_Up')
110 self.check_tab_number(1)113 if self.main_window.wide:
114 self.check_tab_number(1)
115 else:
116 self.check_tab_number(2)
111117
112 def test_can_switch_tabs_after_suggestions_escape(self):118 def test_can_switch_tabs_after_suggestions_escape(self):
113 self.open_tabs(1)119 self.open_tabs(1)
@@ -308,7 +314,8 @@
308 self.assertThat(address_bar.findInPageMode, Eventually(Equals(True)))314 self.assertThat(address_bar.findInPageMode, Eventually(Equals(True)))
309 self.main_window.press_key('Escape')315 self.main_window.press_key('Escape')
310 self.assertThat(address_bar.findInPageMode, Eventually(Equals(False)))316 self.assertThat(address_bar.findInPageMode, Eventually(Equals(False)))
311317 if not self.main_window.wide:
318 self.open_tabs_view()
312 self.open_new_tab()319 self.open_new_tab()
313 self.main_window.press_key('Ctrl+F')320 self.main_window.press_key('Ctrl+F')
314 self.assertThat(address_bar.findInPageMode, Equals(False))321 self.assertThat(address_bar.findInPageMode, Equals(False))

Subscribers

People subscribed via source and target branches

to status/vote changes: