Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/api/search/simple.feature b/test/bdd/api/search/simple.feature
index b986d8a72c64280727cc589d26a6bf84db2d4315..ea709b8094d7e0845a6343232f95ccfce512e656 100644 (file)
--- a/test/bdd/api/search/simple.feature
+++ b/test/bdd/api/search/simple.feature
@@ -89,7 +89,7 @@ Feature: Simple Tests
           | attr        | value |
           | querystring | xnznxvcx |
           | polygon     | false |
           | attr        | value |
           | querystring | xnznxvcx |
           | polygon     | false |

-          | more_url    | .*format=xml.*q=xnznxvcx.* |
+          | more_url    | .*q=xnznxvcx.*format=xml |

 
     Scenario: Empty XML search with special XML characters
         When sending xml search query "xfdghn&zxn"xvbyx<vxx>cssdex"
 
     Scenario: Empty XML search with special XML characters
         When sending xml search query "xfdghn&zxn"xvbyx<vxx>cssdex"


@@ -97,7 +97,7 @@ Feature: Simple Tests
           | attr        | value |
           | querystring | xfdghn&zxn"xvbyx<vxx>cssdex |
           | polygon     | false |
           | attr        | value |
           | querystring | xfdghn&zxn"xvbyx<vxx>cssdex |
           | polygon     | false |

-          | more_url    | .*format=xml.*q=xfdghn%26zxn%22xvbyx%3Cvxx%3Ecssdex.* |
+          | more_url    | .*q=xfdghn%26zxn%22xvbyx%3Cvxx%3Ecssdex.*format=xml |

 
     Scenario: Empty XML search with viewbox
         When sending xml search query "xnznxvcx"
 
     Scenario: Empty XML search with viewbox
         When sending xml search query "xnznxvcx"


@@ -107,7 +107,7 @@ Feature: Simple Tests
           | attr        | value |
           | querystring | xnznxvcx |
           | polygon     | false |
           | attr        | value |
           | querystring | xnznxvcx |
           | polygon     | false |

-          | viewbox     | 12,45.13,77,33 |
+          | viewbox     | 12,33,77,45.13 |

 
     Scenario: Empty XML search with viewboxlbrt
         When sending xml search query "xnznxvcx"
 
     Scenario: Empty XML search with viewboxlbrt
         When sending xml search query "xnznxvcx"


@@ -127,7 +127,7 @@ Feature: Simple Tests
           | attr        | value |
           | querystring | pub |
           | polygon     | false |
           | attr        | value |
           | querystring | pub |
           | polygon     | false |

-          | viewbox     | 12,45.13,77,33 |
+          | viewbox     | 12,33,77,45.13 |

 
     Scenario Outline: Empty XML search with polygon values
         When sending xml search query "xnznxvcx"
 
     Scenario Outline: Empty XML search with polygon values
         When sending xml search query "xnznxvcx"


@@ -225,4 +225,4 @@ Feature: Simple Tests
           | pl,1,,invalid,undefined,%3Cb%3E,bo,, |
        Then result header contains
           | attr     | value |
           | pl,1,,invalid,undefined,%3Cb%3E,bo,, |
        Then result header contains
           | attr     | value |

-          | more_url | .*&countrycodes=pl,bo&.* |
+          | more_url | .*&countrycodes=pl%2Cbo&.* |