[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Get rid of PARSOID_MOCKAPI_URL env var

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338034 )

Change subject: Get rid of PARSOID_MOCKAPI_URL env var
......................................................................

Get rid of PARSOID_MOCKAPI_URL env var

Change-Id: I1e4f1de7d41f22a2f392df37ddfde74ee51f46b6
---
M tests/mocha/apitest.localsettings.js
M tests/rttest.localsettings.js
M tests/serviceWrapper.js
3 files changed, 12 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/34/338034/1

diff --git a/tests/mocha/apitest.localsettings.js 
b/tests/mocha/apitest.localsettings.js
index d99ee0f..0549a40 100644
--- a/tests/mocha/apitest.localsettings.js
+++ b/tests/mocha/apitest.localsettings.js
@@ -1,15 +1,6 @@
 'use strict';
 
 exports.setup = function(parsoidConfig) {
-       // The URL of your MediaWiki API endpoint.
-       if (process.env.PARSOID_MOCKAPI_URL) {
-               parsoidConfig.setMwApi({
-                       prefix: 'mock.prefix',
-                       domain: 'mock.domain',
-                       uri: process.env.PARSOID_MOCKAPI_URL,
-               });
-       }
-
        // We pre-define wikipedias as 'enwiki', 'dewiki' etc. Similarly
        // for other projects: 'enwiktionary', 'enwikiquote', 'enwikibooks',
        // 'enwikivoyage' etc. (default false)
diff --git a/tests/rttest.localsettings.js b/tests/rttest.localsettings.js
index 133f848..0da6f50 100644
--- a/tests/rttest.localsettings.js
+++ b/tests/rttest.localsettings.js
@@ -1,15 +1,6 @@
 'use strict';
 
 exports.setup = function(parsoidConfig) {
-       // The URL of your MediaWiki API endpoint.
-       if (process.env.PARSOID_MOCKAPI_URL) {
-               parsoidConfig.setMwApi({
-                       prefix: 'customwiki',
-                       domain: 'customwiki',
-                       uri: process.env.PARSOID_MOCKAPI_URL,
-               });
-       }
-
        // Turn on the batching API
        parsoidConfig.useBatchAPI = true;
 
diff --git a/tests/serviceWrapper.js b/tests/serviceWrapper.js
index 5e5fa48..5007b04 100644
--- a/tests/serviceWrapper.js
+++ b/tests/serviceWrapper.js
@@ -51,14 +51,13 @@
                        });
                }
                p = p.then(function(mockURL) {
-                       process.env.PARSOID_MOCKAPI_URL = mockURL;
                        ret.mockURL = mockURL;
                });
        }
 
        if (!options.skipParsoid) {
                p = p.then(choosePort).then(function(parsoidPort) {
-                       services.push({
+                       var pServ = {
                                module: path.resolve(__dirname, 
'../lib/index.js'),
                                entrypoint: 'apiServiceWorker',
                                conf: {
@@ -67,7 +66,17 @@
                                        localsettings: options.localsettings ||
                                                path.resolve(__dirname, 
'./rttest.localsettings.js'),
                                },
-                       });
+                       };
+                       if (ret.mockURL) {
+                               pServ.conf.mwApis = [
+                                       {
+                                               prefix: 'mock.prefix',
+                                               domain: 'mock.domain',
+                                               uri: ret.mockURL,
+                                       },
+                               ];
+                       }
+                       services.push(pServ);
                        ret.parsoidURL = 'http://localhost:' + parsoidPort + 
'/';
                });
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/338034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e4f1de7d41f22a2f392df37ddfde74ee51f46b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits