Merge remote-tracking branch 'upstream/master'

[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 19ef1bfcea8472a88eb6dbe91f8dd830f6856538..6bab1bc790ba649f7e72e50d0f04b28a0500001e 100644 (file)
--- a/test/bdd/api/details/simple.feature
+++ b/test/bdd/api/details/simple.feature
@@ -3,15 +3,30 @@ Feature: Object details
     Check details page for correctness
 
     Scenario Outline: Details via OSM id
     Check details page for correctness
 
     Scenario Outline: Details via OSM id

-        When sending details query for <object>
-        Then the result is valid html
+        When sending <format> details query for <object>
+        Then the result is valid <format>
+
+    Examples:
+     | format | object |
+     | html | 492887 |
+     | json | 492887 |
+     | html | N4267356889 |
+     | json | N4267356889 |
+     | html | W230804120 |
+     | json | W230804120 |
+     | html | R123924 |
+     | json | R123924 |
+
+    Scenario Outline: Details via unknown OSM id
+        When sending <format> details query for <object>
+        Then a HTTP 400 is returned

 
     Examples:
 
     Examples:

-     | object |
-     | 492887 |
-     | N4267356889 |
-     | W230804120 |
-     | R123924 |
+      | format | object |
+      | html | 1 |
+      | json | 1 |
+      | html | R1 |
+      | json | R1 |

 
     Scenario: Details with keywords
         When sending details query for W78099902
 
     Scenario: Details with keywords
         When sending details query for W78099902


@@ -19,35 +34,10 @@ Feature: Object details
             | 1 |
         Then the result is valid html
 
             | 1 |
         Then the result is valid html
 

-    Scenario: JSON Details
-        When sending json details query for W78099902
-        Then the result is valid json
-        And result has not attributes place_search_name_keywords,place_search_address_keywords,address_lines,linked_lines,parentof_lines
-
-    Scenario: JSON Details with keywords
-        When sending json details query for W78099902
+    # ticket #1343
+    Scenario: Details of a country with keywords
+        When sending details query for R287072

             | keywords |
             | 1 |
             | keywords |
             | 1 |

-        Then the result is valid json
-        And result has attributes place_search_name_keywords,place_search_address_keywords
-
-    Scenario: JSON Details with addressdetails
-        When sending json details query for W78099902
-            | addressdetails |
-            | 1 |
-        Then the result is valid json
-        And result has attributes address_lines
-
-    Scenario: JSON Details with linkedplaces
-        When sending json details query for R123924
-            | linkedplaces |
-            | 1 |
-        Then the result is valid json
-        And result has attributes linked_lines
+        Then the result is valid html

 
 

-    Scenario: JSON Details with childplaces
-        When sending json details query for W78099902
-            | childplaces |
-            | 1 |
-        Then the result is valid json
-        And result has attributes parentof_lines