rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix two new-config/master merge resolutions.

Browse Source 
Remove icon from jinja.render call (removed in master).
Add 'When the unwritable dir is unwritable' to download feature file.
This commit is contained in:
Ryan Roden-Corrent 2017-09-07 08:56:57 -04:00
parent 607c64742c
commit a6d14ad7dc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/mainwindow/tabbedbrowser.py
View File

@ -721,7 +721,7 @@ class TabbedBrowser(tabwidget.TabWidget):
url_string = tab.url(requested=True).toDisplayString() url_string = tab.url(requested=True).toDisplayString()
error_page = jinja.render( error_page = jinja.render(
'error.html', title="Error loading {}".format(url_string), 'error.html', title="Error loading {}".format(url_string),
url=url_string, error=msg, icon='') url=url_string, error=msg)
QTimer.singleShot(100, lambda: show_error_page(error_page)) QTimer.singleShot(100, lambda: show_error_page(error_page))
else: else:
# WORKAROUND for https://bugreports.qt.io/browse/QTBUG-58698 # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-58698

3
tests/end2end/features/downloads.feature
View File

@ -594,7 +594,8 @@ Feature: Downloading things from a website.
Then the downloaded file content-size should exist Then the downloaded file content-size should exist
Scenario: Downloading to unwritable destination Scenario: Downloading to unwritable destination
When I set downloads.location.prompt to false When the unwritable dir is unwritable
And I set downloads.location.prompt to false
And I run :download http://localhost:(port)/data/downloads/download.bin --dest (tmpdir)/downloads/unwritable And I run :download http://localhost:(port)/data/downloads/download.bin --dest (tmpdir)/downloads/unwritable
Then the error "Download error: Permission denied" should be shown Then the error "Download error: Permission denied" should be shown