Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/db/query/postcodes.feature b/test/bdd/db/query/postcodes.feature
index c399b63b0bbc0440aaff6e088fcbb0792e2dd594..78a26a90f5dfd723a2d3511e23a03a0293023536 100644 (file)
--- a/test/bdd/db/query/postcodes.feature
+++ b/test/bdd/db/query/postcodes.feature
@@ -1,5 +1,4 @@
 @DB
 @DB

-@fail-legacy

 Feature: Querying fo postcode variants
 
     Scenario: Postcodes in Singapore (6-digit postcode)
 Feature: Querying fo postcode variants
 
     Scenario: Postcodes in Singapore (6-digit postcode)


@@ -12,9 +11,10 @@ Feature: Querying fo postcode variants
         When sending search query "399174"
         Then results contain
             | ID | type     | display_name |
         When sending search query "399174"
         Then results contain
             | ID | type     | display_name |

-            | 0  | postcode | 399174       |
+            | 0  | postcode | 399174, Singapore |

 
 
 
 

+    @fail-legacy

     Scenario Outline: Postcodes in the Netherlands (mixed postcode with spaces)
         Given the grid with origin NL
             | 10 |   |   |   | 11 |
     Scenario Outline: Postcodes in the Netherlands (mixed postcode with spaces)
         Given the grid with origin NL
             | 10 |   |   |   | 11 |


@@ -25,11 +25,11 @@ Feature: Querying fo postcode variants
         When sending search query "3993 DX"
         Then results contain
             | ID | type     | display_name |
         When sending search query "3993 DX"
         Then results contain
             | ID | type     | display_name |

-            | 0  | postcode | 3993 DX      |
+            | 0  | postcode | 3993 DX, Nederland      |

         When sending search query "3993dx"
         Then results contain
             | ID | type     | display_name |
         When sending search query "3993dx"
         Then results contain
             | ID | type     | display_name |

-            | 0  | postcode | 3993 DX      |
+            | 0  | postcode | 3993 DX, Nederland      |

 
         Examples:
             | postcode |
 
         Examples:
             | postcode |


@@ -38,6 +38,7 @@ Feature: Querying fo postcode variants
             | 3993 dx  |
 
 
             | 3993 dx  |
 
 

+    @fail-legacy

     Scenario: Postcodes in Singapore (6-digit postcode)
         Given the grid with origin SG
             | 10 |   |   |   | 11 |
     Scenario: Postcodes in Singapore (6-digit postcode)
         Given the grid with origin SG
             | 10 |   |   |   | 11 |


@@ -48,9 +49,10 @@ Feature: Querying fo postcode variants
         When sending search query "399174"
         Then results contain
             | ID | type     | display_name |
         When sending search query "399174"
         Then results contain
             | ID | type     | display_name |

-            | 0  | postcode | 399174       |
+            | 0  | postcode | 399174, Singapore       |

 
 
 
 

+    @fail-legacy

     Scenario Outline: Postcodes in Andorra (with country code)
         Given the grid with origin AD
             | 10 |   |   |   | 11 |
     Scenario Outline: Postcodes in Andorra (with country code)
         Given the grid with origin AD
             | 10 |   |   |   | 11 |


@@ -61,11 +63,11 @@ Feature: Querying fo postcode variants
         When sending search query "675"
         Then results contain
             | ID | type     | display_name |
         When sending search query "675"
         Then results contain
             | ID | type     | display_name |

-            | 0  | postcode | AD675        |
+            | 0  | postcode | AD675, Andorra |

         When sending search query "AD675"
         Then results contain
             | ID | type     | display_name |
         When sending search query "AD675"
         Then results contain
             | ID | type     | display_name |

-            | 0  | postcode | AD675        |
+            | 0  | postcode | AD675, Andorra |

 
         Examples:
             | postcode |
 
         Examples:
             | postcode |


@@ -87,9 +89,9 @@ Feature: Querying fo postcode variants
         When sending search query "EH4 7EA"
         Then results contain
            | type     | display_name |
         When sending search query "EH4 7EA"
         Then results contain
            | type     | display_name |

-           | postcode | EH4 7EA      |
+           | postcode | EH4 7EA, United Kingdom |

         When sending search query "E4 7EA"
         Then results contain
            | type     | display_name |
         When sending search query "E4 7EA"
         Then results contain
            | type     | display_name |

-           | postcode | E4 7EA       |
+           | postcode | E4 7EA, United Kingdom |