Merge "mediawiki.api.watch: Don't use deprecated 'title' parameter"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 12 Mar 2014 13:02:09 +0000 (13:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 12 Mar 2014 13:02:09 +0000 (13:02 +0000)
1  2 
tests/qunit/QUnitTestResources.php

@@@ -9,13 -9,7 +9,13 @@@ return array
        'test.sinonjs' => array(
                'scripts' => array(
                        'resources/sinonjs/sinon-1.9.0.js',
 -                      'resources/sinonjs/sinon-ie-1.9.0.js',
 +                      // We want tests to work in IE, but can't include this as it
 +                      // will break the placeholders in Sinon because the hack it uses
 +                      // to hijack IE globals relies on running in the global scope
 +                      // and in ResourceLoader this won't be running in the global scope.
 +                      // Including it results (among other things) in sandboxed timers
 +                      // being broken due to Date inheritance being undefined.
 +                      // 'resources/sinonjs/sinon-ie-1.9.0.js',
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@@ -71,6 -65,7 +71,7 @@@
                        'tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js',
                        'tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js',
                        'tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js',
+                       'tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js',
                        'tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js',
                        'tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js',
                        'tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js',
@@@ -96,6 -91,7 +97,7 @@@
                        'mediawiki',
                        'mediawiki.api',
                        'mediawiki.api.parse',
+                       'mediawiki.api.watch',
                        'mediawiki.jqueryMsg',
                        'mediawiki.Title',
                        'mediawiki.Uri',