diff --git a/tests/end2end/features/urlmarks.feature b/tests/end2end/features/urlmarks.feature index bc97aa8df..e654309d8 100644 --- a/tests/end2end/features/urlmarks.feature +++ b/tests/end2end/features/urlmarks.feature @@ -92,38 +92,38 @@ Feature: quickmarks and bookmarks Then the error "Bookmark 'about:blank' not found!" should be shown Scenario: Deleting the current page's bookmark - When I open data/numbers/5.txt + When I open data/numbers/6.txt And I run :bookmark-add And I run :bookmark-del - Then the bookmark file should not contain "http://localhost:*/data/numbers/5.txt " + Then the bookmark file should not contain "http://localhost:*/data/numbers/6.txt " ## quickmarks Scenario: Saving a quickmark (:quickmark-add) - When I run :quickmark-add http://localhost:(port)/data/numbers/6.txt six - Then the quickmark file should contain "six http://localhost:*/data/numbers/6.txt" - - Scenario: Saving a quickmark (:quickmark-save) - When I open data/numbers/7.txt - And I run :quickmark-save - And I wait for "Entering mode KeyMode.prompt (reason: question asked)" in the log - And I press the keys "seven" - And I press the keys "" + When I run :quickmark-add http://localhost:(port)/data/numbers/7.txt seven Then the quickmark file should contain "seven http://localhost:*/data/numbers/7.txt" - Scenario: Saving a duplicate quickmark (without override) - When I run :quickmark-add http://localhost:(port)/data/numbers/8.txt eight - And I run :quickmark-add http://localhost:(port)/data/numbers/8_2.txt eight - And I wait for "Entering mode KeyMode.yesno (reason: question asked)" in the log - And I run :prompt-no + Scenario: Saving a quickmark (:quickmark-save) + When I open data/numbers/8.txt + And I run :quickmark-save + And I wait for "Entering mode KeyMode.prompt (reason: question asked)" in the log + And I press the keys "eight" + And I press the keys "" Then the quickmark file should contain "eight http://localhost:*/data/numbers/8.txt" - Scenario: Saving a duplicate quickmark (with override) + Scenario: Saving a duplicate quickmark (without override) When I run :quickmark-add http://localhost:(port)/data/numbers/9.txt nine And I run :quickmark-add http://localhost:(port)/data/numbers/9_2.txt nine And I wait for "Entering mode KeyMode.yesno (reason: question asked)" in the log + And I run :prompt-no + Then the quickmark file should contain "nine http://localhost:*/data/numbers/9.txt" + + Scenario: Saving a duplicate quickmark (with override) + When I run :quickmark-add http://localhost:(port)/data/numbers/10.txt ten + And I run :quickmark-add http://localhost:(port)/data/numbers/10_2.txt ten + And I wait for "Entering mode KeyMode.yesno (reason: question asked)" in the log And I run :prompt-yes - Then the quickmark file should contain "nine http://localhost:*/data/numbers/9_2.txt" + Then the quickmark file should contain "ten http://localhost:*/data/numbers/10_2.txt" Scenario: Adding a quickmark with an empty name When I run :quickmark-add about:blank "" @@ -135,38 +135,38 @@ Feature: quickmarks and bookmarks Scenario: Loading a quickmark Given I have a fresh instance - When I run :quickmark-add http://localhost:(port)/data/numbers/10.txt ten - And I run :quickmark-load ten - Then data/numbers/10.txt should be loaded + When I run :quickmark-add http://localhost:(port)/data/numbers/11.txt eleven + And I run :quickmark-load eleven + Then data/numbers/11.txt should be loaded And the following tabs should be open: - - data/numbers/10.txt (active) + - data/numbers/11.txt (active) Scenario: Loading a quickmark in a new tab Given I open about:blank When I run :tab-only - And I run :quickmark-add http://localhost:(port)/data/numbers/11.txt eleven - And I run :quickmark-load -t eleven - Then data/numbers/11.txt should be loaded + And I run :quickmark-add http://localhost:(port)/data/numbers/12.txt twelve + And I run :quickmark-load -t twelve + Then data/numbers/12.txt should be loaded And the following tabs should be open: - about:blank - - data/numbers/11.txt (active) + - data/numbers/12.txt (active) Scenario: Loading a quickmark in a background tab Given I open about:blank When I run :tab-only - And I run :quickmark-add http://localhost:(port)/data/numbers/12.txt twelve - And I run :quickmark-load -b twelve - Then data/numbers/12.txt should be loaded + And I run :quickmark-add http://localhost:(port)/data/numbers/13.txt thirteen + And I run :quickmark-load -b thirteen + Then data/numbers/13.txt should be loaded And the following tabs should be open: - about:blank (active) - - data/numbers/12.txt + - data/numbers/13.txt Scenario: Loading a quickmark in a new window Given I open about:blank When I run :tab-only - And I run :quickmark-add http://localhost:(port)/data/numbers/13.txt thirteen - And I run :quickmark-load -w thirteen - And I wait until data/numbers/13.txt is loaded + And I run :quickmark-add http://localhost:(port)/data/numbers/14.txt fourteen + And I run :quickmark-load -w fourteen + And I wait until data/numbers/14.txt is loaded Then the session should look like: windows: - tabs: @@ -178,15 +178,15 @@ Feature: quickmarks and bookmarks - active: true history: - active: true - url: http://localhost:*/data/numbers/13.txt + url: http://localhost:*/data/numbers/14.txt Scenario: Loading a quickmark which does not exist When I run :quickmark-load -b doesnotexist Then the error "Quickmark 'doesnotexist' does not exist!" should be shown Scenario: Loading a quickmark with -t and -b - When I run :quickmark-add http://localhost:(port)/data/numbers/14.txt fourteen - When I run :quickmark-load -t -b fourteen + When I run :quickmark-add http://localhost:(port)/data/numbers/15.txt fifteen + When I run :quickmark-load -t -b fifteen Then the error "Only one of -t/-b/-w can be given!" should be shown Scenario: Deleting a quickmark which does not exist @@ -194,9 +194,9 @@ Feature: quickmarks and bookmarks Then the error "Quickmark 'doesnotexist' not found!" should be shown Scenario: Deleting a quickmark - When I run :quickmark-add http://localhost:(port)/data/numbers/15.txt fifteen - And I run :quickmark-del fifteen - Then the quickmark file should not contain "fifteen http://localhost:*/data/numbers/15.txt " + When I run :quickmark-add http://localhost:(port)/data/numbers/16.txt sixteen + And I run :quickmark-del sixteen + Then the quickmark file should not contain "sixteen http://localhost:*/data/numbers/16.txt " Scenario: Deleting the current page's quickmark if it has none When I open about:blank @@ -204,7 +204,7 @@ Feature: quickmarks and bookmarks Then the error "Quickmark for 'about:blank' not found!" should be shown Scenario: Deleting the current page's quickmark - When I open data/numbers/7.txt - And I run :quickmark-add http://localhost:(port)/data/numbers/7.txt seven + When I open data/numbers/1.txt + And I run :quickmark-add http://localhost:(port)/data/numbers/1.txt seventeen And I run :quickmark-del - Then the quickmark file should not contain "seven http://localhost:*/data/numbers/7.txt" + Then the quickmark file should not contain "seventeen http://localhost:*/data/numbers/1.txt"