update tests for newer planet

diff --git a/tests/features/api/regression.feature b/tests/features/api/regression.feature
index 8a436fc3d41dac571fc4626557e737170e6b0d57..c50ab7df031430776fb5e661e112b03c57be8338 100644 (file)
--- a/tests/features/api/regression.feature
+++ b/tests/features/api/regression.feature
@@ -108,13 +108,13 @@ Feature: API regression tests
          | 0  | Philippstraße | Düren
 
     Scenario: trac #2830
          | 0  | Philippstraße | Düren
 
     Scenario: trac #2830

-        When sending json search query "528, Merkley Drive, K4A 1N5,CA" with address
+        When sending json search query "207, Boardman Street, S0J 1L0, CA" with address

         Then result addresses contain
         Then result addresses contain

-         | ID | house_number | road          | postcode | country
-         | 0  | 528          | Merkley Drive | K4A 1N5  | Canada
+         | ID | house_number | road            | postcode | country
+         | 0  | 207          | Boardman Street | S0J 1L0  | Canada

 
     Scenario: trac #2830
 
     Scenario: trac #2830

-        When sending json search query "K4A 1N5,CA"
+        When sending json search query "S0J 1L0,CA"

         Then results contain
          | ID | class | type     | display_name
          | 0  | place | postcode | .*, Canada
         Then results contain
          | ID | class | type     | display_name
          | 0  | place | postcode | .*, Canada


@@ -134,17 +134,8 @@ Feature: API regression tests
     Scenario: trac #2871
         When looking up coordinates -33.906895553,150.99609375
         Then result addresses contain
     Scenario: trac #2871
         When looking up coordinates -33.906895553,150.99609375
         Then result addresses contain

-         | ID | city       | postcode | country
-         | 0  | [^0-9]*    | 2197     | Australia
-
-    Scenario: trac #2974
-        When sending json search query "Azadi Square, Faruj" with address
-        Then result addresses contain
-         | ID | road        | city
-         | 0  | ميدان آزادي | فاروج
-        And results contain
-         | ID | latlon
-         | 0  | 37.2323,58.2193 +-1km
+         | ID | city       | country
+         | 0  | [^0-9]*$   | Australia

 
      Scenario: trac #2981
         When sending json search query "Ohmstraße 7, Berlin" with address
 
      Scenario: trac #2981
         When sending json search query "Ohmstraße 7, Berlin" with address


@@ -202,7 +193,7 @@ Feature: API regression tests
         When sending json search query "<query>" with address
         Then result addresses contain
          | ID | road     | city
         When sending json search query "<query>" with address
         Then result addresses contain
          | ID | road     | city

-         | 0  | Seegasse | Wieselburg-Land
+         | 0  | Seegasse | .*Wieselburg-Land

 
     Examples:
          | query
 
     Examples:
          | query

diff --git a/tests/features/api/search.feature b/tests/features/api/search.feature
index 656bfb2948df6c31f1322b325b192174aa1bc6a6..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
           | road         | [Rr]ue Don Bosco
         When sending json search query "140 rue Don Bosco, Saguenay" with address
         Then address of result 0 contains
           | type         | value
           | house_number | 140
           | road         | [Rr]ue Don Bosco

-          | city         | Saguenay
+          | 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
           | road         | [rR]ue Don Bosco
         When sending json search query "141 rue Don Bosco, Saguenay" with address
         Then address of result 0 contains
           | type         | value
           | house_number | 141
           | road         | [rR]ue Don Bosco

-          | city         | Saguenay
+          | city         | .*Saguenay

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


@@ -73,7 +73,7 @@ Feature: Search queries
     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

diff --git a/tests/features/api/search_params.feature b/tests/features/api/search_params.feature
index 0b21d5584e6c164b13542a3fa9fe81f95c72aa0c..5a1c4f810ec2db5ff94bf91e16b9e3f15acb6839 100644 (file)
--- a/tests/features/api/search_params.feature
+++ b/tests/features/api/search_params.feature
@@ -31,7 +31,6 @@ Feature: Search queries
         When sending xml search query "Inuvik" with address
         Then address of result 0 contains
           | type         | value
         When sending xml search query "Inuvik" with address
         Then address of result 0 contains
           | type         | value

-          | city         | Inuvik

           | state        | Northwest Territories
           | country      | Canada
           | country_code | ca
           | state        | Northwest Territories
           | country      | Canada
           | country_code | ca