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 3bb5bf7cbbb987de7492eba341063fff4f629cf4..0fb641712446a268a6a877239c83fcd6bc2c1db9 100644 (file)
--- a/test/bdd/api/details/params.feature
+++ b/test/bdd/api/details/params.feature
@@ -2,15 +2,17 @@
 Feature: Object details
     Testing different parameter options for details API.
 
 Feature: Object details
     Testing different parameter options for details API.
 

+    @SQLITE

     Scenario: JSON Details
         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
         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

-        And results contain
-            | geometry+type |
-            | Point         |
+        And results contain in field geometry
+            | type  |
+            | Point |

 
 

+    @SQLITE

     Scenario: JSON Details with pretty printing
         When sending json details query for W297699560
             | pretty |
     Scenario: JSON Details with pretty printing
         When sending json details query for W297699560
             | pretty |


@@ -19,6 +21,7 @@ Feature: Object details
         And result has attributes geometry
         And result has not attributes keywords,address,linked_places,parentof
 
         And result has attributes geometry
         And result has not attributes keywords,address,linked_places,parentof
 

+    @SQLITE

      Scenario: JSON Details with addressdetails
         When sending json details query for W297699560
             | addressdetails |
      Scenario: JSON Details with addressdetails
         When sending json details query for W297699560
             | addressdetails |


@@ -26,6 +29,7 @@ Feature: Object details
         Then the result is valid json
         And result has attributes address
 
         Then the result is valid json
         And result has attributes address
 

+    @SQLITE

     Scenario: JSON Details with linkedplaces
         When sending json details query for R123924
             | linkedplaces |
     Scenario: JSON Details with linkedplaces
         When sending json details query for R123924
             | linkedplaces |


@@ -33,6 +37,7 @@ Feature: Object details
         Then the result is valid json
         And result has attributes linked_places
 
         Then the result is valid json
         And result has attributes linked_places
 

+    @SQLITE

     Scenario: JSON Details with hierarchy
         When sending json details query for W297699560
             | hierarchy |
     Scenario: JSON Details with hierarchy
         When sending json details query for W297699560
             | hierarchy |


@@ -40,6 +45,7 @@ Feature: Object details
         Then the result is valid json
         And result has attributes hierarchy
 
         Then the result is valid json
         And result has attributes hierarchy
 

+    @SQLITE

     Scenario: JSON Details with grouped hierarchy
         When sending json details query for W297699560
             | hierarchy | group_hierarchy |
     Scenario: JSON Details with grouped hierarchy
         When sending json details query for W297699560
             | hierarchy | group_hierarchy |


@@ -69,15 +75,16 @@ Feature: Object details
         Then the result is valid json
         And result has attributes keywords
 
         Then the result is valid json
         And result has attributes keywords
 

+    @SQLITE

     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
     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

-        And results contain
-            | geometry+type |
-            | <geometry>    |
+        And results contain in field geometry
+            | type       |
+            | <geometry> |

 
     Examples:
             | osmid      | geometry   |
 
     Examples:
             | osmid      | geometry   |