Merge "WebStart: Avoid DB or uselang for nonwrite-api-promise-error message"

[lhc/web/wiklou.git] / tests / phpunit / includes / api / ApiMainTest.php

diff --git a/tests/phpunit/includes/api/ApiMainTest.php b/tests/phpunit/includes/api/ApiMainTest.php
index 9cb84e2..580efcd 100644 (file)
--- a/tests/phpunit/includes/api/ApiMainTest.php
+++ b/tests/phpunit/includes/api/ApiMainTest.php
@@ -141,6 +141,7 @@ class ApiMainTest extends ApiTestCase {
        public function testSetCacheModeUnrecognized() {
                $api = new ApiMain();
                $api->setCacheMode( 'unrecognized' );
+               $this->resetServices();
                $this->assertSame(
                        'private',
                        TestingAccessWrapper::newFromObject( $api )->mCacheMode,
@@ -150,7 +151,6 @@ class ApiMainTest extends ApiTestCase {
 
        public function testSetCacheModePrivateWiki() {
                $this->setGroupPermissions( '*', 'read', false );
-
                $wrappedApi = TestingAccessWrapper::newFromObject( new ApiMain() );
                $wrappedApi->setCacheMode( 'public' );
                $this->assertSame( 'private', $wrappedApi->mCacheMode );
@@ -401,7 +401,7 @@ class ApiMainTest extends ApiTestCase {
                } else {
                        $user = new User();
                }
-               $user->mRights = $rights;
+               $this->overrideUserPermissions( $user, $rights );
                try {
                        $this->doApiRequest( [
                                'action' => 'query',
@@ -490,7 +490,7 @@ class ApiMainTest extends ApiTestCase {
         * @param int $status Expected response status
         * @param array $options Array of options:
         *   post => true Request is a POST
-        *   cdn => true CDN is enabled ($wgUseSquid)
+        *   cdn => true CDN is enabled ($wgUseCdn)
         */
        public function testCheckConditionalRequestHeaders(
                $headers, $conditions, $status, $options = []
@@ -508,7 +508,7 @@ class ApiMainTest extends ApiTestCase {
                $priv->mInternalMode = false;
 
                if ( !empty( $options['cdn'] ) ) {
-                       $this->setMwGlobals( 'wgUseSquid', true );
+                       $this->setMwGlobals( 'wgUseCdn', true );
                }
 
                // Can't do this in TestSetup.php because Setup.php will override it
@@ -531,7 +531,7 @@ class ApiMainTest extends ApiTestCase {
        }
 
        public static function provideCheckConditionalRequestHeaders() {
-               global $wgSquidMaxage;
+               global $wgCdnMaxAge;
                $now = time();
 
                return [
@@ -614,15 +614,15 @@ class ApiMainTest extends ApiTestCase {
                                [ [ 'If-Modified-Since' => 'a potato' ],
                                        [ 'last-modified' => wfTimestamp( TS_MW, $now - 1 ) ], 200 ],
 
-                       // Anything before $wgSquidMaxage seconds ago should be considered
+                       // Anything before $wgCdnMaxAge seconds ago should be considered
                        // expired.
                        'If-Modified-Since with CDN post-expiry' =>
-                               [ [ 'If-Modified-Since' => wfTimestamp( TS_RFC2822, $now - $wgSquidMaxage * 2 ) ],
-                                       [ 'last-modified' => wfTimestamp( TS_MW, $now - $wgSquidMaxage * 3 ) ],
+                               [ [ 'If-Modified-Since' => wfTimestamp( TS_RFC2822, $now - $wgCdnMaxAge * 2 ) ],
+                                       [ 'last-modified' => wfTimestamp( TS_MW, $now - $wgCdnMaxAge * 3 ) ],
                                        200, [ 'cdn' => true ] ],
                        'If-Modified-Since with CDN pre-expiry' =>
-                               [ [ 'If-Modified-Since' => wfTimestamp( TS_RFC2822, $now - $wgSquidMaxage / 2 ) ],
-                                       [ 'last-modified' => wfTimestamp( TS_MW, $now - $wgSquidMaxage * 3 ) ],
+                               [ [ 'If-Modified-Since' => wfTimestamp( TS_RFC2822, $now - $wgCdnMaxAge / 2 ) ],
+                                       [ 'last-modified' => wfTimestamp( TS_MW, $now - $wgCdnMaxAge * 3 ) ],
                                        304, [ 'cdn' => true ] ],
                ];
        }