Fix lint/tests

This commit is contained in:
Florian Bruhin 2023-08-10 16:53:52 +02:00
parent 216a9f9a9b
commit fc843f3944
6 changed files with 22 additions and 4 deletions

View File

@ -1176,7 +1176,7 @@ class AbstractTab(QWidget):
navigation.navigation_type == navigation.Type.form_submitted and
navigation.url.matches(
QUrl(config.val.url.searchengines['DEFAULT']),
QUrl.UrlFormattingOption.RemoveQuery) and
urlutils.FormatOption.REMOVE_QUERY) and
objects.backend == usertypes.Backend.QtWebEngine and
version.qtwebengine_versions().webengine >= utils.VersionNumber(6, 3)
):

View File

@ -1250,6 +1250,7 @@ class CommandDispatcher:
if name is not None:
raise cmdutils.CommandError("Cannot specify name and --all")
quickmark_manager.clear()
message.info("Quickmarks cleared.")
return
if name is None:
@ -1342,6 +1343,7 @@ class CommandDispatcher:
if url is not None:
raise cmdutils.CommandError("Cannot specify url and --all")
bookmark_manager.clear()
message.info("Bookmarks cleared.")
return
if url is None:

View File

@ -214,7 +214,7 @@ class WebEngineElement(webelem.AbstractWebElement):
if baseurl.scheme() == url.scheme(): # e.g. a qute:// link
return False
# Qt 6.3+ needs an user interaction to allow navigations from qute:// to
# Qt 6.3+ needs a user interaction to allow navigations from qute:// to
# outside qute:// (like e.g. on qute://bookmarks).
versions = version.qtwebengine_versions()
if (

View File

@ -39,6 +39,7 @@ if machinery.IS_QT6:
REMOVE_SCHEME = QUrl.UrlFormattingOption.RemoveScheme
REMOVE_PASSWORD = QUrl.UrlFormattingOption.RemovePassword
REMOVE_QUERY = QUrl.UrlFormattingOption.RemoveQuery
else:
UrlFlagsType = Union[
QUrl.FormattingOptions,
@ -74,6 +75,8 @@ else:
_QtFormattingOptions, QUrl.UrlFormattingOption.RemoveScheme)
REMOVE_PASSWORD = cast(
_QtFormattingOptions, QUrl.UrlFormattingOption.RemovePassword)
REMOVE_QUERY = cast(
_QtFormattingOptions, QUrl.UrlFormattingOption.RemoveQuery)
# URL schemes supported by QtWebEngine

View File

@ -300,3 +300,14 @@ Feature: Special qute:// pages
Scenario: Open qute://gpl
When I open qute://gpl
Then the page should contain the plaintext "GNU GENERAL PUBLIC LICENSE"
# qute://start
Scenario: Seaching on qute://start
When I set url.searchengines to {"DEFAULT": "http://localhost:(port)/data/title.html?q={}"}
And I open qute://start
And I run :click-element id search-field
And I wait for "Entering mode KeyMode.insert *" in the log
And I press the keys "test"
And I press the key "<Enter>"
Then data/title.html?q=test should be loaded

View File

@ -92,7 +92,8 @@ Feature: quickmarks and bookmarks
And I open data/numbers/2.txt
And I run :bookmark-add
And I run :bookmark-del --all
Then the bookmark file should not contain "http://localhost:*/data/numbers/1.txt"
Then the message "Bookmarks cleared." should be shown
And the bookmark file should not contain "http://localhost:*/data/numbers/1.txt"
And the bookmark file should not contain "http://localhost:*/data/numbers/2.txt"
Scenario: Deleting all bookmarks with url
@ -230,7 +231,8 @@ Feature: quickmarks and bookmarks
When I run :quickmark-add http://localhost:(port)/data/numbers/1.txt one
When I run :quickmark-add http://localhost:(port)/data/numbers/2.txt two
And I run :quickmark-del --all
Then the quickmark file should not contain "one http://localhost:*/data/numbers/1.txt"
Then the message "Quickmarks cleared." should be shown
And the quickmark file should not contain "one http://localhost:*/data/numbers/1.txt"
And the quickmark file should not contain "two http://localhost:*/data/numbers/2.txt"
Scenario: Deleting all quickmarks with name