Merge remote-tracking branch 'upstream/master' into cmake-port

[nominatim.git] / tests / features / api / search_simple.feature

diff --git a/tests/features/api/search_simple.feature b/tests/features/api/search_simple.feature
index 9c796e99d9ab46628c02dc3bb7d966ced1f9f039..ec2b7126c3cfeda9906f561e7bf49e2c056c0c6a 100644 (file)
--- a/tests/features/api/search_simple.feature
+++ b/tests/features/api/search_simple.feature
@@ -51,13 +51,17 @@ Feature: Simple Tests
      | limit            | 1000
      | dedupe           | 1
      | dedupe           | 0
+     | extratags        | 1
+     | extratags        | 0
+     | namedetails      | 1
+     | namedetails      | 0
 
     Scenario: Search with invalid output format
         Given the request parameters
           | format
           | fd$#
         When sending search query "Berlin"
-        Then the result is valid html
+        Then a HTTP 400 is returned
 
     Scenario Outline: Simple Searches
         When sending search query "<query>"
@@ -104,35 +108,35 @@ Feature: Simple Tests
     Scenario: Empty XML search with viewbox
         Given the request parameters
           | viewbox
-          | 12,45.13,77,33
+          | 12,45.13,13,44
         When sending xml search query "xnznxvcx"
         Then result header contains
           | attr        | value
           | querystring | xnznxvcx
           | polygon     | false
-          | viewbox     | 12,45.13,77,33
+          | viewbox     | 12,45.13,13,44
 
     Scenario: Empty XML search with viewboxlbrt
         Given the request parameters
           | viewboxlbrt
-          | 12,34.13,77,45
+          | 12,34.13,13,35
         When sending xml search query "xnznxvcx"
         Then result header contains
           | attr        | value
           | querystring | xnznxvcx
           | polygon     | false
-          | viewbox     | 12,45.13,77,33
+          | viewbox     | 12,34.13,13,35
 
     Scenario: Empty XML search with viewboxlbrt and viewbox
         Given the request parameters
-          | viewbox        | viewboxblrt
-          | 12,45.13,77,33 | 1,2,3,4
+          | viewbox          | viewboxblrt
+          | 12,45.13,13.5,44 | 1,0,2,1
         When sending xml search query "pub"
         Then result header contains
           | attr        | value
           | querystring | pub
           | polygon     | false
-          | viewbox     | 12,45.13,77,33
+          | viewbox     | 12,45.13,13.5,44
 
 
     Scenario Outline: Empty XML search with polygon values
@@ -166,6 +170,13 @@ Feature: Simple Tests
           | attr              | value
           | exclude_place_ids | 123,76,342565
 
+    Scenario: Empty XML search with bad exluded place ids
+        Given the request parameters
+          | exclude_place_ids
+          | ,
+        When sending xml search query "jghrleoxsbwjer"
+        Then result header has no attribute exclude_place_ids
+
     Scenario Outline: Wrapping of legal jsonp search requests
         Given the request parameters
           | json_callback