Merge "Replace cpPosTime cookie/parameter with cpPosIndex"

[lhc/web/wiklou.git] / tests / qunit / data / testrunner.js

diff --git a/tests/qunit/data/testrunner.js b/tests/qunit/data/testrunner.js
index e944ef0..5943294 100644 (file)
--- a/tests/qunit/data/testrunner.js
+++ b/tests/qunit/data/testrunner.js
@@ -309,14 +309,14 @@
                                        // Test should use fake XHR, wait for requests, or call abort()
                                        $activeLen = $.active;
                                        if ( $activeLen !== undefined && $activeLen !== 0 ) {
-                                               pending = $.grep( ajaxRequests, function ( ajax ) {
+                                               pending = ajaxRequests.filter( function ( ajax ) {
                                                        return ajax.xhr.state() === 'pending';
                                                } );
                                                if ( pending.length !== $activeLen ) {
                                                        mw.log.warn( 'Pending requests does not match jQuery.active count' );
                                                }
                                                // Force requests to stop to give the next test a clean start
-                                               $.each( ajaxRequests, function ( i, ajax ) {
+                                               ajaxRequests.forEach( function ( ajax, i ) {
                                                        mw.log.warn(
                                                                'AJAX request #' + i + ' (state: ' + ajax.xhr.state() + ')',
                                                                ajax.options