diff --git a/tests/end2end/features/backforward.feature b/tests/end2end/features/backforward.feature index c85ede539..d6699fbff 100644 --- a/tests/end2end/features/backforward.feature +++ b/tests/end2end/features/backforward.feature @@ -13,14 +13,14 @@ Feature: Going back and forward. And I wait until data/backforward/2.txt is loaded And I reload Then the session should look like: - """ + """ windows: - tabs: - history: - url: http://localhost:*/data/backforward/1.txt - active: true url: http://localhost:*/data/backforward/2.txt - """ + """ # https://travis-ci.org/qutebrowser/qutebrowser/jobs/157941720 @qtwebengine_flaky @@ -31,7 +31,7 @@ Feature: Going back and forward. And I run :back -t And I wait until data/backforward/1.txt is loaded Then the session should look like: - """ + """ windows: - tabs: - history: @@ -43,7 +43,7 @@ Feature: Going back and forward. - active: true url: http://localhost:*/data/backforward/1.txt - url: http://localhost:*/data/backforward/2.txt - """ + """ Scenario: Going back in a new tab without history Given I open data/backforward/1.txt @@ -51,14 +51,14 @@ Feature: Going back and forward. And I run :back -t Then the error "At beginning of history." should be shown Then the session should look like: - """ + """ windows: - tabs: - active: true history: - active: true url: http://localhost:*/data/backforward/1.txt - """ + """ Scenario: Going back in a new background tab Given I open data/backforward/1.txt @@ -67,7 +67,7 @@ Feature: Going back and forward. And I run :back -b And I wait until data/backforward/1.txt is loaded Then the session should look like: - """ + """ windows: - tabs: - active: true @@ -79,7 +79,7 @@ Feature: Going back and forward. - active: true url: http://localhost:*/data/backforward/1.txt - url: http://localhost:*/data/backforward/2.txt - """ + """ @flaky Scenario: Going back with count. @@ -91,7 +91,7 @@ Feature: Going back and forward. And I wait until data/backforward/1.txt is loaded And I reload Then the session should look like: - """ + """ windows: - tabs: - history: @@ -99,7 +99,7 @@ Feature: Going back and forward. url: http://localhost:*/data/backforward/1.txt - url: http://localhost:*/data/backforward/2.txt - url: http://localhost:*/data/backforward/3.txt - """ + """ Scenario: Going back too much with count. Given I open data/backforward/1.txt @@ -124,7 +124,7 @@ Feature: Going back and forward. And I run :back -w And I wait until data/backforward/1.txt is loaded Then the session should look like: - """ + """ windows: - tabs: - active: true @@ -140,7 +140,7 @@ Feature: Going back and forward. - active: true url: http://localhost:*/data/backforward/1.txt - url: http://localhost:*/data/backforward/2.txt - """ + """ Scenario: Going back without history Given I open data/backforward/1.txt diff --git a/tests/end2end/features/completion.feature b/tests/end2end/features/completion.feature index 81df5bb1d..5e6b47dce 100644 --- a/tests/end2end/features/completion.feature +++ b/tests/end2end/features/completion.feature @@ -91,10 +91,10 @@ Feature: Using completion And I run :tab-move 1 And I run :tab-select hello2.txt Then the following tabs should be open: - """ + """ - data/hello2.txt (active) - data/hello.txt - """ + """ Scenario: Space updates completion model after selecting full command When I run :cmd-set-text :set diff --git a/tests/end2end/features/editor.feature b/tests/end2end/features/editor.feature index 8b813667a..8cc9e1550 100644 --- a/tests/end2end/features/editor.feature +++ b/tests/end2end/features/editor.feature @@ -15,10 +15,10 @@ Feature: Opening external editors And I run :edit-url -t Then data/numbers/2.txt should be loaded And the following tabs should be open: - """ + """ - data/numbers/1.txt - data/numbers/2.txt (active) - """ + """ Scenario: Editing a URL with -rt When I set tabs.new_position.related to prev @@ -28,10 +28,10 @@ Feature: Opening external editors And I run :edit-url -rt Then data/numbers/2.txt should be loaded And the following tabs should be open: - """ + """ - data/numbers/2.txt (active) - data/numbers/1.txt - """ + """ Scenario: Editing a URL with -b When I run :tab-only @@ -40,10 +40,10 @@ Feature: Opening external editors And I run :edit-url -b Then data/numbers/2.txt should be loaded And the following tabs should be open: - """ + """ - data/numbers/1.txt (active) - data/numbers/2.txt - """ + """ Scenario: Editing a URL with -w When I run :window-only @@ -53,7 +53,7 @@ Feature: Opening external editors And I run :edit-url -w Then data/numbers/2.txt should be loaded And the session should look like: - """ + """ windows: - tabs: - active: true @@ -65,7 +65,7 @@ Feature: Opening external editors history: - active: true url: http://localhost:*/data/numbers/2.txt - """ + """ Scenario: Editing a URL with -p When I open data/numbers/1.txt in a new tab @@ -75,7 +75,7 @@ Feature: Opening external editors And I run :edit-url -p Then data/numbers/2.txt should be loaded And the session should look like: - """ + """ windows: - tabs: - active: true @@ -88,7 +88,7 @@ Feature: Opening external editors - active: true url: http://localhost:*/data/numbers/2.txt private: true - """ + """ Scenario: Editing a URL with -t and -b When I run :edit-url -t -b diff --git a/tests/end2end/features/history.feature b/tests/end2end/features/history.feature index 603f0c3e0..d965e3e81 100644 --- a/tests/end2end/features/history.feature +++ b/tests/end2end/features/history.feature @@ -9,10 +9,10 @@ Feature: Page history When I open data/numbers/1.txt And I open data/numbers/2.txt Then the history should contain: - """ + """ http://localhost:(port)/data/numbers/1.txt http://localhost:(port)/data/numbers/2.txt - """ + """ Scenario: History item with title When I open data/title.html @@ -23,10 +23,10 @@ Feature: Page history When I open redirect-to?url=data/title.html without waiting And I wait until data/title.html is loaded Then the history should contain: - """ + """ r http://localhost:(port)/redirect-to?url=data/title.html Test title http://localhost:(port)/data/title.html Test title - """ + """ Scenario: History item with spaces in URL When I open data/title with spaces.html @@ -76,10 +76,10 @@ Feature: Page history When I open data/hints/html/simple.html And I hint with args "--add-history links yank" and follow a Then the history should contain: - """ + """ http://localhost:(port)/data/hints/html/simple.html Simple link http://localhost:(port)/data/hello.txt - """ + """ @flaky Scenario: Listing history diff --git a/tests/end2end/features/utilcmds.feature b/tests/end2end/features/utilcmds.feature index 0dfe0b9df..3e6ac2afb 100644 --- a/tests/end2end/features/utilcmds.feature +++ b/tests/end2end/features/utilcmds.feature @@ -143,10 +143,10 @@ Feature: Miscellaneous utility commands exposed to the user. And I run :hint-follow a And I wait until data/hello.txt is loaded Then the following tabs should be open: - """ + """ - data/hints/link_blank.html - data/hello.txt (active) - """ + """ ## :debug-log-capacity diff --git a/tests/end2end/features/yankpaste.feature b/tests/end2end/features/yankpaste.feature index 718c72c68..e0b371c44 100644 --- a/tests/end2end/features/yankpaste.feature +++ b/tests/end2end/features/yankpaste.feature @@ -63,23 +63,23 @@ Feature: Yanking and pasting. Then the message "Yanked URL to clipboard: http://localhost:(port)/data/title with spaces.html" should be shown And the clipboard should contain "http://localhost:(port)/data/title with spaces.html" - Scenario: Yanking URL that has = and & in its query string - When I open data/title.html?a=b&c=d - And I run :yank - Then the message "Yanked URL to clipboard: http://localhost:(port)/data/title.html?a=b&c=d" should be shown - And the clipboard should contain "http://localhost:(port)/data/title.html?a=b&c=d" + Scenario: Yanking URL that has = and & in its query string + When I open data/title.html?a=b&c=d + And I run :yank + Then the message "Yanked URL to clipboard: http://localhost:(port)/data/title.html?a=b&c=d" should be shown + And the clipboard should contain "http://localhost:(port)/data/title.html?a=b&c=d" - Scenario: Yanking URL that has = and ; in its query string - When I open data/title.html?a=b;c=d - And I run :yank - Then the message "Yanked URL to clipboard: http://localhost:(port)/data/title.html?a=b;c=d" should be shown - And the clipboard should contain "http://localhost:(port)/data/title.html?a=b;c=d" + Scenario: Yanking URL that has = and ; in its query string + When I open data/title.html?a=b;c=d + And I run :yank + Then the message "Yanked URL to clipboard: http://localhost:(port)/data/title.html?a=b;c=d" should be shown + And the clipboard should contain "http://localhost:(port)/data/title.html?a=b;c=d" - Scenario: Yanking URL with both & and ; in its query string - When I open data/title.html?a;b&c=d - And I run :yank - Then the message "Yanked URL to clipboard: http://localhost:(port)/data/title.html?a;b&c=d" should be shown - And the clipboard should contain "http://localhost:(port)/data/title.html?a;b&c=d" + Scenario: Yanking URL with both & and ; in its query string + When I open data/title.html?a;b&c=d + And I run :yank + Then the message "Yanked URL to clipboard: http://localhost:(port)/data/title.html?a;b&c=d" should be shown + And the clipboard should contain "http://localhost:(port)/data/title.html?a;b&c=d" Scenario: Yanking with --quiet When I open data/title.html