Merge pull request #2185 from lonvia/fix-deadlock-handling-for-psycopg27

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

diff --git a/test/bdd/api/details/simple.feature b/test/bdd/api/details/simple.feature
index 906c4ce5e9f0e6e1b69be6c365205e57ea7f6a21..c38018bcea4506874da8852ded6ae4566a2283f1 100644 (file)
--- a/test/bdd/api/details/simple.feature
+++ b/test/bdd/api/details/simple.feature
@@ -2,36 +2,54 @@
 Feature: Object details
     Check details page for correctness
 
 Feature: Object details
     Check details page for correctness
 

+    Scenario: Details by place ID
+        When sending details query for 107077
+        Then the result is valid json
+        And results contain
+            | place_id |
+            | 107077   |
+

     Scenario Outline: Details via OSM id
     Scenario Outline: Details via OSM id

-        When sending <format> details query for <object>
-        Then the result is valid <format>
+        When sending details query for <type><id>
+        Then the result is valid json
+        And results contain
+            | osm_type | osm_id |
+            | <type>   | <id> |

 
     Examples:
 
     Examples:

-     | format | object |
-     | json | 107077 |
-     | json | N5484325405 |
-     | json | W43327921 |
-     | json | R123924 |
+     | type | id |
+     | N    | 5484325405 |
+     | W    | 43327921 |
+     | R    | 123924 |
+
+     Scenario: Details for interpolation way just return the dependent street
+        When sending details query for W1
+        Then the result is valid json
+        And results contain
+            | category |
+            | highway |
+
+    Scenario Outline: Details for different class types for the same OSM id
+        When sending details query for N300209696:<class>
+        Then the result is valid json
+        And results contain
+          | osm_type | osm_id    | category |
+          | N        | 300209696 | <class> |
+
+    Examples:
+     | class |
+     | tourism |
+     | natural |
+     | mountain_pass |

 
     Scenario Outline: Details via unknown OSM id
 
     Scenario Outline: Details via unknown OSM id

-        When sending <format> details query for <object>
-        Then a HTTP 400 is returned
+        When sending details query for <object>
+        Then a HTTP 404 is returned

 
     Examples:
 
     Examples:

-      | format | object |
-      | json | 1 |
-      | json | R1 |
-
-    Scenario: Details with keywords
-        When sending details query for W43327921
-            | keywords |
-            | 1 |
-        Then the result is valid json
+      | object |
+      | 1 |
+      | R1 |
+      | N300209696:highway |

 
 

-    # ticket #1343
-    Scenario: Details of a country with keywords
-        When sending details query for R1155955
-            | keywords |
-            | 1 |
-        Then the result is valid json