Merge remote-tracking branch 'upstream/master'

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

diff --git a/tests/features/api/search.feature b/tests/features/api/search.feature
index 859faa76f1256847d18e3eb703d6da8bbe026c02..08b2653c7784c389679a253b0c281edb39a125ef 100644 (file)
--- a/tests/features/api/search.feature
+++ b/tests/features/api/search.feature
@@ -9,7 +9,7 @@ Feature: Search queries
           | road         | Thoresby Road
           | city         | Broxtowe
           | state        | England
           | road         | Thoresby Road
           | city         | Broxtowe
           | state        | England

-          | country      | United Kingdom
+          | country      | U.*K.*

           | country_code | gb
 
 
           | country_code | gb
 
 


@@ -31,13 +31,13 @@ Feature: Search queries
     Scenario: House number interpolation even
         Given the request parameters
           | accept-language
     Scenario: House number interpolation even
         Given the request parameters
           | accept-language

-          | en        
+          | en

         When sending json search query "140 rue Don Bosco, Saguenay" with address
         Then address of result 0 contains
           | type         | value
           | house_number | 140
         When sending json search query "140 rue Don Bosco, Saguenay" with address
         Then address of result 0 contains
           | type         | value
           | house_number | 140

-          | road         | rue Don Bosco
-          | city         | Saguenay
+          | road         | [Rr]ue Don Bosco
+          | city         | .*Saguenay

           | state        | Quebec
           | country      | Canada
           | country_code | ca
           | state        | Quebec
           | country      | Canada
           | country_code | ca


@@ -45,13 +45,13 @@ Feature: Search queries
     Scenario: House number interpolation odd
         Given the request parameters
           | accept-language
     Scenario: House number interpolation odd
         Given the request parameters
           | accept-language

-          | en        
+          | en

         When sending json search query "141 rue Don Bosco, Saguenay" with address
         Then address of result 0 contains
           | type         | value
           | house_number | 141
         When sending json search query "141 rue Don Bosco, Saguenay" with address
         Then address of result 0 contains
           | type         | value
           | house_number | 141

-          | road         | rue Don Bosco
-          | city         | Saguenay
+          | road         | [rR]ue Don Bosco
+          | city         | .*Saguenay

           | state        | Quebec
           | country      | Canada
           | country_code | ca
           | state        | Quebec
           | country      | Canada
           | country_code | ca


@@ -59,17 +59,21 @@ Feature: Search queries
     @Tiger
     Scenario: TIGER house number
         When sending json search query "3 West Victory Way, Craig"
     @Tiger
     Scenario: TIGER house number
         When sending json search query "3 West Victory Way, Craig"

-        Then result 0 has not attributes osm_id,osm_type
+        Then results contain
+         | osm_type
+         | tiger

 
     @Tiger
     Scenario: TIGER house number (road fallback)
         When sending json search query "3030 West Victory Way, Craig"
 
     @Tiger
     Scenario: TIGER house number (road fallback)
         When sending json search query "3030 West Victory Way, Craig"

-        Then result 0 has attributes osm_id,osm_type
+        Then results contain
+         | osm_type
+         | way

 
     Scenario: Expansion of Illinois
         Given the request parameters
           | accept-language
 
     Scenario: Expansion of Illinois
         Given the request parameters
           | accept-language

-          | en        
+          | en

         When sending json search query "il, us"
         Then results contain
           | ID | display_name
         When sending json search query "il, us"
         Then results contain
           | ID | display_name