webbrowser-app

Merge lp:~osomon/webbrowser-app/rtm-14.09-no-htpp into lp:webbrowser-app/rtm-14.09

  1. rtm-14.09-no-htpp
  2. Merge into rtm-14.09
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 771
Merged at revision: 773
Proposed branch: lp:~osomon/webbrowser-app/rtm-14.09-no-htpp
Merge into: lp:webbrowser-app/rtm-14.09
Diff against target: 23 lines (+2/-2)
2 files modified
tests/autopilot/webbrowser_app/tests/test_errorsheet.py (+1/-1)
tests/autopilot/webbrowser_app/tests/test_tabs.py (+1/-1)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/rtm-14.09-no-htpp
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+240042@code.launchpad.net

Commit message

Do not use a custom scheme to trigger the error page, this won’t work any longer as soon as oxide learns how to delegate unhandled schemes (see https://launchpad.net/bugs/1384460).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/webbrowser_app/tests/test_errorsheet.py'
2--- tests/autopilot/webbrowser_app/tests/test_errorsheet.py 2014-04-24 10:09:42 +0000
3+++ tests/autopilot/webbrowser_app/tests/test_errorsheet.py 2014-10-29 18:56:32 +0000
4@@ -27,5 +27,5 @@
5 def test_invalid_url_triggers_error_message(self):
6 error = self.main_window.get_error_sheet()
7 self.assertThat(error.visible, Equals(False))
8- self.go_to_url("htpp://invalid")
9+ self.go_to_url("http://invalid")
10 self.assertThat(error.visible, Eventually(Equals(True)))
11
12=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
13--- tests/autopilot/webbrowser_app/tests/test_tabs.py 2014-08-20 10:42:40 +0000
14+++ tests/autopilot/webbrowser_app/tests/test_tabs.py 2014-10-29 18:56:32 +0000
15@@ -123,7 +123,7 @@
16 self.open_new_tab()
17 if model() != 'Desktop':
18 self.focus_address_bar()
19- self.type_in_address_bar("htpp://invalid")
20+ self.type_in_address_bar("http://invalid")
21 self.keyboard.press_and_release("Enter")
22 error = self.main_window.get_error_sheet()
23 self.assertThat(error.visible, Eventually(Equals(True)))

Subscribers

People subscribed via source and target branches