Changeset 5462 for sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php

Timestamp:

05/02/2017 09:33:55 PM (7 years ago)

Author:

iandunn

Message:

Events: Attempts all name-based lookups before resorting to IP lookup

Otherwise, someone searching for a city that requires a fallback lookup would have their request short-circuited by the IP lookup, which could produce unexpected results.

File:

• sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php

@@ -166 +166 @@
          * A location couldn't be found
          */
-        'city-invalid' => array(
+        'city-invalid-private-ip' => array(
             'input' => array(
                 'location_name' => 'Rivendell',
-                'ip_address'    => '127.0.0.1'
+                'ip'            => '127.0.0.1'
             ),
             'expected' => false,
@@ -276 +276 @@
                 'locale'        => 'ja',
                 'timezone'      => 'Asia/Tokyo',
+            ),
+            'expected' => array(
+                'description' => 'osaka',
+                'latitude'    => '34.694',
+                'longitude'   => '135.502',
+                'country'     => 'JP',
+            ),
+        ),
+
+        // If a location is provided, the fallback search should be attempted before an IP search
+        'fallback-with-public-ip' => array(
+            'input' => array(
+                'location_name' => 'Osakashi',
+                'locale'        => 'ja',
+                'timezone'      => 'Asia/Tokyo',
+                'ip'            => '153.163.68.148', // Tokyo
             ),
             'expected' => array(