Merge branch 'master' into notes-search

[rails.git] / test / http / geonames.yml

diff --git a/test/http/geonames.yml b/test/http/geonames.yml
index 3527e3ced129ded75c8508a0adcb8a86bd351805..65356c80754f11ef445b8ff815c0682a825a2fdf 100644 (file)
--- a/test/http/geonames.yml
+++ b/test/http/geonames.yml
@@ -1,222 +1,228 @@
-/search?lang=en&maxRows=20&q=Hoddesdon&username=dummy: |
-  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-  <geonames style="MEDIUM">
-    <totalResultsCount>1</totalResultsCount>
-    <geoname>
-      <toponymName>Hoddesdon</toponymName>
-      <name>Hoddesdon</name>
-      <lat>51.76148</lat>
-      <lng>-0.01144</lng>
-      <geonameId>2646807</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>P</fcl>
-      <fcode>PPL</fcode>
-    </geoname>
-  </geonames>
-
-/search?lang=en&maxRows=20&q=Broxbourne&username=dummy: |
-  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-  <geonames style="MEDIUM">
-    <totalResultsCount>17</totalResultsCount>
-    <geoname>
-      <toponymName>Broxbourne</toponymName>
-      <name>Broxbourne</name>
-      <lat>51.74712</lat>
-      <lng>-0.01923</lng>
-      <geonameId>2654481</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>P</fcl>
-      <fcode>PPL</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Broxbourne District</toponymName>
-      <name>Broxbourne District</name>
-      <lat>51.73026</lat>
-      <lng>-0.04821</lng>
-      <geonameId>7290563</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>A</fcl>
-      <fcode>ADM3</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Cheshunt</toponymName>
-      <name>Cheshunt</name>
-      <lat>51.70791</lat>
-      <lng>-0.03739</lng>
-      <geonameId>2653232</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>P</fcl>
-      <fcode>PPL</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Hoddesdon</toponymName>
-      <name>Hoddesdon</name>
-      <lat>51.76148</lat>
-      <lng>-0.01144</lng>
-      <geonameId>2646807</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>P</fcl>
-      <fcode>PPL</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Waltham Cross</toponymName>
-      <name>Waltham Cross</name>
-      <lat>51.68905</lat>
-      <lng>-0.0333</lng>
-      <geonameId>2634842</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>P</fcl>
-      <fcode>PPL</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Goffs Oak</toponymName>
-      <name>Goffs Oak</name>
-      <lat>51.71015</lat>
-      <lng>-0.0872</lng>
-      <geonameId>2648362</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>P</fcl>
-      <fcode>PPL</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Wormley</toponymName>
-      <name>Wormley</name>
-      <lat>51.7324</lat>
-      <lng>-0.0242</lng>
-      <geonameId>2633535</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>P</fcl>
-      <fcode>PPL</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Broxbourne</toponymName>
-      <name>Broxbourne</name>
-      <lat>-27.50314</lat>
-      <lng>151.378</lng>
-      <geonameId>8792801</geonameId>
-      <countryCode>AU</countryCode>
-      <countryName>Australia</countryName>
-      <fcl>S</fcl>
-      <fcode>HMSD</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Lee Valley White Water Centre</toponymName>
-      <name>Lee Valley White Water Centre</name>
-      <lat>51.68814</lat>
-      <lng>-0.01682</lng>
-      <geonameId>7670551</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>S</fcl>
-      <fcode>FCL</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Cheshunt Railway Station</toponymName>
-      <name>Cheshunt Railway Station</name>
-      <lat>51.703</lat>
-      <lng>-0.024</lng>
-      <geonameId>6952282</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>S</fcl>
-      <fcode>RSTN</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Theobalds Grove Railway Station</toponymName>
-      <name>Theobalds Grove Railway Station</name>
-      <lat>51.692</lat>
-      <lng>-0.035</lng>
-      <geonameId>6953715</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>S</fcl>
-      <fcode>RSTN</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Waltham Cross Railway Station</toponymName>
-      <name>Waltham Cross Railway Station</name>
-      <lat>51.685</lat>
-      <lng>-0.027</lng>
-      <geonameId>6953801</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>S</fcl>
-      <fcode>RSTN</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Rye House Station</toponymName>
-      <name>Rye House Station</name>
-      <lat>51.76938</lat>
-      <lng>0.00562</lng>
-      <geonameId>6691700</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>S</fcl>
-      <fcode>RSTN</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Broxbourne Station</toponymName>
-      <name>Broxbourne Station</name>
-      <lat>51.74697</lat>
-      <lng>-0.01105</lng>
-      <geonameId>6691701</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>S</fcl>
-      <fcode>RSTN</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Broxbornebury Park</toponymName>
-      <name>Broxbornebury Park</name>
-      <lat>51.75252</lat>
-      <lng>-0.03839</lng>
-      <geonameId>6286417</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>S</fcl>
-      <fcode>CSTL</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Marriott Cheshunt</toponymName>
-      <name>Marriott Cheshunt</name>
-      <lat>51.7208</lat>
-      <lng>-0.0324</lng>
-      <geonameId>6512481</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>S</fcl>
-      <fcode>HTL</fcode>
-    </geoname>
-    <geoname>
-      <toponymName>Cheshunt Community Hospital</toponymName>
-      <name>Cheshunt Community Hospital</name>
-      <lat>51.68396</lat>
-      <lng>-0.03951</lng>
-      <geonameId>6289233</geonameId>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <fcl>S</fcl>
-      <fcode>HSP</fcode>
-    </geoname>
-  </geonames>
-
-/countrySubdivision?lang=en&lat=51.7632&lng=-0.0076&username=dummy: |
-  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-  <geonames>
-    <countrySubdivision>
-      <countryCode>GB</countryCode>
-      <countryName>United Kingdom</countryName>
-      <adminCode1>ENG</adminCode1>
-      <adminName1>England</adminName1>
-      <code type="ISO3166-2">ENG</code>
-      <distance>0.0</distance>
-    </countrySubdivision>
-  </geonames>
+/search?lang=en&maxRows=20&q=Hoddesdon&username=dummy:
+  code: 200
+  body: |
+    <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+    <geonames style="MEDIUM">
+      <totalResultsCount>1</totalResultsCount>
+      <geoname>
+        <toponymName>Hoddesdon</toponymName>
+        <name>Hoddesdon</name>
+        <lat>51.76148</lat>
+        <lng>-0.01144</lng>
+        <geonameId>2646807</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>P</fcl>
+        <fcode>PPL</fcode>
+      </geoname>
+    </geonames>
+  
+/search?lang=en&maxRows=20&q=Broxbourne&username=dummy:
+  code: 200
+  body: |
+    <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+    <geonames style="MEDIUM">
+      <totalResultsCount>17</totalResultsCount>
+      <geoname>
+        <toponymName>Broxbourne</toponymName>
+        <name>Broxbourne</name>
+        <lat>51.74712</lat>
+        <lng>-0.01923</lng>
+        <geonameId>2654481</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>P</fcl>
+        <fcode>PPL</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Broxbourne District</toponymName>
+        <name>Broxbourne District</name>
+        <lat>51.73026</lat>
+        <lng>-0.04821</lng>
+        <geonameId>7290563</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>A</fcl>
+        <fcode>ADM3</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Cheshunt</toponymName>
+        <name>Cheshunt</name>
+        <lat>51.70791</lat>
+        <lng>-0.03739</lng>
+        <geonameId>2653232</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>P</fcl>
+        <fcode>PPL</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Hoddesdon</toponymName>
+        <name>Hoddesdon</name>
+        <lat>51.76148</lat>
+        <lng>-0.01144</lng>
+        <geonameId>2646807</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>P</fcl>
+        <fcode>PPL</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Waltham Cross</toponymName>
+        <name>Waltham Cross</name>
+        <lat>51.68905</lat>
+        <lng>-0.0333</lng>
+        <geonameId>2634842</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>P</fcl>
+        <fcode>PPL</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Goffs Oak</toponymName>
+        <name>Goffs Oak</name>
+        <lat>51.71015</lat>
+        <lng>-0.0872</lng>
+        <geonameId>2648362</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>P</fcl>
+        <fcode>PPL</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Wormley</toponymName>
+        <name>Wormley</name>
+        <lat>51.7324</lat>
+        <lng>-0.0242</lng>
+        <geonameId>2633535</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>P</fcl>
+        <fcode>PPL</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Broxbourne</toponymName>
+        <name>Broxbourne</name>
+        <lat>-27.50314</lat>
+        <lng>151.378</lng>
+        <geonameId>8792801</geonameId>
+        <countryCode>AU</countryCode>
+        <countryName>Australia</countryName>
+        <fcl>S</fcl>
+        <fcode>HMSD</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Lee Valley White Water Centre</toponymName>
+        <name>Lee Valley White Water Centre</name>
+        <lat>51.68814</lat>
+        <lng>-0.01682</lng>
+        <geonameId>7670551</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>S</fcl>
+        <fcode>FCL</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Cheshunt Railway Station</toponymName>
+        <name>Cheshunt Railway Station</name>
+        <lat>51.703</lat>
+        <lng>-0.024</lng>
+        <geonameId>6952282</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>S</fcl>
+        <fcode>RSTN</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Theobalds Grove Railway Station</toponymName>
+        <name>Theobalds Grove Railway Station</name>
+        <lat>51.692</lat>
+        <lng>-0.035</lng>
+        <geonameId>6953715</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>S</fcl>
+        <fcode>RSTN</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Waltham Cross Railway Station</toponymName>
+        <name>Waltham Cross Railway Station</name>
+        <lat>51.685</lat>
+        <lng>-0.027</lng>
+        <geonameId>6953801</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>S</fcl>
+        <fcode>RSTN</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Rye House Station</toponymName>
+        <name>Rye House Station</name>
+        <lat>51.76938</lat>
+        <lng>0.00562</lng>
+        <geonameId>6691700</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>S</fcl>
+        <fcode>RSTN</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Broxbourne Station</toponymName>
+        <name>Broxbourne Station</name>
+        <lat>51.74697</lat>
+        <lng>-0.01105</lng>
+        <geonameId>6691701</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>S</fcl>
+        <fcode>RSTN</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Broxbornebury Park</toponymName>
+        <name>Broxbornebury Park</name>
+        <lat>51.75252</lat>
+        <lng>-0.03839</lng>
+        <geonameId>6286417</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>S</fcl>
+        <fcode>CSTL</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Marriott Cheshunt</toponymName>
+        <name>Marriott Cheshunt</name>
+        <lat>51.7208</lat>
+        <lng>-0.0324</lng>
+        <geonameId>6512481</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>S</fcl>
+        <fcode>HTL</fcode>
+      </geoname>
+      <geoname>
+        <toponymName>Cheshunt Community Hospital</toponymName>
+        <name>Cheshunt Community Hospital</name>
+        <lat>51.68396</lat>
+        <lng>-0.03951</lng>
+        <geonameId>6289233</geonameId>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <fcl>S</fcl>
+        <fcode>HSP</fcode>
+      </geoname>
+    </geonames>
+  
+/countrySubdivision?lang=en&lat=51.7632&lng=-0.0076&username=dummy:
+  code: 200
+  body: |
+    <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+    <geonames>
+      <countrySubdivision>
+        <countryCode>GB</countryCode>
+        <countryName>United Kingdom</countryName>
+        <adminCode1>ENG</adminCode1>
+        <adminName1>England</adminName1>
+        <code type="ISO3166-2">ENG</code>
+        <distance>0.0</distance>
+      </countrySubdivision>
+    </geonames>