Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / api / details / params.feature

diff --git a/test/bdd/api/details/params.feature b/test/bdd/api/details/params.feature
index 3c9286ed285acedc3c2c847a04db89a0662889bf..87c3356c8a34d01b43c2d7f25c24647721b84b72 100644 (file)
--- a/test/bdd/api/details/params.feature
+++ b/test/bdd/api/details/params.feature
@@ -3,20 +3,21 @@ Feature: Object details
     Testing different parameter options for details API.
 
     Scenario: JSON Details
-        When sending json details query for W78099902
+        When sending json details query for W297699560
         Then the result is valid json
         And result has attributes geometry
         And result has not attributes keywords,address,linked_places,parentof
 
-    Scenario: JSON Details with keywords
-        When sending json details query for W78099902
-            | keywords |
-            | 1 |
+    Scenario: JSON Details with pretty printing
+        When sending json details query for W297699560
+            | pretty |
+            | 1      |
         Then the result is valid json
-        And result has attributes keywords
+        And result has attributes geometry
+        And result has not attributes keywords,address,linked_places,parentof
 
-    Scenario: JSON Details with addressdetails
-        When sending json details query for W78099902
+     Scenario: JSON Details with addressdetails
+        When sending json details query for W297699560
             | addressdetails |
             | 1 |
         Then the result is valid json
@@ -30,27 +31,52 @@ Feature: Object details
         And result has attributes linked_places
 
     Scenario: JSON Details with hierarchy
-        When sending json details query for W78099902
+        When sending json details query for W297699560
             | hierarchy |
             | 1 |
         Then the result is valid json
         And result has attributes hierarchy
 
-    Scenario: JSON Details with linkedplaces
-        When sending json details query for R123924
-            | linkedplaces |
+    Scenario: JSON Details with grouped hierarchy
+        When sending json details query for W297699560
+            | hierarchy | group_hierarchy |
+            | 1         | 1 |
+        Then the result is valid json
+        And result has attributes hierarchy
+
+     Scenario Outline: JSON Details with keywords
+        When sending json details query for <osmid>
+            | keywords |
             | 1 |
         Then the result is valid json
+        And result has attributes keywords
+
+    Examples:
+            | osmid |
+            | W297699560 |
+            | W243055645 |
+            | W243055716 |
+            | W43327921  |
 
-    Scenario Outline: HTML Details with keywords
-        When sending html details query for <osmid>
+    # ticket #1343
+    Scenario: Details of a country with keywords
+        When sending details query for R1155955
             | keywords |
             | 1 |
-        Then the result is valid html
+        Then the result is valid json
+
+    Scenario Outline: JSON details with full geometry
+        When sending json details query for <osmid>
+            | polygon_geojson |
+            | 1 |
+        Then the result is valid json
+        And result has attributes geometry
 
     Examples:
             | osmid |
-            | W78099902 |
-            | N3121929846 |
+            | W297699560 |
+            | W243055645 |
+            | W243055716 |
+            | W43327921  |