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

Fail javascript tests on logging messages

Browse Source
This commit is contained in:
Florian Bruhin 2018-03-19 20:43:55 +01:00
parent 9031b3e535
commit b588f54a53
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/unit/javascript/conftest.py
View File

@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with qutebrowser. If not, see <http://www.gnu.org/licenses/>. # along with qutebrowser. If not, see <http://www.gnu.org/licenses/>.
"""pylint conftest file for javascript test.""" """pytest conftest file for javascript tests."""
import os import os
import os.path import os.path
@ -41,11 +41,18 @@ class JSTester:
_jinja_env: The jinja2 environment used to get templates. _jinja_env: The jinja2 environment used to get templates.
""" """
def __init__(self, tab, qtbot): def __init__(self, tab, qtbot, config_stub):
self.tab = tab self.tab = tab
self.qtbot = qtbot self.qtbot = qtbot
loader = jinja2.FileSystemLoader(os.path.dirname(__file__)) loader = jinja2.FileSystemLoader(os.path.dirname(__file__))
self._jinja_env = jinja2.Environment(loader=loader, autoescape=True) self._jinja_env = jinja2.Environment(loader=loader, autoescape=True)
# Make sure logging via JS fails tests
config_stub.val.content.javascript.log = {
'error': 'error',
'info': 'error',
'unknown': 'error',
'warning': 'error'
}
def load(self, path, **kwargs): def load(self, path, **kwargs):
"""Load and display the given jinja test data. """Load and display the given jinja test data.
@ -109,18 +116,18 @@ class JSTester:
@pytest.fixture @pytest.fixture
def js_tester_webkit(webkit_tab, qtbot): def js_tester_webkit(webkit_tab, qtbot, config_stub):
"""Fixture to test javascript snippets in webkit.""" """Fixture to test javascript snippets in webkit."""
return JSTester(webkit_tab, qtbot) return JSTester(webkit_tab, qtbot, config_stub)
@pytest.fixture @pytest.fixture
def js_tester_webengine(webengine_tab, qtbot): def js_tester_webengine(webengine_tab, qtbot, config_stub):
"""Fixture to test javascript snippets in webengine.""" """Fixture to test javascript snippets in webengine."""
return JSTester(webengine_tab, qtbot) return JSTester(webengine_tab, qtbot, config_stub)
@pytest.fixture @pytest.fixture
def js_tester(web_tab, qtbot): def js_tester(web_tab, qtbot, config_stub):
"""Fixture to test javascript snippets with both backends.""" """Fixture to test javascript snippets with both backends."""
return JSTester(web_tab, qtbot) return JSTester(web_tab, qtbot, config_stub)