Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / db / import / postcodes.feature

diff --git a/test/bdd/db/import/postcodes.feature b/test/bdd/db/import/postcodes.feature
index 3d1dc489482fb90cc65b730175398804473aff05..4c839db00143e004b28f5d98dd6890102475e5e0 100644 (file)
--- a/test/bdd/db/import/postcodes.feature
+++ b/test/bdd/db/import/postcodes.feature
@@ -134,9 +134,7 @@ Feature: Import of postcodes
         Then location_postcode contains exactly
            | country | postcode | geometry |
            | de      | 01982    | country:de |
-        And word contains
-           | word  | class | type |
-           | 01982 | place | postcode |
+        And there are word tokens for postcodes 01982
 
     Scenario: Different postcodes with the same normalization can both be found
         Given the places
@@ -148,11 +146,11 @@ Feature: Import of postcodes
            | country | postcode | geometry |
            | gb      | EH4 7EA  | country:gb |
            | gb      | E4 7EA   | country:gb |
-        When searching for "EH4 7EA"
+        When sending search query "EH4 7EA"
         Then results contain
-           | type     | placename |
+           | type     | display_name |
            | postcode | EH4 7EA      |
-        When searching for "E4 7EA"
+        When sending search query "E4 7EA"
         Then results contain
-           | type     | placename |
+           | type     | display_name |
            | postcode | E4 7EA      |