[MediaWiki-commits] [Gerrit] Remove global fixtures - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/71154


Change subject: Remove global fixtures
......................................................................

Remove global fixtures

Change-Id: Iae69e9d4d4617e97689d0cca4605c5191d02b3e8
---
M javascripts/common/modules.js
M javascripts/specials/uploads.js
M tests/javascripts/common/test_mf-api.js
M tests/javascripts/fixtures.js
M tests/javascripts/modules/test_mf-watchstar.js
5 files changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/54/71154/1

diff --git a/javascripts/common/modules.js b/javascripts/common/modules.js
index 28b94ad..9a64365 100644
--- a/javascripts/common/modules.js
+++ b/javascripts/common/modules.js
@@ -13,6 +13,7 @@
                }
                return this._modules[ id ];
        },
+       testMode: mw.config.get( 'wgCanonicalSpecialPageName' ) === 
'JavaScriptTest',
 
        /**
         * Define a module which can be later required (imported) using 
require().
@@ -26,7 +27,7 @@
                }
                this._modules[ id ] = obj;
                // FIXME: modules should not self initialise
-               if ( obj.init && mw.config.get( 'wgInitOnDefine', true ) ) {
+               if ( obj.init && !this.testMode ) {
                        obj.init();
                }
        }
diff --git a/javascripts/specials/uploads.js b/javascripts/specials/uploads.js
index cf2c643..fa14564 100644
--- a/javascripts/specials/uploads.js
+++ b/javascripts/specials/uploads.js
@@ -208,7 +208,7 @@
                }
        }
 
-       if ( userName ) {
+       if ( userName && !M.testMode ) {
                $( init );
        }
 
diff --git a/tests/javascripts/common/test_mf-api.js 
b/tests/javascripts/common/test_mf-api.js
index 82429b1..9683d1c 100644
--- a/tests/javascripts/common/test_mf-api.js
+++ b/tests/javascripts/common/test_mf-api.js
@@ -126,9 +126,12 @@
                stub.withArgs( { action: 'tokens', type: 'edit' }, params 
).returns( editDeferred );
                stub.withArgs( { action: 'tokens', type: 'upload' }, params 
).returns( uploadAnonDeferred );
                stub.withArgs( corsData, corsParams ).returns( corsDeferred );
+               this.user = mw.config.get( 'wgUserName' ) || '';
+               mw.config.set( 'wgUserName', 'EvilPanda' );
        },
        teardown: function() {
                stub.restore();
+               mw.config.set( 'wgUserName', this.user );
        }
 } );
 
diff --git a/tests/javascripts/fixtures.js b/tests/javascripts/fixtures.js
index d98f535..e0bada5 100644
--- a/tests/javascripts/fixtures.js
+++ b/tests/javascripts/fixtures.js
@@ -1,4 +1,2 @@
 // turn sinon into a global
 window.sinon = sinon;
-mw.config.set( 'wgInitOnDefine', false );
-mw.config.set( 'wgUserName', 'EvilPanda' );
diff --git a/tests/javascripts/modules/test_mf-watchstar.js 
b/tests/javascripts/modules/test_mf-watchstar.js
index c408ded..f945322 100644
--- a/tests/javascripts/modules/test_mf-watchstar.js
+++ b/tests/javascripts/modules/test_mf-watchstar.js
@@ -3,6 +3,9 @@
 var _ajax;
 QUnit.module( 'MobileFrontend mf-watchlist.js', {
        setup: function() {
+               // ensure getToken doesn't think the user is anon
+               this.user = mw.config.get( 'wgUserName' ) || '';
+               mw.config.set( 'wgUserName', 'z' );
                _ajax = $.ajax;
                $.ajax = function( options ) {
                        var d = new $.Deferred();
@@ -39,6 +42,7 @@
        },
        teardown: function() {
                $.ajax = _ajax;
+               mw.config.set( 'wgUserName', this.user );
        }
 } );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae69e9d4d4617e97689d0cca4605c5191d02b3e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>

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