From 99ab41d2cbf10c570a0e164a9c269c104802fedf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Abdelkader=20Mart=C3=ADnez=20P=C3=A9rez?= Date: Tue, 3 Sep 2019 09:10:46 +0200 Subject: [PATCH] Change URL examples by metasyntactic variable names (RFC3092) --- .../features/control/append/success.feature | 12 ++++---- .../control/delete/list_order.feature | 26 ++++++++--------- .../features/control/delete/success.feature | 4 +-- .../test/features/control/get/success.feature | 6 ++-- .../control/insert/list_order.feature | 28 +++++++++---------- .../features/control/insert/success.feature | 12 ++++---- .../features/control/list/success.feature | 8 +++--- .../handler/error_invalidresource.feature | 4 +-- .../data/handler/error_itemnotfound.feature | 4 +-- .../features/data/handler/success.feature | 10 +++---- .../features/data/request/success.feature | 6 ++-- .../features/data/response/success.feature | 8 +++--- 12 files changed, 64 insertions(+), 64 deletions(-) diff --git a/spec/test/features/control/append/success.feature b/spec/test/features/control/append/success.feature index 19da9a6..46e11b4 100644 --- a/spec/test/features/control/append/success.feature +++ b/spec/test/features/control/append/success.feature @@ -12,7 +12,7 @@ Feature: Append new routes in Kapow! server. """ { "method": "GET", - "url_pattern": "/listRootDir", + "url_pattern": "/foo", "entrypoint": "/bin/sh -c", "command": "ls -la / | response /body" } @@ -23,7 +23,7 @@ Feature: Append new routes in Kapow! server. """ { "method": "GET", - "url_pattern": "/listRootDir", + "url_pattern": "/foo", "entrypoint": "/bin/sh -c", "command": "ls -la / | response /body", "index": 0, @@ -37,13 +37,13 @@ Feature: Append new routes in Kapow! server. Given I have a Kapow! server with the following routes: | method | url_pattern | entrypoint | command | - | GET | /listRootDir | /bin/sh -c | ls -la / \| response /body | - | GET | /listDir/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | + | GET | /foo | /bin/sh -c | ls -la / \| response /body | + | GET | /qux/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | When I append the route: """ { "method": "GET", - "url_pattern": "/listEtcDir", + "url_pattern": "/baz", "entrypoint": "/bin/sh -c", "command": "ls -la /etc | response /body" } @@ -54,7 +54,7 @@ Feature: Append new routes in Kapow! server. """ { "method": "GET", - "url_pattern": "/listEtcDir", + "url_pattern": "/baz", "entrypoint": "/bin/sh -c", "command": "ls -la /etc | response /body", "index": 2, diff --git a/spec/test/features/control/delete/list_order.feature b/spec/test/features/control/delete/list_order.feature index b093401..8a4a69f 100644 --- a/spec/test/features/control/delete/list_order.feature +++ b/spec/test/features/control/delete/list_order.feature @@ -5,10 +5,10 @@ Feature: Consistent route order after a route deletion in Kapow! server. Background: Given I have a Kapow! server with the following routes: | method | url_pattern | entrypoint | command | - | GET | /listRootDir | /bin/sh -c | ls -la / \| response /body | - | GET | /listVarDir | /bin/sh -c | ls -la /var \| response /body | - | GET | /listEtcDir | /bin/sh -c | ls -la /etc \| response /body | - | GET | /listDir/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | + | GET | /foo | /bin/sh -c | ls -la / \| response /body | + | GET | /bar | /bin/sh -c | ls -la /var \| response /body | + | GET | /baz | /bin/sh -c | ls -la /etc \| response /body | + | GET | /qux/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | Scenario: Removing the first route. After removing the first route the remaining ones @@ -22,7 +22,7 @@ Feature: Consistent route order after a route deletion in Kapow! server. [ { "method": "GET", - "url_pattern": "/listVarDir", + "url_pattern": "/bar", "entrypoint": "/bin/sh -c", "command": "ls -la /var | response /body", "index": 0, @@ -30,7 +30,7 @@ Feature: Consistent route order after a route deletion in Kapow! server. }, { "method": "GET", - "url_pattern": "/listEtcDir", + "url_pattern": "/baz", "entrypoint": "/bin/sh -c", "command": "ls -la /etc | response /body", "index": 1, @@ -38,7 +38,7 @@ Feature: Consistent route order after a route deletion in Kapow! server. }, { "method": "GET", - "url_pattern": "/listDir/{dirname}", + "url_pattern": "/qux/{dirname}", "entrypoint": "/bin/sh -c", "command": "ls -la /request/params/dirname | response /body", "index": 2, @@ -58,7 +58,7 @@ Feature: Consistent route order after a route deletion in Kapow! server. [ { "method": "GET", - "url_pattern": "/listRootDir", + "url_pattern": "/foo", "entrypoint": "/bin/sh -c", "command": "ls -la / | response /body", "index": 0, @@ -66,7 +66,7 @@ Feature: Consistent route order after a route deletion in Kapow! server. }, { "method": "GET", - "url_pattern": "/listVarDir", + "url_pattern": "/bar", "entrypoint": "/bin/sh -c", "command": "ls -la /var | response /body", "index": 1, @@ -74,7 +74,7 @@ Feature: Consistent route order after a route deletion in Kapow! server. }, { "method": "GET", - "url_pattern": "/listEtcDir", + "url_pattern": "/baz", "entrypoint": "/bin/sh -c", "command": "ls -la /etc | response /body", "index": 2, @@ -95,7 +95,7 @@ Feature: Consistent route order after a route deletion in Kapow! server. [ { "method": "GET", - "url_pattern": "/listRootDir", + "url_pattern": "/foo", "entrypoint": "/bin/sh -c", "command": "ls -la / | response /body", "index": 0, @@ -103,7 +103,7 @@ Feature: Consistent route order after a route deletion in Kapow! server. }, { "method": "GET", - "url_pattern": "/listEtcDir", + "url_pattern": "/baz", "entrypoint": "/bin/sh -c", "command": "ls -la /etc | response /body", "index": 1, @@ -111,7 +111,7 @@ Feature: Consistent route order after a route deletion in Kapow! server. }, { "method": "GET", - "url_pattern": "/listDir/{dirname}", + "url_pattern": "/qux/{dirname}", "entrypoint": "/bin/sh -c", "command": "ls -la /request/params/dirname | response /body", "index": 2, diff --git a/spec/test/features/control/delete/success.feature b/spec/test/features/control/delete/success.feature index b89147b..8c9621b 100644 --- a/spec/test/features/control/delete/success.feature +++ b/spec/test/features/control/delete/success.feature @@ -7,8 +7,8 @@ Feature: Delete routes in Kapow! server. Given I have a Kapow! server with the following routes: | method | url_pattern | entrypoint | command | - | GET | /listRootDir | /bin/sh -c | ls -la / \| response /body | - | GET | /listDir/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | + | GET | /foo | /bin/sh -c | ls -la / \| response /body | + | GET | /qux/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | When I delete the first route Then I get 204 as response code And I get "No Content" as response reason phrase diff --git a/spec/test/features/control/get/success.feature b/spec/test/features/control/get/success.feature index 0e3ebe2..94d1d01 100644 --- a/spec/test/features/control/get/success.feature +++ b/spec/test/features/control/get/success.feature @@ -7,8 +7,8 @@ Feature: Retrieve route details in Kapow! server. Given I have a Kapow! server with the following routes: | method | url_pattern | entrypoint | command | - | GET | /listRootDir | /bin/sh -c | ls -la / \| response /body | - | GET | /listDir/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | + | GET | /foo | /bin/sh -c | ls -la / \| response /body | + | GET | /qux/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | When I get the first route Then I get 200 as response code And I get "OK" as response reason phrase @@ -16,7 +16,7 @@ Feature: Retrieve route details in Kapow! server. """ { "method": "GET", - "url_pattern": "/listRootDir", + "url_pattern": "/foo", "entrypoint": "/bin/sh -c", "command": "ls -la / | response /body", "index": 0, diff --git a/spec/test/features/control/insert/list_order.feature b/spec/test/features/control/insert/list_order.feature index e16218b..466b28e 100644 --- a/spec/test/features/control/insert/list_order.feature +++ b/spec/test/features/control/insert/list_order.feature @@ -5,8 +5,8 @@ Feature: Consistent route ordering after inserting a route in a Kapow! server. Background: Given I have a Kapow! server with the following routes: | method | url_pattern | entrypoint | command | - | GET | /listRootDir | /bin/sh -c | ls -la / \| response /body | - | GET | /listDir/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | + | GET | /foo | /bin/sh -c | ls -la / \| response /body | + | GET | /qux/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | Scenario: Inserting before the first route. After inserting before the first route the previous set @@ -17,7 +17,7 @@ Feature: Consistent route ordering after inserting a route in a Kapow! server. """ { "method": "GET", - "url_pattern": "/listVarDir", + "url_pattern": "/bar", "entrypoint": "/bin/sh -c", "command": "ls -la /var | response /body", "index": 0 @@ -29,7 +29,7 @@ Feature: Consistent route ordering after inserting a route in a Kapow! server. [ { "method": "GET", - "url_pattern": "/listVarDir", + "url_pattern": "/bar", "entrypoint": "/bin/sh -c", "command": "ls -la /var | response /body", "index": 0, @@ -37,7 +37,7 @@ Feature: Consistent route ordering after inserting a route in a Kapow! server. }, { "method": "GET", - "url_pattern": "/listRootDir", + "url_pattern": "/foo", "entrypoint": "/bin/sh -c", "command": "ls -la / | response /body", "index": 1, @@ -45,7 +45,7 @@ Feature: Consistent route ordering after inserting a route in a Kapow! server. }, { "method": "GET", - "url_pattern": "/listDir/{dirname}", + "url_pattern": "/qux/{dirname}", "entrypoint": "/bin/sh -c", "command": "ls -la /request/params/dirname | response /body", "index": 2, @@ -62,7 +62,7 @@ Feature: Consistent route ordering after inserting a route in a Kapow! server. """ { "method": "GET", - "url_pattern": "/listVarDir", + "url_pattern": "/bar", "entrypoint": "/bin/sh -c", "command": "ls -la /var | response /body", "index": 2 @@ -74,7 +74,7 @@ Feature: Consistent route ordering after inserting a route in a Kapow! server. [ { "method": "GET", - "url_pattern": "/listRootDir", + "url_pattern": "/foo", "entrypoint": "/bin/sh -c", "command": "ls -la / | response /body", "index": 0, @@ -82,7 +82,7 @@ Feature: Consistent route ordering after inserting a route in a Kapow! server. }, { "method": "GET", - "url_pattern": "/listDir/{dirname}", + "url_pattern": "/qux/{dirname}", "entrypoint": "/bin/sh -c", "command": "ls -la /request/params/dirname | response /body", "index": 1, @@ -90,7 +90,7 @@ Feature: Consistent route ordering after inserting a route in a Kapow! server. }, { "method": "GET", - "url_pattern": "/listVarDir", + "url_pattern": "/bar", "entrypoint": "/bin/sh -c", "command": "ls -la /var | response /body", "index": 2, @@ -108,7 +108,7 @@ Feature: Consistent route ordering after inserting a route in a Kapow! server. """ { "method": "GET", - "url_pattern": "/listVarDir", + "url_pattern": "/bar", "entrypoint": "/bin/sh -c", "command": "ls -la /var | response /body", "index": 1 @@ -120,7 +120,7 @@ Feature: Consistent route ordering after inserting a route in a Kapow! server. [ { "method": "GET", - "url_pattern": "/listRootDir", + "url_pattern": "/foo", "entrypoint": "/bin/sh -c", "command": "ls -la / | response /body", "index": 0, @@ -128,7 +128,7 @@ Feature: Consistent route ordering after inserting a route in a Kapow! server. }, { "method": "GET", - "url_pattern": "/listVarDir", + "url_pattern": "/bar", "entrypoint": "/bin/sh -c", "command": "ls -la /var | response /body", "index": 1, @@ -136,7 +136,7 @@ Feature: Consistent route ordering after inserting a route in a Kapow! server. }, { "method": "GET", - "url_pattern": "/listDir/{dirname}", + "url_pattern": "/qux/{dirname}", "entrypoint": "/bin/sh -c", "command": "ls -la /request/params/dirname | response /body", "index": 2, diff --git a/spec/test/features/control/insert/success.feature b/spec/test/features/control/insert/success.feature index ff22fef..79daba8 100644 --- a/spec/test/features/control/insert/success.feature +++ b/spec/test/features/control/insert/success.feature @@ -6,8 +6,8 @@ Feature: Insert new routes in Kapow! server. Background: Given I have a Kapow! server with the following routes: | method | url_pattern | entrypoint | command | - | GET | /listRootDir | /bin/sh -c | ls -la / \| response /body | - | GET | /listDir/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | + | GET | /foo | /bin/sh -c | ls -la / \| response /body | + | GET | /qux/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | Scenario: Insert a route at the beginning. A route can be inserted at the beginning of the list @@ -17,7 +17,7 @@ Feature: Insert new routes in Kapow! server. """ { "method": "GET", - "url_pattern": "/listVarDir", + "url_pattern": "/bar", "entrypoint": "/bin/sh -c", "command": "ls -la /var | response /body", "index": 0 @@ -29,7 +29,7 @@ Feature: Insert new routes in Kapow! server. """ { "method": "GET", - "url_pattern": "/listVarDir", + "url_pattern": "/bar", "entrypoint": "/bin/sh -c", "command": "ls -la /var | response /body", "index": 0, @@ -46,7 +46,7 @@ Feature: Insert new routes in Kapow! server. """ { "method": "GET", - "url_pattern": "/listVarDir", + "url_pattern": "/bar", "entrypoint": "/bin/sh -c", "command": "ls -la /var | response /body", "index": 1 @@ -58,7 +58,7 @@ Feature: Insert new routes in Kapow! server. """ { "method": "GET", - "url_pattern": "/listVarDir", + "url_pattern": "/bar", "entrypoint": "/bin/sh -c", "command": "ls -la /var | response /body", "index": 1, diff --git a/spec/test/features/control/list/success.feature b/spec/test/features/control/list/success.feature index 6a52c6f..6c4a85b 100644 --- a/spec/test/features/control/list/success.feature +++ b/spec/test/features/control/list/success.feature @@ -22,8 +22,8 @@ Feature: Listing routes in a Kapow! server. Given I have a Kapow! server with the following routes: | method | url_pattern | entrypoint | command | - | GET | /listRootDir | /bin/sh -c | ls -la / \| response /body | - | GET | /listDir/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | + | GET | /foo | /bin/sh -c | ls -la / \| response /body | + | GET | /qux/{dirname} | /bin/sh -c | ls -la /request/params/dirname \| response /body | When I request a routes listing Then I get 200 as response code And I get "OK" as response reason phrase @@ -32,7 +32,7 @@ Feature: Listing routes in a Kapow! server. [ { "method": "GET", - "url_pattern": "/listRootDir", + "url_pattern": "/foo", "entrypoint": "/bin/sh -c", "command": "ls -la / | response /body", "index": 0, @@ -40,7 +40,7 @@ Feature: Listing routes in a Kapow! server. }, { "method": "GET", - "url_pattern": "/listDir/{dirname}", + "url_pattern": "/qux/{dirname}", "entrypoint": "/bin/sh -c", "command": "ls -la /request/params/dirname | response /body", "index": 1, diff --git a/spec/test/features/data/handler/error_invalidresource.feature b/spec/test/features/data/handler/error_invalidresource.feature index 55e6792..0891dc6 100644 --- a/spec/test/features/data/handler/error_invalidresource.feature +++ b/spec/test/features/data/handler/error_invalidresource.feature @@ -8,8 +8,8 @@ Feature: Fail to retrieve an invalid resource for a handler in Kapow! server. Given I have a Kapow! server with the following testing routes: | method | url_pattern | - | GET | /listRootDir | - When I send a request to the testing route "/listRootDir" + | GET | /foo | + When I send a request to the testing route "/foo" And I get the resource "/invented/path" Then I get 400 as response code And I get "Invalid Resource Path" as response reason phrase diff --git a/spec/test/features/data/handler/error_itemnotfound.feature b/spec/test/features/data/handler/error_itemnotfound.feature index 535ed11..d1505d6 100644 --- a/spec/test/features/data/handler/error_itemnotfound.feature +++ b/spec/test/features/data/handler/error_itemnotfound.feature @@ -9,8 +9,8 @@ Feature: Fail to retrieve nonexistent resource items in Kapow! server. Given I have a Kapow! server with the following testing routes: | method | url_pattern | - | GET | /listRootDir | - When I send a request to the testing route "/listRootDir" + | GET | /foo | + When I send a request to the testing route "/foo" And I get the resource "/request/params/meloinvento" Then I get 204 as response code And I get "Resource Item Not Found" as response reason phrase diff --git a/spec/test/features/data/handler/success.feature b/spec/test/features/data/handler/success.feature index aa12587..a680bbb 100644 --- a/spec/test/features/data/handler/success.feature +++ b/spec/test/features/data/handler/success.feature @@ -9,14 +9,14 @@ Feature: Retrieve a resource from a handler in Kapow! server. Given I have a Kapow! server with the following testing routes: | method | url_pattern | - | GET | /listRootDir | - When I send a request to the testing route "/listRootDir" + | GET | /foo | + When I send a request to the testing route "/foo" And I get the resource "/request/path" Then I get 200 as response code And I get "OK" as response reason phrase And I get the following response raw body: """ - /listRootDir + /foo """ Scenario: Retrieve a resource item. @@ -25,8 +25,8 @@ Feature: Retrieve a resource from a handler in Kapow! server. Given I have a Kapow! server with the following testing routes: | method | url_pattern | - | GET | /listRootDir | - When I send a request to the testing route "/listRootDir" + | GET | /foo | + When I send a request to the testing route "/foo" And I get the resource "/request/headers/Host" Then I get 200 as response code And I get "OK" as response reason phrase diff --git a/spec/test/features/data/request/success.feature b/spec/test/features/data/request/success.feature index 1e60e60..7b14700 100644 --- a/spec/test/features/data/request/success.feature +++ b/spec/test/features/data/request/success.feature @@ -10,8 +10,8 @@ Feature: Retrieve request resources from a handler in Kapow! server. Given I have a Kapow! server with the following testing routes: | method | url_pattern | - | GET | /listRootDir/{path} | - When I send a request to the testing route "/listRootDir/matchVal1" adding: + | GET | /foo/{path} | + When I send a request to the testing route "/foo/matchVal1" adding: | fieldType | name | value | | parameter | par1 | paramVal1 | | header | head1 | headVal1 | @@ -28,7 +28,7 @@ Feature: Retrieve request resources from a handler in Kapow! server. Examples: | resourcePath | value | | /request/method | GET | - | /request/path | /listRootDir/matchVal1 | + | /request/path | /foo/matchVal1 | | /request/host | localhost:8080 | | /request/matches/path | matchVal1 | | /request/params/par1 | paramVal1 | diff --git a/spec/test/features/data/response/success.feature b/spec/test/features/data/response/success.feature index 8031781..afb623d 100644 --- a/spec/test/features/data/response/success.feature +++ b/spec/test/features/data/response/success.feature @@ -9,8 +9,8 @@ Feature: Setting values for handler response resources in Kapow! server. Given I have a Kapow! server with the following testing routes: | method | url_pattern | - | GET | /listRootDir | - When I send a request to the testing route "/listRootDir" + | GET | /foo | + When I send a request to the testing route "/foo" And I set the resource "/response/status" with value "418" And I release the testing request Then I get 418 as response code in the testing request @@ -21,8 +21,8 @@ Feature: Setting values for handler response resources in Kapow! server. Given I have a Kapow! server with the following testing routes: | method | url_pattern | - | GET | /listRootDir | - When I send a request to the testing route "/listRootDir" + | GET | /foo | + When I send a request to the testing route "/foo" And I set the resource "" with value "" And I release the testing request Then I get 200 as response code