Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / api / search / params.feature

diff --git a/test/bdd/api/search/params.feature b/test/bdd/api/search/params.feature
index 300948a9a0765f2c40adea52c5d9dbd6a3587e90..053dbbcdf919675bea5eb33a66886b839ba9b721 100644 (file)
--- a/test/bdd/api/search/params.feature
+++ b/test/bdd/api/search/params.feature
@@ -68,14 +68,15 @@ Feature: Search queries
           | 0 |
         Then there are duplicates
 
           | 0 |
         Then there are duplicates
 

+    @fail-legacy

     Scenario: Search with bounded viewbox in right area
     Scenario: Search with bounded viewbox in right area

-        When sending json search query "bar" with address
+        When sending json search query "post" with address

           | bounded | viewbox |
           | 1       |  9,47,10,48 |
         Then result addresses contain
           | ID | town |
           | 0  | Vaduz |
           | bounded | viewbox |
           | 1       |  9,47,10,48 |
         Then result addresses contain
           | ID | town |
           | 0  | Vaduz |

-        When sending json search query "bar" with address
+        When sending json search query "post" with address

           | bounded | viewbox |
           | 1       |  9.49712,47.17122,9.52605,47.16242 |
         Then result addresses contain
           | bounded | viewbox |
           | 1       |  9.49712,47.17122,9.52605,47.16242 |
         Then result addresses contain


@@ -118,18 +119,18 @@ Feature: Search queries
         Then result has centroid in 9.49712,47.16242,9.52605,47.17122
 
     Scenario: Prefer results within viewbox
         Then result has centroid in 9.49712,47.16242,9.52605,47.17122
 
     Scenario: Prefer results within viewbox

-        When sending json search query "Gässle" with address
-          | accept-language |
-          | en |
-        Then result addresses contain
-          | ID | town |
-          | 0  | Balzers |

         When sending json search query "Gässle" with address
           | accept-language | viewbox |
           | en              | 9.52413,47.10759,9.53140,47.10539 |
         Then result addresses contain
           | ID | village |
           | 0  | Triesen |
         When sending json search query "Gässle" with address
           | accept-language | viewbox |
           | en              | 9.52413,47.10759,9.53140,47.10539 |
         Then result addresses contain
           | ID | village |
           | 0  | Triesen |

+        When sending json search query "Gässle" with address
+          | accept-language | viewbox |
+          | en              | 9.45949,47.08421,9.54094,47.05466 |
+        Then result addresses contain
+          | ID | town |
+          | 0  | Balzers |

 
     Scenario: viewboxes cannot be points
         When sending json search query "foo"
 
     Scenario: viewboxes cannot be points
         When sending json search query "foo"


@@ -171,10 +172,12 @@ Feature: Search queries
 
     Scenario: Limit number of search results
         When sending json search query "landstr"
 
     Scenario: Limit number of search results
         When sending json search query "landstr"

+          | dedupe |
+          | 0      |

         Then more than 4 results are returned
         When sending json search query "landstr"
         Then more than 4 results are returned
         When sending json search query "landstr"

-          | limit |
-          | 4 |
+          | limit | dedupe |
+          | 4     | 0      |

         Then exactly 4 results are returned
 
     Scenario: Limit parameter must be a number
         Then exactly 4 results are returned
 
     Scenario: Limit parameter must be a number