Merge pull request #100 from wikimedia/test-dot-local

Unify the .test.local uri massaging in web.js

lib/filters/global/actions.js

@@ -15,14 +15,7 @@ module.exports = {
 
                     var rp = req.params;
 
-                    // TODO: this is a hack to allow us to test with a safe/fake
-                    // domain, but still call out to a real service
-                    var domain = rp.domain;
-                    if (domain === 'en.wikipedia.test.local') {
-                        domain = 'en.wikipedia.org';
-                    }
-
-                    req.uri = 'http://' + domain + '/w/api.php';
+                    req.uri = 'http://' + rp.domain + '/w/api.php';
                     var body = req.body || req.query;
                     body.action = 'query';
                     // Always request json

lib/filters/global/parsoid.js

@@ -15,9 +15,6 @@ var contentTypes = {
 function pagebundle(parsoidHost, restbase, domain, key, rev) {
     // TODO: this is a hack to allow us to test with a safe/fake domain, but
     // still call out to a real service
-    if (domain === 'en.wikipedia.test.local') {
-        domain = 'en.wikipedia.org';
-    }
     var uri = parsoidHost + '/v2/' + domain + '/' + key + '/pagebundle/' + rev;
     return restbase.get({ uri: uri });
 }

lib/filters/global/web.js

@@ -4,6 +4,15 @@
 var preq = require('preq');
 
 function handleAll (restbase, req) {
+
+    // some tests use a fake en.wikipedia.test.local domain, which will confuse
+    // external  services such as parsoid and api.php -- if found here, replace
+    // with en.wikipedia.org
+    req.uri = req.uri.replace(/^http:\/\/en\.wikipedia\.test\.local\//,
+            'http://en.wikipedia.org/')
+            .replace(/^http:\/\/parsoid-lb\.eqiad\.wikimedia\.org\/v2\/en\.wikipedia\.test\.local\//,
+                    'http://parsoid-lb.eqiad.wikimedia.org/v2/en.wikipedia.org/');
+
     if (restbase._options.conf.offline) {
         throw new Error("We are offline, you are tring to fallback to dynamic api");
     }