Skip to content

Commit

Permalink
Add regenerating website to contributing.asciidoc
Browse files Browse the repository at this point in the history
[ci skip]

(cherry picked from commit 9f95736)
  • Loading branch information
The-Compiler committed Mar 26, 2018
1 parent 6755e17 commit 021bb25
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion doc/contributing.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,8 @@ as closed.
* Linux: Run `git checkout v1.$x.$y && ./.venv/bin/python3 scripts/dev/build_release.py --upload v1.$x.$y`.
* Windows: Run `git checkout v1.X.Y; C:\Python36-32\python scripts\dev\build_release.py --asciidoc C:\Python27\python C:\asciidoc-8.6.9\asciidoc.py --upload v1.X.Y` (replace X/Y by hand).
* macOS: Run `git checkout v1.X.Y && python3 scripts/dev/build_release.py --upload v1.X.Y` (replace X/Y by hand).
* On server: Run `python3 scripts/dev/download_release.py v1.X.Y` (replace X/Y by hand).
* On server:
- Run `python3 scripts/dev/download_release.py v1.X.Y` (replace X/Y by hand).
- Run `git pull github master && sudo python3 scripts/asciidoc2html.py --website /srv/http/qutebrowser`
* Update `qutebrowser-git` PKGBUILD if dependencies/install changed.
* Announce to qutebrowser and qutebrowser-announce mailinglist.
8 changes: 6 additions & 2 deletions tests/unit/browser/webkit/test_qt_javascript.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

import pytest

from PyQt5.QtCore import QUrl


@pytest.mark.parametrize('js_enabled, expected', [(True, 2.0), (False, None)])
def test_simple_js_webkit(webview, js_enabled, expected):
Expand Down Expand Up @@ -49,13 +51,15 @@ def test_element_js_webkit(webview, js_enabled, expected):
@pytest.mark.usefixtures('redirect_webengine_data')
@pytest.mark.parametrize('js_enabled, expected', [(True, 2.0), (False, 2.0)])
def test_simple_js_webengine(callback_checker, webengineview, js_enabled,
expected):
expected, qapp):
"""With QtWebEngine, runJavaScript works even when JS is off."""
# If we get there (because of the webengineview fixture) we can be certain
# QtWebEngine is available
from PyQt5.QtWebEngineWidgets import QWebEngineSettings
webengineview.settings().setAttribute(QWebEngineSettings.JavascriptEnabled,
js_enabled)
qapp.processEvents()

webengineview.page().runJavaScript('1 + 1', callback_checker.callback)
webengineview.setHtml('')
webengineview.page().runJavaScript('1 + 1', 1, callback_checker.callback)
callback_checker.check(expected)

0 comments on commit 021bb25

Please sign in to comment.