From 816d62bca5d4bc7ba8e85f84f4ca3ef9a67ffff7 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 25 Nov 2015 18:02:14 +0100 Subject: [PATCH] bdd: Reorganize numbered test files. --- .../data/{navigate => numbers}/1.txt | 0 .../data/{navigate => numbers}/2.txt | 0 .../data/{navigate => numbers}/3.txt | 0 .../data/{navigate => numbers}/4.txt | 0 .../integration/data/{open => numbers}/5.txt | 0 .../integration/data/{open => numbers}/6.txt | 0 .../integration/data/{open => numbers}/7.txt | 0 tests/integration/data/open/1.txt | 1 - tests/integration/data/open/2.txt | 1 - tests/integration/data/open/3.txt | 1 - tests/integration/data/open/4.txt | 1 - tests/integration/features/navigate.feature | 14 +++---- tests/integration/features/open.feature | 38 +++++++++---------- 13 files changed, 26 insertions(+), 30 deletions(-) rename tests/integration/data/{navigate => numbers}/1.txt (100%) rename tests/integration/data/{navigate => numbers}/2.txt (100%) rename tests/integration/data/{navigate => numbers}/3.txt (100%) rename tests/integration/data/{navigate => numbers}/4.txt (100%) rename tests/integration/data/{open => numbers}/5.txt (100%) rename tests/integration/data/{open => numbers}/6.txt (100%) rename tests/integration/data/{open => numbers}/7.txt (100%) delete mode 100644 tests/integration/data/open/1.txt delete mode 100644 tests/integration/data/open/2.txt delete mode 100644 tests/integration/data/open/3.txt delete mode 100644 tests/integration/data/open/4.txt diff --git a/tests/integration/data/navigate/1.txt b/tests/integration/data/numbers/1.txt similarity index 100% rename from tests/integration/data/navigate/1.txt rename to tests/integration/data/numbers/1.txt diff --git a/tests/integration/data/navigate/2.txt b/tests/integration/data/numbers/2.txt similarity index 100% rename from tests/integration/data/navigate/2.txt rename to tests/integration/data/numbers/2.txt diff --git a/tests/integration/data/navigate/3.txt b/tests/integration/data/numbers/3.txt similarity index 100% rename from tests/integration/data/navigate/3.txt rename to tests/integration/data/numbers/3.txt diff --git a/tests/integration/data/navigate/4.txt b/tests/integration/data/numbers/4.txt similarity index 100% rename from tests/integration/data/navigate/4.txt rename to tests/integration/data/numbers/4.txt diff --git a/tests/integration/data/open/5.txt b/tests/integration/data/numbers/5.txt similarity index 100% rename from tests/integration/data/open/5.txt rename to tests/integration/data/numbers/5.txt diff --git a/tests/integration/data/open/6.txt b/tests/integration/data/numbers/6.txt similarity index 100% rename from tests/integration/data/open/6.txt rename to tests/integration/data/numbers/6.txt diff --git a/tests/integration/data/open/7.txt b/tests/integration/data/numbers/7.txt similarity index 100% rename from tests/integration/data/open/7.txt rename to tests/integration/data/numbers/7.txt diff --git a/tests/integration/data/open/1.txt b/tests/integration/data/open/1.txt deleted file mode 100644 index 5626abf0f..000000000 --- a/tests/integration/data/open/1.txt +++ /dev/null @@ -1 +0,0 @@ -one diff --git a/tests/integration/data/open/2.txt b/tests/integration/data/open/2.txt deleted file mode 100644 index f719efd43..000000000 --- a/tests/integration/data/open/2.txt +++ /dev/null @@ -1 +0,0 @@ -two diff --git a/tests/integration/data/open/3.txt b/tests/integration/data/open/3.txt deleted file mode 100644 index 2bdf67abb..000000000 --- a/tests/integration/data/open/3.txt +++ /dev/null @@ -1 +0,0 @@ -three diff --git a/tests/integration/data/open/4.txt b/tests/integration/data/open/4.txt deleted file mode 100644 index 851066514..000000000 --- a/tests/integration/data/open/4.txt +++ /dev/null @@ -1 +0,0 @@ -four diff --git a/tests/integration/features/navigate.feature b/tests/integration/features/navigate.feature index e6c2e8db4..8dee5c342 100644 --- a/tests/integration/features/navigate.feature +++ b/tests/integration/features/navigate.feature @@ -29,26 +29,26 @@ Feature: Using :navigate Then data/navigate/next.html should be loaded Scenario: Navigating to previous page without links - When I open data/navigate/1.txt + When I open data/numbers/1.txt And I run :navigate prev Then the error "No prev links found!" should be shown. Scenario: Navigating to next page without links - When I open data/navigate/1.txt + When I open data/numbers/1.txt And I run :navigate next Then the error "No forward links found!" should be shown. # increment/decrement Scenario: Incrementing number in URL - When I open data/navigate/1.txt + When I open data/numbers/1.txt And I run :navigate increment - Then data/navigate/2.txt should be loaded + Then data/numbers/2.txt should be loaded Scenario: Decrementing number in URL - When I open data/navigate/4.txt + When I open data/numbers/4.txt And I run :navigate decrement - Then data/navigate/3.txt should be loaded + Then data/numbers/3.txt should be loaded Scenario: Decrementing with no number in URL When I open data/navigate @@ -62,6 +62,6 @@ Feature: Using :navigate Scenario: Setting url-incdec-segments When I set general -> url-incdec-segments to anchor - And I open data/navigate/1.txt + And I open data/numbers/1.txt And I run :navigate increment Then the error "No number found in URL!" should be shown. diff --git a/tests/integration/features/open.feature b/tests/integration/features/open.feature index 1aca37b3b..379f1960e 100644 --- a/tests/integration/features/open.feature +++ b/tests/integration/features/open.feature @@ -2,8 +2,8 @@ Feature: Opening pages Scenario: :open with URL Given I open about:blank - When I run :open http://localhost:(port)/data/open/1.txt - And I wait until data/open/1.txt is loaded + When I run :open http://localhost:(port)/data/numbers/1.txt + And I wait until data/numbers/1.txt is loaded And I run :tab-only Then the session should look like: windows: @@ -12,16 +12,16 @@ Feature: Opening pages history: - url: about:blank - active: true - url: http://localhost:*/data/open/1.txt + url: http://localhost:*/data/numbers/1.txt Scenario: :open without URL and no -t/-b/-w When I run :open Then the error "No URL given, but -t/-b/-w is not set!" should be shown. Scenario: :open without URL and -t - When I set general -> default-page to http://localhost:(port)/data/open/2.txt + When I set general -> default-page to http://localhost:(port)/data/numbers/2.txt And I run :open -t - Then data/open/2.txt should be loaded + Then data/numbers/2.txt should be loaded Scenario: :open with invalid URL When I set general -> auto-search to false @@ -34,15 +34,15 @@ Feature: Opening pages Scenario: Searching with :open When I set general -> auto-search to naive - And I set searchengines -> DEFAULT to http://localhost:(port)/data/open/{}.txt + And I set searchengines -> DEFAULT to http://localhost:(port)/data/numbers/{}.txt And I run :open 3 - Then data/open/3.txt should be loaded + Then data/numbers/3.txt should be loaded Scenario: Opening in a new tab Given I open about:blank When I run :tab-only - And I run :open -t http://localhost:(port)/data/open/4.txt - And I wait until data/open/4.txt is loaded + And I run :open -t http://localhost:(port)/data/numbers/4.txt + And I wait until data/numbers/4.txt is loaded Then the session should look like: windows: - tabs: @@ -51,13 +51,13 @@ Feature: Opening pages - active: true history: - active: true - url: http://localhost:*/data/open/4.txt + url: http://localhost:*/data/numbers/4.txt Scenario: Opening in a new background tab Given I open about:blank When I run :tab-only - And I run :open -b http://localhost:(port)/data/open/5.txt - And I wait until data/open/5.txt is loaded + And I run :open -b http://localhost:(port)/data/numbers/5.txt + And I wait until data/numbers/5.txt is loaded Then the session should look like: windows: - tabs: @@ -67,14 +67,14 @@ Feature: Opening pages url: about:blank - history: - active: true - url: http://localhost:*/data/open/5.txt + url: http://localhost:*/data/numbers/5.txt Scenario: :open with count Given I open about:blank When I run :tab-only And I open about:blank in a new tab - And I run :open http://localhost:(port)/data/open/6.txt with count 2 - And I wait until data/open/6.txt is loaded + And I run :open http://localhost:(port)/data/numbers/6.txt with count 2 + And I wait until data/numbers/6.txt is loaded Then the session should look like: windows: - tabs: @@ -84,13 +84,13 @@ Feature: Opening pages history: - url: about:blank - active: true - url: http://localhost:*/data/open/6.txt + url: http://localhost:*/data/numbers/6.txt Scenario: Opening in a new window Given I open about:blank When I run :tab-only - And I run :open -w http://localhost:(port)/data/open/7.txt - And I wait until data/open/7.txt is loaded + And I run :open -w http://localhost:(port)/data/numbers/7.txt + And I wait until data/numbers/7.txt is loaded Then the session should look like: windows: - tabs: @@ -102,4 +102,4 @@ Feature: Opening pages - active: true history: - active: true - url: http://localhost:*/data/open/7.txt + url: http://localhost:*/data/numbers/7.txt