diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index ae1319d52..103f4527a 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -123,7 +123,7 @@ class CommandDispatcher: """ urlutils.raise_cmdexc_if_invalid(url) tabbed_browser = self._tabbed_browser - cmdutils.check_exclusive((tab, background, window), 'tbw') + cmdutils.check_exclusive((tab, background, window, private), 'tbwp') if private is None: private = self._tabbed_browser.private diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py index 8451aa4ce..aebc4c7f7 100644 --- a/qutebrowser/browser/webengine/webenginesettings.py +++ b/qutebrowser/browser/webengine/webenginesettings.py @@ -295,7 +295,7 @@ MAPPINGS = { Attribute(QWebEngineSettings.LocalStorageEnabled), 'cache-size': DefaultProfileSetter(getter='httpCacheMaximumSize', - setter='setHttpCacheMaximumSize') + setter='setHttpCacheMaximumSize') }, 'general': { 'xss-auditing': diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index 0ac20a1e6..7851f9964 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -1129,7 +1129,7 @@ def data(readonly=False): "Foreground color of the statusbar in private browsing mode."), ('statusbar.bg.private', - SettingValue(typ.QssColor(), 'grey'), # FIXME darker color + SettingValue(typ.QssColor(), '#666666'), "Background color of the statusbar in private browsing mode."), ('statusbar.fg.insert', diff --git a/tests/end2end/features/open.feature b/tests/end2end/features/open.feature index efc132466..188347bb2 100644 --- a/tests/end2end/features/open.feature +++ b/tests/end2end/features/open.feature @@ -33,7 +33,7 @@ Feature: Opening pages Scenario: :open with -t and -b When I run :open -t -b foo.bar - Then the error "Only one of -t/-b/-w can be given!" should be shown + Then the error "Only one of -t/-b/-w/-p can be given!" should be shown Scenario: Searching with :open When I set general -> auto-search to naive diff --git a/tests/end2end/features/private.feature b/tests/end2end/features/private.feature index 0faf74014..6b4409e8d 100644 --- a/tests/end2end/features/private.feature +++ b/tests/end2end/features/private.feature @@ -110,3 +110,9 @@ Feature: Using private browsing tabs: - history: - url: http://localhost:*/data/hello.txt + + Scenario: Skipping private window when saving session + When I open data/hello.txt in a private window + And I run :session-save (tmpdir)/session.yml + And I wait for "Saved session */session.yml." in the log + Then the file session.yml should not contain "hello.txt" diff --git a/tests/end2end/features/test_private_bdd.py b/tests/end2end/features/test_private_bdd.py index 7587b1f4d..45f97e19a 100644 --- a/tests/end2end/features/test_private_bdd.py +++ b/tests/end2end/features/test_private_bdd.py @@ -33,3 +33,9 @@ def check_cookie(quteproc, name, value): data = json.loads(content) print(data) assert data['cookies'][name] == value + + +@bdd.then(bdd.parsers.parse('the file {name} should not contain "{text}"')) +def check_not_contain(tmpdir, name, text): + path = tmpdir / name + assert text not in path.read() diff --git a/tests/end2end/features/urlmarks.feature b/tests/end2end/features/urlmarks.feature index b41359885..f2d074a32 100644 --- a/tests/end2end/features/urlmarks.feature +++ b/tests/end2end/features/urlmarks.feature @@ -76,7 +76,7 @@ Feature: quickmarks and bookmarks Scenario: Loading a bookmark with -t and -b When I run :bookmark-load -t -b about:blank - Then the error "Only one of -t/-b/-w can be given!" should be shown + Then the error "Only one of -t/-b/-w/-p can be given!" should be shown Scenario: Deleting a bookmark which does not exist When I run :bookmark-del doesnotexist @@ -200,7 +200,7 @@ Feature: quickmarks and bookmarks Scenario: Loading a quickmark with -t and -b When I run :quickmark-add http://localhost:(port)/data/numbers/17.txt seventeen When I run :quickmark-load -t -b seventeen - Then the error "Only one of -t/-b/-w can be given!" should be shown + Then the error "Only one of -t/-b/-w/-p can be given!" should be shown Scenario: Deleting a quickmark which does not exist When I run :quickmark-del doesnotexist