Gergő Tisza has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/349097 )
Change subject: Switch TestingAccessWrapper to librarized version
......................................................................
Switch TestingAccessWrapper to librarized version
Change-Id: I173dbfc75ccf17ffca0bf3666c92540c0446ceb2
---
M composer.json
M tests/phpunit/WikimediaPageViewServiceTest.php
M tests/smoke/WikimediaPageViewServiceSmokeTest.php
3 files changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageViewInfo
refs/changes/97/349097/1
diff --git a/composer.json b/composer.json
index 9e0d685..25fad25 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.7.2"
+ "mediawiki/mediawiki-codesniffer": "0.7.2",
+ "wikimedia/testing-access-wrapper": "~1.0"
},
"scripts": {
"test": [
diff --git a/tests/phpunit/WikimediaPageViewServiceTest.php
b/tests/phpunit/WikimediaPageViewServiceTest.php
index f9accba..ae092c0 100644
--- a/tests/phpunit/WikimediaPageViewServiceTest.php
+++ b/tests/phpunit/WikimediaPageViewServiceTest.php
@@ -2,6 +2,8 @@
namespace MediaWiki\Extensions\PageViewInfo;
+use Wikimedia\TestingAccessWrapper;
+
class WikimediaPageViewServiceTest extends \PHPUnit_Framework_TestCase {
/** @var [ \PHPUnit_Framework_MockObject_MockObject, callable ] */
protected $calls = [];
@@ -32,7 +34,7 @@
) {
$mock = $this->getMockBuilder( \MWHttpRequest::class
)->disableOriginalConstructor()->getMock();
$this->calls[] = [ $mock, $assertUrl ];
- $wrapper = \TestingAccessWrapper::newFromObject( $service );
+ $wrapper = TestingAccessWrapper::newFromObject( $service );
$wrapper->requestFactory = function ( $url ) {
if ( !$this->calls ) {
$this->fail( 'Unexpected call!' );
@@ -52,7 +54,7 @@
* @param string $end YYYY-MM-DD
*/
protected function mockDate( WikimediaPageViewService $service, $end ) {
- $wrapper = \TestingAccessWrapper::newFromObject( $service );
+ $wrapper = TestingAccessWrapper::newFromObject( $service );
$wrapper->lastCompleteDay = strtotime( $end . 'T00:00Z' );
$wrapper->range = null;
}
diff --git a/tests/smoke/WikimediaPageViewServiceSmokeTest.php
b/tests/smoke/WikimediaPageViewServiceSmokeTest.php
index 3c47cc3..95a087e 100644
--- a/tests/smoke/WikimediaPageViewServiceSmokeTest.php
+++ b/tests/smoke/WikimediaPageViewServiceSmokeTest.php
@@ -4,6 +4,7 @@
use Status;
use StatusValue;
+use Wikimedia\TestingAccessWrapper;
class WikimediaPageViewServiceSmokeTest extends \PHPUnit_Framework_TestCase {
protected $data;
@@ -86,7 +87,7 @@
public function testRequestError() {
$service = $this->getService();
- $wrapper = \TestingAccessWrapper::newFromObject( $service );
+ $wrapper = TestingAccessWrapper::newFromObject( $service );
$wrapper->access = 'fail';
$logger = new \TestLogger( true, null, true );
$service->setLogger( $logger );
--
To view, visit https://gerrit.wikimedia.org/r/349097
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I173dbfc75ccf17ffca0bf3666c92540c0446ceb2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageViewInfo
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
