diff options
| author | Ander Punnar <ander@kvlt.ee> | 2021-04-09 22:57:26 +0300 |
|---|---|---|
| committer | Ander Punnar <ander@kvlt.ee> | 2021-04-09 22:57:26 +0300 |
| commit | 569b7c1ed2400ef20f2492076574f6b53d07c07e (patch) | |
| tree | 040e61e81ab20fb4bfd97692642d8535b8ddc46e /tests | |
| parent | 4449fe914c93d95788fffa1073c9e862a18f2d4d (diff) | |
| parent | 908abb6566027d9d09fb7079738c3edcdd9ceb0a (diff) | |
| download | qutebrowser-569b7c1ed2400ef20f2492076574f6b53d07c07e.tar.gz qutebrowser-569b7c1ed2400ef20f2492076574f6b53d07c07e.zip | |
Merge remote-tracking branch 'origin/master' into 4nd3r/hostblock_subdomains
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/end2end/data/javascript/img/padded2.png | bin | 0 -> 5633 bytes | |||
| -rw-r--r-- | tests/end2end/data/javascript/notifications.html | 2 | ||||
| -rw-r--r-- | tests/end2end/features/notifications.feature | 6 | ||||
| -rw-r--r-- | tests/unit/scripts/test_check_coverage.py | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/tests/end2end/data/javascript/img/padded2.png b/tests/end2end/data/javascript/img/padded2.png Binary files differnew file mode 100644 index 000000000..be3cff635 --- /dev/null +++ b/tests/end2end/data/javascript/img/padded2.png diff --git a/tests/end2end/data/javascript/notifications.html b/tests/end2end/data/javascript/notifications.html index db28328d5..2c4590417 100644 --- a/tests/end2end/data/javascript/notifications.html +++ b/tests/end2end/data/javascript/notifications.html @@ -101,6 +101,8 @@ <input type="button" onclick="show_image_notification('RGB', 'rgb.png')" value="Show image notification without alpha channel" id="show-image-button-noalpha"> <input type="button" onclick="show_image_notification('Big', 'big.png')" value="Show a big image notification" id="show-image-button-big"> <input type="button" onclick="show_image_notification('Padded', 'padded.png')" value="Show a padded image notification" id="show-image-button-padded"> + <input type="button" onclick="show_image_notification('Padded 2', 'padded2.png')" value="Show a padded image notification 2" +id="show-image-button-padded-2"> </div> <div> More advanced test pages: diff --git a/tests/end2end/features/notifications.feature b/tests/end2end/features/notifications.feature index 5da0c072e..08c5f725f 100644 --- a/tests/end2end/features/notifications.feature +++ b/tests/end2end/features/notifications.feature @@ -53,6 +53,12 @@ Feature: Notifications And the notification should have title "Padded" And the notification should have image dimensions 46x46 + Scenario: Notification with padded image 2 + When I run :click-element id show-image-button-padded-2 + Then the javascript message "notification shown" should be logged + And the notification should have title "Padded 2" + And the notification should have image dimensions 239x239 + Scenario: Closing notification via web When I run :click-element id show-closing-button Then the javascript message "notification shown" should be logged diff --git a/tests/unit/scripts/test_check_coverage.py b/tests/unit/scripts/test_check_coverage.py index 9708c6283..d2a0b409f 100644 --- a/tests/unit/scripts/test_check_coverage.py +++ b/tests/unit/scripts/test_check_coverage.py @@ -77,7 +77,7 @@ class CovtestHelper: argv = [sys.argv[0]] + list(args) self._monkeypatch.setattr(check_coverage.sys, 'argv', argv) with pytest.raises(check_coverage.Skipped) as excinfo: - return check_coverage.check(None, perfect_files=[]) + check_coverage.check(None, perfect_files=[]) assert excinfo.value.reason == reason |
