mirror of
https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git
synced 2024-12-01 02:37:05 +00:00
709772fa12
de76ab5
added the config,
`$wgVectorDefaultSkinVersionForExistingAccounts`. Its usage in
`Hooks::onUserGetDefaultOptions()` was invoked not only for existing
accounts but anonymous users _as well._ This is a bug, due to my own
misconceptions about the hook, that went against both the config's name
and its documentation.
Unfortunately, user sessions are unavailable in
`Hooks::onUserGetDefaultOptions()` so it does not seem to be possible to
determine whether the active user is an anonymous or existing account.
This patch drops the hook and centralizes all version determination
logic in SkinVersionLookup::getVersion(). SkinVersionLookup requires a
the active User object and can make the anonymous / existing account
determination by checking login state.
The issued was identified while responding to review feedback given by
@polishdeveloper / @pmiazga in
I52d80942b4270c008d4e45050589ed9220255a50.
Bug: T251415
Change-Id: I7982b4c34283ba81d0232ee6f501c44cf0a74b98
185 lines
4.7 KiB
PHP
185 lines
4.7 KiB
PHP
<?php
|
|
/**
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*
|
|
* @file
|
|
* @since 1.35
|
|
*/
|
|
|
|
use Vector\SkinVersionLookup;
|
|
|
|
/**
|
|
* @group Vector
|
|
* @coversDefaultClass \Vector\SkinVersionLookup
|
|
*/
|
|
class SkinVersionLookupTest extends \MediaWikiTestCase {
|
|
/**
|
|
* @covers ::isLegacy
|
|
* @covers ::getVersion
|
|
*/
|
|
public function testRequest() {
|
|
$request = $this->getMockBuilder( \WebRequest::class )->getMock();
|
|
$request
|
|
->method( 'getVal' )
|
|
->with( $this->anything(), $this->equalTo( 'beta' ) )
|
|
->willReturn( 'alpha' );
|
|
|
|
$user = $this->createMock( \User::class );
|
|
$user
|
|
->method( 'isLoggedIn' )
|
|
->willReturn( false );
|
|
$user
|
|
->method( 'getOption' )
|
|
->with( $this->anything(), $this->equalTo( '2' ) )
|
|
->willReturn( 'beta' );
|
|
|
|
$config = new HashConfig( [
|
|
'VectorDefaultSkinVersion' => '2',
|
|
'VectorDefaultSkinVersionForExistingAccounts' => '1'
|
|
] );
|
|
|
|
$skinVersionLookup = new SkinVersionLookup( $request, $user, $config );
|
|
|
|
$this->assertSame(
|
|
$skinVersionLookup->getVersion(),
|
|
'alpha',
|
|
'Query parameter is the first priority.'
|
|
);
|
|
$this->assertSame(
|
|
$skinVersionLookup->isLegacy(),
|
|
false,
|
|
'Version is non-Legacy.'
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @covers ::getVersion
|
|
* @covers ::isLegacy
|
|
*/
|
|
public function testUserPreference() {
|
|
$request = $this->getMockBuilder( \WebRequest::class )->getMock();
|
|
$request
|
|
->method( 'getVal' )
|
|
->with( $this->anything(), $this->equalTo( 'beta' ) )
|
|
->willReturn( 'beta' );
|
|
|
|
$user = $this->createMock( \User::class );
|
|
$user
|
|
->method( 'isLoggedIn' )
|
|
->willReturn( false );
|
|
$user
|
|
->method( 'getOption' )
|
|
->with( $this->anything(), $this->equalTo( '2' ) )
|
|
->willReturn( 'beta' );
|
|
|
|
$config = new HashConfig( [
|
|
'VectorDefaultSkinVersion' => '2',
|
|
'VectorDefaultSkinVersionForExistingAccounts' => '1'
|
|
] );
|
|
|
|
$skinVersionLookup = new SkinVersionLookup( $request, $user, $config );
|
|
|
|
$this->assertSame(
|
|
$skinVersionLookup->getVersion(),
|
|
'beta',
|
|
'User preference is the second priority.'
|
|
);
|
|
$this->assertSame(
|
|
$skinVersionLookup->isLegacy(),
|
|
false,
|
|
'Version is non-Legacy.'
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @covers ::getVersion
|
|
* @covers ::isLegacy
|
|
*/
|
|
public function testConfigLoggedIn() {
|
|
$request = $this->getMockBuilder( \WebRequest::class )->getMock();
|
|
$request
|
|
->method( 'getVal' )
|
|
->with( $this->anything(), $this->equalTo( '1' ) )
|
|
->willReturn( '1' );
|
|
|
|
$user = $this->createMock( \User::class );
|
|
$user
|
|
->method( 'isLoggedIn' )
|
|
->willReturn( true );
|
|
$user
|
|
->method( 'getOption' )
|
|
->with( $this->anything(), $this->equalTo( '1' ) )
|
|
->willReturn( '1' );
|
|
|
|
$config = new HashConfig( [
|
|
'VectorDefaultSkinVersion' => '2',
|
|
'VectorDefaultSkinVersionForExistingAccounts' => '1'
|
|
] );
|
|
|
|
$skinVersionLookup = new SkinVersionLookup( $request, $user, $config );
|
|
|
|
$this->assertSame(
|
|
$skinVersionLookup->getVersion(),
|
|
'1',
|
|
'Config is the third priority and distinguishes logged in users from anonymous users.'
|
|
);
|
|
$this->assertSame(
|
|
$skinVersionLookup->isLegacy(),
|
|
true,
|
|
'Version is Legacy.'
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @covers ::getVersion
|
|
* @covers ::isLegacy
|
|
*/
|
|
public function testConfigAnon() {
|
|
$request = $this->getMockBuilder( \WebRequest::class )->getMock();
|
|
$request
|
|
->method( 'getVal' )
|
|
->with( $this->anything(), $this->equalTo( '2' ) )
|
|
->willReturn( '2' );
|
|
|
|
$user = $this->createMock( \User::class );
|
|
$user
|
|
->method( 'isLoggedIn' )
|
|
->willReturn( false );
|
|
$user
|
|
->method( 'getOption' )
|
|
->with( $this->anything(), $this->equalTo( '2' ) )
|
|
->willReturn( '2' );
|
|
|
|
$config = new HashConfig( [
|
|
'VectorDefaultSkinVersion' => '2',
|
|
'VectorDefaultSkinVersionForExistingAccounts' => '1'
|
|
] );
|
|
|
|
$skinVersionLookup = new SkinVersionLookup( $request, $user, $config );
|
|
|
|
$this->assertSame(
|
|
$skinVersionLookup->getVersion(),
|
|
'2',
|
|
'Config is the third priority and distinguishes anonymous users from logged in users.'
|
|
);
|
|
$this->assertSame(
|
|
$skinVersionLookup->isLegacy(),
|
|
false,
|
|
'Version is non-Legacy.'
|
|
);
|
|
}
|
|
}
|