{{ msg('num-edits-size-interval') }}*
@@ -531,12 +533,34 @@
+ {### ProofreadPage quality changes ###}
+ {% if project.hasProofreadPage %}
+ {% set qualityChanges = ec.countQualityChanges %}
+ {% set qualityNames = project.prpQualityNames %}
+ {% if qualityChanges.total > 1 %}
+
+
+ {{ msg('proofreadpage-quality') }}
+
+
+
+ {% set qualityNames = project.prpQualityNames %}
+ {% endif %}
{{ msg('links') }}
@@ -100,6 +109,13 @@
{{ page.assessment.class ? page.assessment.class : msg('unknown') }}
{% endif %}
+ {% if project.isPrpPage(ns) %}
+
+
+ {{ qualityNames[page.prp_quality] }}
+
+
+ {% endif %}
{{ wiki.pageLogLinkRaw(pageTitle, project) }}
·
diff --git a/templates/topedits/result_namespace.wikitext.twig b/templates/topedits/result_namespace.wikitext.twig
index 674b8e906..0c6f2ea7e 100644
--- a/templates/topedits/result_namespace.wikitext.twig
+++ b/templates/topedits/result_namespace.wikitext.twig
@@ -15,6 +15,7 @@
==== {{ nsName(ns, project.namespaces) }} ====
{% set showPageAssessment = ns == 0 and project.hasPageAssessments %}
+{% set showProofreadQuality = project.hasProofreadPage and project.isPrpPage(ns) %}
{{ te.numPagesNamespace(ns) }} {{ msg('pages')|lower }}.
{| class="wikitable sortable"
! {{ msg('edits')|ucfirst }}
@@ -22,6 +23,9 @@
{% if showPageAssessment %}
! {{ msg('assessment') }}
{% endif %}
+{% if showProofreadQuality %}
+! {{ msg('proofreadpage-quality') }}{% set qualityNames = project.prpQualityNames %}
+{% endif %}
! {{ msg('links') }}
{% for page in pages %}
|-
@@ -32,6 +36,9 @@
{% if badge is defined %}
[[File:{{ badge }}|20px]] {{ page.assessment.class ? page.assessment.class : msg('unknown') }}
{% endif %}{% endif %}
+{% if showProofreadQuality %}
+| {{ qualityNames[page.prp_quality] }}
+{% endif %}
| [{% verbatim %}{{{% endverbatim %}fullurl:Special:Log|page={{ page.full_page_title|replace({' ': '_'}) }}}} {{ msg('log') }}] · [{{ url('PageInfoResult', {project:project.domain, page:page.full_page_title}) }} {{ msg('tool-pageinfo') }}] · [{{ url('TopEditsResultPage', {project:project.domain, username:user.usernameIdent, namespace:page.namespace, page:page.page_title}) }} {{ msg('tool-topedits') }}]
{% endfor %}
{% if pages|length >= 10 and te.topEdits|length > 1 %}
diff --git a/tests/Exception/XtoolsHttpExceptionTest.php b/tests/Exception/XtoolsHttpExceptionTest.php
new file mode 100644
index 000000000..4909dbe26
--- /dev/null
+++ b/tests/Exception/XtoolsHttpExceptionTest.php
@@ -0,0 +1,20 @@
+getRedirectUrl() );
+ static::assertEquals( [], $exception->getParams() );
+ static::assertFalse( $exception->isApi() );
+ }
+}
diff --git a/tests/Model/AdminStatsTest.php b/tests/Model/AdminStatsTest.php
index 94362cf12..00bce4bed 100644
--- a/tests/Model/AdminStatsTest.php
+++ b/tests/Model/AdminStatsTest.php
@@ -7,7 +7,6 @@
use App\Model\AdminStats;
use App\Model\Project;
use App\Repository\AdminStatsRepository;
-use App\Repository\ProjectRepository;
use App\Tests\TestAdapter;
/**
@@ -15,6 +14,7 @@
* @covers \App\Model\AdminStats
*/
class AdminStatsTest extends TestAdapter {
+
protected AdminStatsRepository $asRepo;
protected Project $project;
protected ProjectRepository $projectRepo;
@@ -33,11 +33,32 @@ public function setUp(): void {
$this->asRepo = $this->createMock( AdminStatsRepository::class );
// This logic is tested with integration tests.
- // Here we just stub empty arrays so AdminStats won't error outl.
+ // Here we just stub empty arrays so AdminStats won't error out.
$this->asRepo->method( 'getUserGroups' )
->willReturn( [ 'local' => [], 'global' => [] ] );
}
+ /**
+ * Test icons for each group.
+ * Note that this should be independant from everything,
+ * and so is static.
+ */
+ public function testGroupIcons(): void {
+ $this->asRepo->expects( static::once() )
+ ->method( 'getUserGroupIcons' )
+ ->willReturn( [
+ 'sysop' => 'https://upload.wikimedia.org/wikipedia/commons/thumb/e/e0/Mop.svg/18px-Mop.svg.png',
+ ] );
+ $as = new AdminStats( $this->asRepo, $this->project, 0, 0, 'admin', [] );
+ static::assertEquals( [
+ 'sysop' => 'https://upload.wikimedia.org/wikipedia/commons/thumb/e/e0/Mop.svg/18px-Mop.svg.png',
+ ], $as->getUserGroupIcons() );
+ // Test for wikitext; also implictly ensure we cache
+ static::assertEquals( [
+ 'sysop' => 'Mop.svg',
+ ], $as->getUserGroupIcons( true ) );
+ }
+
/**
* Basic getters.
*/
@@ -59,8 +80,10 @@ public function testBasics(): void {
static::assertEquals( 1483228800, $as->getStart() );
static::assertEquals( 1488326400, $as->getEnd() );
static::assertEquals( 60, $as->numDays() );
+ static::assertEquals( 'admin', $as->getType() );
static::assertSame( 1, $as->getNumInRelevantUserGroup() );
- static::assertSame( 1, $as->getNumWithActionsNotInGroup() );
+ static::assertSame( 1, $as->getNumWithActions() );
+ static::assertEquals( 2, $as->getNumWithActionsNotInGroup() );
}
/**
@@ -80,6 +103,8 @@ public function testAdminsAndGroups(): void {
],
$as->getUsersAndGroups()
);
+ // Ensure we cache
+ $as->getUsersAndGroups();
}
/**
@@ -95,22 +120,34 @@ public function testStats(): void {
// Test results.
static::assertEquals(
- [
- 'Bob' => array_merge(
- $this->adminStatsFactory()[0],
- [ 'user-groups' => [ 'sysop', 'checkuser' ] ]
- ),
- 'Sarah' => array_merge(
- // empty results
- $this->adminStatsFactory()[1],
- [ 'username' => 'Sarah', 'user-groups' => [ 'epcoordinator' ] ]
- ),
- ],
- $ret
+ array_merge(
+ $this->adminStatsFactory()[0],
+ [ 'user-groups' => [ 'sysop', 'checkuser' ] ]
+ ),
+ $ret['Bob']
+ );
+ static::assertEquals(
+ array_merge(
+ // empty results
+ $this->adminStatsFactory()[1],
+ [ 'username' => 'Sarah', 'user-groups' => [ 'epcoordinator' ] ]
+ ),
+ $ret['Sarah']
);
// At this point get stats should be the same.
static::assertEquals( $ret, $as->getStats() );
+
+ static::assertEquals( [
+ 'delete',
+ 'restore',
+ 'block',
+ 'unblock',
+ 'protect',
+ 'unprotect',
+ 'rights',
+ 'import',
+ ], array_values( $as->getActions() ) );
}
/**
@@ -140,6 +177,18 @@ private function adminStatsFactory(): array {
'unprotect' => 0,
'rights' => 0,
'import' => 0,
+ 'total' => 20,
+ ],
+ [
+ 'username' => 'Alice',
+ 'delete' => 0,
+ 'restore' => 0,
+ 'block' => 0,
+ 'unblock' => 0,
+ 'protect' => 0,
+ 'unprotect' => 0,
+ 'rights' => 0,
+ 'import' => 0,
'total' => 0,
],
];
@@ -157,15 +206,15 @@ public function testTotalsRow(): void {
$as->prepareStats();
static::assertEquals(
[
- 'delete' => 5 + 1,
- 'restore' => 3 + 0,
- 'block' => 0 + 0,
- 'unblock' => 1 + 0,
- 'protect' => 3 + 0,
- 'unprotect' => 2 + 0,
- 'rights' => 4 + 0,
- 'import' => 2 + 0,
- 'total' => 20 + 0,
+ 'delete' => 5 + 1 + 0,
+ 'restore' => 3 + 0 + 0,
+ 'block' => 0 + 0 + 0,
+ 'unblock' => 1 + 0 + 0,
+ 'protect' => 3 + 0 + 0,
+ 'unprotect' => 2 + 0 + 0,
+ 'rights' => 4 + 0 + 0,
+ 'import' => 2 + 0 + 0,
+ 'total' => 20 + 20 + 0,
],
$as->getTotalsRow()
);
diff --git a/tests/Model/AuthorshipTest.php b/tests/Model/AuthorshipTest.php
index 0ad6a27e8..cf158c800 100644
--- a/tests/Model/AuthorshipTest.php
+++ b/tests/Model/AuthorshipTest.php
@@ -9,8 +9,11 @@
use App\Model\Project;
use App\Repository\AuthorshipRepository;
use App\Repository\PageRepository;
+use App\Repository\ProjectRepository;
use App\Tests\TestAdapter;
+use GuzzleHttp\Exception\RequestException;
use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub\Stub;
/**
* @covers \App\Model\Authorship
@@ -22,7 +25,7 @@ class AuthorshipTest extends TestAdapter {
public function testAuthorship(): void {
/** @var AuthorshipRepository|MockObject $authorshipRepo */
$authorshipRepo = $this->createMock( AuthorshipRepository::class );
- $authorshipRepo->expects( $this->once() )
+ $authorshipRepo->expects( $this->exactly( 2 ) )
->method( 'getData' )
->willReturn( [
'revisions' => [ [
@@ -46,17 +49,31 @@ public function testAuthorship(): void {
],
] ],
] );
- $authorshipRepo->expects( $this->once() )
+ $authorshipRepo->expects( $this->exactly( 2 ) )
->method( 'getUsernamesFromIds' )
->willReturn( [
[ 'user_id' => 1, 'user_name' => 'Mick Jagger' ],
[ 'user_id' => 2, 'user_name' => 'Mr. Rogers' ],
] );
- $project = new Project( 'test.example.org' );
+ $projectRepo = $this->createMock( ProjectRepository::class );
+ $projectRepo->expects( static::once() )
+ ->method( 'getOne' )
+ ->willReturn( [
+ 'url' => 'https://en.wikipedia.org',
+ ] );
+ $project = new Project( 'en.wikipedia.org' );
+ $project->setRepository( $projectRepo );
$pageRepo = $this->createMock( PageRepository::class );
+ $pageRepo->expects( static::once() )
+ ->method( 'getPageInfo' )
+ ->willReturn( [
+ 'ns' => 0,
+ ] );
$page = new Page( $pageRepo, $project, 'Test page' );
$authorship = new Authorship( $authorshipRepo, $page, null, 2 );
$authorship->prepareData();
+ // Ensure caching
+ $authorship->prepareData();
static::assertEquals(
[
@@ -72,6 +89,8 @@ public function testAuthorship(): void {
$authorship->getList()
);
+ static::assertTrue( $authorship->isSupportedPage( $page ) );
+ static::assertNull( $authorship->getError() );
static::assertEquals( 3, $authorship->getTotalAuthors() );
static::assertEquals( 15, $authorship->getTotalCount() );
static::assertEquals( [
@@ -79,5 +98,58 @@ public function testAuthorship(): void {
'percentage' => 20.0,
'numEditors' => 1,
], $authorship->getOthers() );
+ static::assertEquals( [ 'id', 'timestamp' ], array_keys( $authorship->getRevision() ) );
+
+ // Test for a day-only target
+ $page = $this->createMock( Page::class );
+ $page->expects( static::once() )
+ ->method( 'getRevisionIdAtDate' )
+ ->willReturn( 1234 );
+ $authorship = new Authorship( $authorshipRepo, $page, '2001-02-03', 2 );
+ static::assertEquals( 1234, $authorship->getTarget() );
+
+ // Test for a raw ID target and limit null
+ $authorship = new Authorship( $authorshipRepo, $page, '1234', null );
+ static::assertEquals( 1234, $authorship->getTarget() );
+ $authorship->prepareData();
+ }
+
+ /**
+ * Test prepareData's reaction to unexpected getData responses
+ * @dataProvider getDataEdgeCasesProvider
+ * @param Stub $data
+ * @param int|null $expected
+ */
+ public function testGetDataEdgeCases( Stub $data, ?int $expected ): void {
+ $authorshipRepo = $this->createMock( AuthorshipRepository::class );
+ $authorshipRepo->expects( static::once() )
+ ->method( 'getData' )
+ ->will( $data );
+ $page = $this->createMock( Page::class );
+ $authorship = new Authorship( $authorshipRepo, $page, null );
+ $authorship->prepareData();
+ static::assertEquals( $expected, $authorship->getTotalAuthors() );
+ }
+
+ public function getDataEdgeCasesProvider(): array {
+ return [
+ 'getData requestException' => [
+ $this->throwException( $this->createMock( RequestException::class ) ),
+ null,
+ ],
+ 'getData no key revisions' => [
+ $this->returnValue( [] ),
+ null,
+ ],
+ 'getData no key tokens' => [
+ $this->returnValue( [
+ 'revisions' => [ [ '123' => [
+ 'time' => '2018-04-16T13:51:11Z',
+ 'tokens' => []
+ ] ] ]
+ ] ),
+ 0,
+ ],
+ ];
}
}
diff --git a/tests/Model/AutoEditsTest.php b/tests/Model/AutoEditsTest.php
index 1adbe404c..6fcd1c782 100644
--- a/tests/Model/AutoEditsTest.php
+++ b/tests/Model/AutoEditsTest.php
@@ -115,10 +115,10 @@ public function testGetNonAutomatedEdits(): void {
$page,
array_merge( $rev, [ 'user' => $this->user ] )
);
- static::assertEquals( $edit, $autoEdits->getNonAutomatedEdits()[0] );
+ static::assertEquals( $edit, $autoEdits->getNonAutomatedEdits( false )[0] );
// One more time to ensure things are re-queried.
- static::assertEquals( $edit, $autoEdits->getNonAutomatedEdits()[0] );
+ static::assertEquals( $edit, $autoEdits->getNonAutomatedEdits( false )[0] );
}
/**
@@ -191,10 +191,10 @@ public function testGetAutomatedEdits(): void {
$page,
array_merge( $rev, [ 'user' => $this->user ] )
);
- static::assertEquals( $edit, $autoEdits->getAutomatedEdits()[0] );
+ static::assertEquals( $edit, $autoEdits->getAutomatedEdits( false )[0] );
// One more time to ensure things are re-queried.
- static::assertEquals( $edit, $autoEdits->getAutomatedEdits()[0] );
+ static::assertEquals( $edit, $autoEdits->getAutomatedEdits( false )[0] );
}
/**
diff --git a/tests/Model/BlameTest.php b/tests/Model/BlameTest.php
index b64bc6b11..968c81b15 100644
--- a/tests/Model/BlameTest.php
+++ b/tests/Model/BlameTest.php
@@ -5,11 +5,13 @@
namespace App\Tests\Model;
use App\Model\Blame;
+use App\Model\Edit;
use App\Model\Page;
use App\Model\Project;
use App\Repository\BlameRepository;
use App\Repository\PageRepository;
use App\Tests\TestAdapter;
+use GuzzleHttp\Exception\RequestException;
/**
* @covers \App\Model\Blame
@@ -67,20 +69,76 @@ public function testPrepareData(): void {
'o_rev_id' => 3,
'editor' => 'Matthewrbowker',
'str' => 'foobar',
+ ], [
+ 'o_rev_id' => 4,
+ 'editor' => 'Alien333',
+ 'str' => 'ooba',
+ ], [
+ 'o_rev_id' => 4,
+ 'editor' => 'Alien333',
+ 'str' => 'bad',
],
],
],
] ],
] );
+ $mockEdit = $this->createMock( 'App\Model\Edit' );
$this->blameRepo->expects( $this->exactly( 2 ) )
->method( 'getEditFromRevId' )
- ->willReturn( $this->createMock( 'App\Model\Edit' ) );
+ ->willReturn( $mockEdit );
$blame = new Blame( $this->blameRepo, $this->page, 'Foo bar' );
$blame->prepareData();
$matches = $blame->getMatches();
+ // test it does cache
+ $blame->prepareData();
static::assertCount( 2, $matches );
+ static::assertEquals( [ $mockEdit, $mockEdit ], $blame->getEdits() );
static::assertEquals( [ 3, 1 ], array_keys( $matches ) );
}
+
+ /**
+ * Test fallback for Wikiwho errors
+ */
+ public function testPrepareFallback(): void {
+ $this->blameRepo->expects( static::once() )
+ ->method( 'getData' )
+ ->willThrowException( $this->createMock( RequestException::class ) );
+ $blame = new Blame( $this->blameRepo, $this->page, 'Foo bar' );
+ $blame->prepareData();
+ static::assertTrue( !isset( $blame->matches ) );
+ }
+
+ /**
+ * @dataProvider asOfProvider
+ * @param string|null $target
+ * @param Edit|null $edit
+ */
+ public function testAsOf( ?string $target, ?Edit $edit ): void {
+ $blameRepo = $this->createMock( BlameRepository::class );
+ $blameRepo->expects( static::exactly( $target ? 1 : 0 ) )
+ ->method( 'getEditFromRevId' )
+ ->willReturn( $edit );
+ $blame = new Blame( $blameRepo, $this->page, 'Foo bar', $target );
+ static::assertEquals( $edit, $blame->getAsOf() );
+ // Get a second time to check caching
+ static::assertEquals( $edit, $blame->getAsOf() );
+ }
+
+ /**
+ * @return array
+ */
+ public function asOfProvider(): array {
+ return [
+ [
+ "1234",
+ $this->createMock( Edit::class ),
+ ],
+ [
+ null,
+ null,
+ ],
+ ];
+ }
}
diff --git a/tests/Model/CategoryEditsTest.php b/tests/Model/CategoryEditsTest.php
index 08772101b..c08808d85 100644
--- a/tests/Model/CategoryEditsTest.php
+++ b/tests/Model/CategoryEditsTest.php
@@ -82,22 +82,24 @@ public function testBasics(): void {
* Methods around counting edits in category.
*/
public function testCategoryCounts(): void {
+ $counts = [
+ 'Living_people' => [ 'editCount' => 150, 'pageCount' => 10 ],
+ 'Musicians_from_New_York_City' => [ 'editCount' => 50, 'pageCount' => 1 ],
+ ];
$this->ceRepo->expects( $this->once() )
->method( 'countCategoryEdits' )
->willReturn( 200 );
$this->ceRepo->expects( $this->once() )
->method( 'getCategoryCounts' )
- ->willReturn( [
- 'Living_people' => 150,
- 'Musicians_from_New_York_City' => 50,
- ] );
+ ->willReturn( $counts );
$this->ce->setRepository( $this->ceRepo );
static::assertEquals( 500, $this->ce->getEditCount() );
static::assertEquals( 200, $this->ce->getCategoryEditCount() );
+ static::assertEquals( 11, $this->ce->getCategoryPageCount() );
static::assertEquals( 40.0, $this->ce->getCategoryPercentage() );
static::assertEquals(
- [ 'Living_people' => 150, 'Musicians_from_New_York_City' => 50 ],
+ $counts,
$this->ce->getCategoryCounts()
);
diff --git a/tests/Model/EditCounterTest.php b/tests/Model/EditCounterTest.php
index aaa04c778..049c49131 100644
--- a/tests/Model/EditCounterTest.php
+++ b/tests/Model/EditCounterTest.php
@@ -33,6 +33,7 @@ class EditCounterTest extends TestAdapter {
protected ProjectRepository $projectRepo;
protected User $user;
protected UserRepository $userRepo;
+ protected AutomatedEditsHelper $autoEdits;
/**
* Set up shared mocks and class instances.
@@ -51,6 +52,7 @@ public function setUp(): void {
$this->userRepo = $this->createMock( UserRepository::class );
$this->user = new User( $this->userRepo, 'Testuser' );
+ $this->autoEdits = $this->createMock( AutomatedEditsHelper::class );
$this->editCounter = new EditCounter(
$this->editCounterRepo,
@@ -58,7 +60,7 @@ public function setUp(): void {
$this->createMock( UserRights::class ),
$this->project,
$this->user,
- $this->createMock( AutomatedEditsHelper::class )
+ $this->autoEdits,
);
$this->editCounter->setRepository( $this->editCounterRepo );
}
@@ -72,6 +74,7 @@ public function testLogCounts(): void {
->method( 'getLogCounts' )
->willReturn( [
'delete-delete' => 0,
+ 'delete-restore' => 2,
'move-move' => 1,
'block-block' => 2,
'block-reblock' => 3,
@@ -129,6 +132,23 @@ public function testLogCounts(): void {
static::assertEquals( 10, $this->editCounter->approvals() );
static::assertEquals( 3, $this->editCounter->accountsCreated() );
static::assertEquals( 9, $this->editCounter->reviews() );
+ static::assertEquals( 2, $this->editCounter->countPagesRestored() );
+ }
+
+ /**
+ * Test counts of Commons uploads and local/Commons moves
+ */
+ public function testFileCounts(): void {
+ $this->editCounterRepo->expects( static::exactly( 3 ) )
+ ->method( 'getFileCounts' )
+ ->willReturn( [
+ 'files_moved' => 1,
+ 'files_moved_commons' => 2,
+ 'files_uploaded_commons' => 3,
+ ] );
+ static::assertEquals( 3, $this->editCounter->countFilesUploadedCommons() );
+ static::assertSame( 1, $this->editCounter->countFilesMoved() );
+ static::assertEquals( 2, $this->editCounter->countFilesMovedCommons() );
}
/**
@@ -144,6 +164,8 @@ public function testLiveAndDeletedEdits(): void {
'minor' => 5,
'day' => 10,
'week' => 15,
+ 'edited-live' => 2,
+ 'edited-deleted' => 2,
] );
static::assertEquals( 100, $this->editCounter->countLiveRevisions() );
@@ -153,6 +175,20 @@ public function testLiveAndDeletedEdits(): void {
static::assertEquals( 5, $this->editCounter->countMinorRevisions() );
static::assertEquals( 10, $this->editCounter->countRevisionsInLast( 'day' ) );
static::assertEquals( 15, $this->editCounter->countRevisionsInLast( 'week' ) );
+ static::assertEquals( 27.5, $this->editCounter->averageRevisionsPerPage() );
+ $this->editCounterRepo->expects( static::once() )->method( 'getFirstAndLatestActions' )->willReturn( [
+ 'rev_first' => [
+ 'id' => 123,
+ 'timestamp' => '20170510100000',
+ 'type' => null,
+ ],
+ 'rev_latest' => [
+ 'id' => 321,
+ 'timestamp' => '20170515150000',
+ 'type' => null,
+ ],
+ ] );
+ static::assertEquals( 22, $this->editCounter->averageRevisionsPerDay() );
}
/**
@@ -195,6 +231,24 @@ public function testFirstLastActions(): void {
static::assertEquals( 5, $this->editCounter->getDays() );
}
+ /**
+ * Test the fallback if one of rev_first or rev_latest doesn't have a timestamp
+ */
+ public function testMissingTimestamps(): void {
+ $this->editCounterRepo->expects( static::once() )->method( 'getFirstAndLatestActions' )->willReturn( [
+ 'rev_first' => [
+ 'id' => 123,
+ 'type' => null,
+ ],
+ 'rev_latest' => [
+ 'id' => 321,
+ 'type' => null,
+ ],
+ ] );
+ static::assertSame( 0, (int)$this->editCounter->getDays() );
+ static::assertSame( 0, (int)$this->editCounter->averageRevisionsPerDay() );
+ }
+
/**
* Test that page counts are reported correctly.
*/
@@ -217,6 +271,20 @@ public function testPageCounts(): void {
static::assertEquals( 8, $this->editCounter->countPagesCreated() );
}
+ /**
+ * Test fallbacks for when no pages were edited
+ */
+ public function testNoPages(): void {
+ $this->editCounterRepo->expects( static::once() )
+ ->method( 'getPairData' )
+ ->willReturn( [
+ 'edited-live' => 0,
+ 'edited-deleted' => 0,
+ ] );
+ static::assertSame( 0, (int)$this->editCounter->countAllPagesEdited() );
+ static::assertSame( 0, (int)$this->editCounter->averageRevisionsPerPage() );
+ }
+
/**
* Test that namespace totals are reported correctly.
*/
@@ -351,7 +419,7 @@ public function testYearCounts(): void {
// Mock current time by passing it in (dummy parameter, so to speak).
$yearCounts = $this->editCounter->yearCounts( new DateTime( '2017-04-30 23:59:59' ) );
- // Make sure zeros were filled in for months with no edits, and for each namespace.
+ // Make sure zeros were filled in for years with no edits, and for each namespace.
static::assertArraySubset(
[
2015 => 0,
@@ -377,20 +445,102 @@ public function testYearCounts(): void {
// Labels for the years
static::assertEquals( [ '2015', '2016', '2017' ], $yearCounts['yearLabels'] );
+
+ // Mock current time by passing it in (dummy parameter, so to speak).
+ $yearCountsWithNamespaces = $this->editCounter->yearCountsWithNamespaces(
+ new DateTime( '2017-04-30 23:59:59' )
+ );
+
+ // Make sure zeros were filled in for years with no edits, and for each namespace.
+ static::assertArraySubset(
+ [
+ 0 => 10,
+ 1 => 0,
+ ],
+ $yearCountsWithNamespaces[2016]
+ );
+
+ // Assert that only active years are reported
+ static::assertEquals( [ 2015, 2016, 2017 ], array_keys( $yearCountsWithNamespaces ) );
+
+ // Assert that only active namespaces are reported.
+ static::assertEquals( [ 0, 1 ], array_keys( $yearCountsWithNamespaces[2016] ) );
+
+ // Ensure we are caching that and will not make the query again
+ $this->editCounter->yearCounts( new DateTime( '2017-04-30 23:59:59' ) );
+ }
+
+ /**
+ * Test reordering and filling of timecard values
+ */
+ public function testTimeCard(): void {
+ $this->editCounterRepo->expects( static::once() )
+ ->method( "getTimeCard" )
+ ->willReturn( [
+ [
+ // Sunday, 2 AM
+ 'day_of_week' => 1,
+ 'hour' => 2,
+ 'value' => 42,
+ ],
+ [
+ // Wednesday, 3 PM
+ 'day_of_week' => 4,
+ 'hour' => 15,
+ 'value' => 33,
+ ],
+ ] );
+ $results = $this->editCounter->timeCard();
+ $hours = range( 0, 23 );
+ $days = range( 1, 7 );
+ // The hours are seven cycles from 0 to 23
+ static::assertEquals(
+ array_merge( ...array_fill( 0, 7, $hours ) ),
+ array_map( static fn ( $row ) => $row['hour'], $results )
+ );
+ // The days are 24 of each of the seven, in order
+ static::assertEquals(
+ array_merge( ...array_map( static fn ( $day ) => array_fill( 0, 24, $day ), $days ) ),
+ array_map( static fn ( $row ) => $row['day_of_week'], $results )
+ );
+ // All values are positive
+ static::assertCount(
+ 0,
+ array_filter( $results, static fn ( $row ) => (int)$row['value'] < 0 )
+ );
+
+ // Ensure we are caching and will not query again
+ $this->editCounter->timeCard();
}
/**
- * Ensure parsing of log_params properly works, based on known formats
+ * Test block logic
* @dataProvider longestBlockProvider
* @param array $blockLog
* @param int $longestDuration
+ * @param int $blockCount
*/
- public function testLongestBlockSeconds( array $blockLog, int $longestDuration ): void {
+ public function testBlocks( array $blockLog, int $longestDuration, int $blockCount ): void {
$this->editCounterRepo->expects( static::once() )
->method( 'getBlocksReceived' )
->with( $this->project, $this->user )
->willReturn( $blockLog );
- static::assertEquals( $this->editCounter->getLongestBlockSeconds(), $longestDuration );
+ static::assertEquals( $longestDuration, $this->editCounter->getLongestBlockSeconds() );
+ $a = array_filter(
+ $this->editCounter->getBlocks( 'received' ),
+ // static fn ( $block ) => !in_array( $block['log_action'], [ 'block', 'reblock' ] )
+ static function ( $block ) {
+ return !( $block['log_action'] === 'block' || $block['log_action'] === 'reblock' );
+ }
+ );
+ foreach ( $a as $x ) {
+ static::assertEquals( -3, $x['log_timestamp'] );
+ }
+ static::assertCount( 0, $a );
+ static::assertEquals( $blockCount, $this->editCounter->countBlocksReceived() );
+
+ // Ensure it is cached and we do not make that query a second time
+ $this->editCounter->getLongestBlockSeconds();
}
/**
@@ -415,6 +565,7 @@ public function longestBlockProvider(): array {
] ],
// 31 days in seconds.
2678400,
+ 2,
],
// Blocks that do overlap, without any unblocks. Combined 10 days.
[
@@ -432,6 +583,7 @@ public function longestBlockProvider(): array {
] ],
// 10 days in seconds.
864000,
+ 2,
],
// 30 day block that was later unblocked at only 10 days, followed by a shorter block.
[
@@ -454,6 +606,7 @@ public function longestBlockProvider(): array {
] ],
// 10 days in seconds.
864000,
+ 2,
],
// Blocks ending with a still active indefinite block. Older block uses legacy format.
[
@@ -470,16 +623,18 @@ public function longestBlockProvider(): array {
] ],
// Indefinite
-1,
+ 2,
],
// Block that's active, with an explicit expiry set.
[
[ [
'log_timestamp' => '20170927203624',
- 'log_params' => 'a:2:{s:11:"5::duration";s:29:"Sat, 06 Oct 2026 12:36:00 GMT"' .
+ 'log_params' => 'a:2:{s:11:"5::duration";s:29:"Sat, 06 Oct 9999 12:36:00 GMT"' .
';s:8:"6::flags";s:11:"noautoblock";}',
'log_action' => 'block',
] ],
- 285091176,
+ 251888543976,
+ 1,
],
// Two indefinite blocks.
[
@@ -496,6 +651,30 @@ public function longestBlockProvider(): array {
'log_action' => 'reblock',
] ],
-1,
+ 2,
+ ],
+ // No blocks; 0 seconds
+ [
+ [],
+ 0,
+ 0,
+ ],
+ // Finite block that was reblocked to infinite
+ [
+ [ [
+ 'log_timestamp' => '20160513200200',
+ 'log_params' => 'a:2:{s:11:"5::duration";s:10:"24 hours"' .
+ ';s:8:"6::flags";s:19:"nocreate,nousertalk";}',
+ 'log_action' => 'block',
+ ],
+ [
+ 'log_timestamp' => '20160717021328',
+ 'log_params' => 'a:2:{s:11:"5::duration";s:8:"infinite"' .
+ ';s:8:"6::flags";s:31:"nocreate,noautoblock,nousertalk";}',
+ 'log_action' => 'reblock',
+ ] ],
+ -1,
+ 2,
],
];
}
@@ -558,4 +737,65 @@ public function blockLogProvider(): array {
],
];
}
+
+ /**
+ * Test counting of edit data
+ * @dataProvider editDataProvider
+ * @param array $data
+ * @param array $qualityChanges
+ * @param int|float $averageSize
+ * @param int $autoEdits
+ */
+ public function testEditData(
+ array $data,
+ array $qualityChanges,
+ $averageSize,
+ int $autoEdits,
+ ): void {
+ $this->autoEdits->expects( isset( $data['tag_lists'] ) ? static::once() : static::never() )
+ ->method( "getTags" )
+ ->willReturn( [
+ 'AWB',
+ ] );
+ $this->editCounterRepo->expects( static::once() )
+ ->method( "getEditData" )
+ ->willReturn( $data );
+ static::assertEquals( $qualityChanges, $this->editCounter->countQualityChanges() );
+ static::assertEquals( $averageSize, $this->editCounter->averageEditSize() );
+ static::assertEquals( $autoEdits, $this->editCounter->countAutoEdits() );
+ }
+
+ /**
+ * Data for self::testEditData
+ * @return array
+ */
+ public function editDataProvider(): array {
+ return [
+ [
+ [
+ 'tag_lists' => [
+ [ 'randomtag', 'proofreadpage-quality1' ],
+ [ 'proofreadpage-quality2', 'proofreadpage-quality0' ],
+ [ 'AWB' ],
+ [ 'proofreadpage-quality2', 'AWB' ],
+ [ 'proofreadpage-quality3', 'a' ],
+ [ 'proofreadpagequality0', 'proofreadpage-quality3' ],
+ [ 'prp-quality0', 'proofreadpage-quality3' ],
+ ],
+ 'average_size' => 3.1415926,
+ ],
+ [ 0 => 0, 1 => 1, 2 => 2, 3 => 3, 4 => 0, 'total' => 6 ],
+ 3.142,
+ 2,
+ ],
+ [
+ [
+ // Empty
+ ],
+ [ 0 => 0, 1 => 0, 2 => 0, 3 => 0, 4 => 0, 'total' => 0 ],
+ 0,
+ 0,
+ ],
+ ];
+ }
}
diff --git a/tests/Model/EditTest.php b/tests/Model/EditTest.php
index ee99c2bd7..c887a95fb 100644
--- a/tests/Model/EditTest.php
+++ b/tests/Model/EditTest.php
@@ -58,6 +58,9 @@ public function setUp(): void {
'general' => [
'articlePath' => '/wiki/$1',
],
+ 'namespaces' => [
+ 1 => 'Talk',
+ ],
] );
$this->project->setRepository( $this->projectRepo );
$this->pageRepo = $this->createMock( PageRepository::class );
@@ -95,6 +98,9 @@ public function testBasic(): void {
static::assertEquals( 'abcdef', $edit->getSha() );
static::assertSame( '1', $edit->getCacheKey() );
static::assertFalse( $edit->isReverted() );
+ // Test fallback for invalid timestamp
+ $edit = $this->getEditFactory( [ 'timestamp' => [] ] );
+ static::assertEquals( new DateTime( '1970-01-01T00:00:00Z' ), $edit->getTimestamp() );
}
/**
@@ -136,6 +142,15 @@ public function testWikifiedComment(): void {
'https://example.org',
$edit->getWikifiedSummary()
);
+
+ $edit = $this->getEditFactory( [
+ 'comment' => '/* Section */',
+ ] );
+ static::assertEquals(
+ "→" .
+ "Section: ",
+ $edit->getWikifiedSummary()
+ );
}
/**
@@ -188,13 +203,14 @@ public function testIsAutomated(): void {
* Test some basic getters.
*/
public function testGetters(): void {
- $edit = $this->getEditFactory();
+ $edit = $this->getEditFactory( [ 'tags' => json_encode( [ 'A', 'B' ] ) ] );
static::assertSame( '2017', $edit->getYear() );
static::assertSame( '01', $edit->getMonth() );
static::assertEquals( 12, $edit->getLength() );
static::assertEquals( 2, $edit->getSize() );
static::assertEquals( 2, $edit->getLengthChange() );
static::assertEquals( 'Testuser', $edit->getUser()->getUsername() );
+ static::assertContains( 'A', $edit->getTags() );
}
/**
@@ -235,13 +251,19 @@ public function testIsAnon(): void {
}
public function testGetForJson(): void {
+ $pageRepo = $this->createMock( PageRepository::class );
+ $pageRepo->method( 'getPageInfo' )
+ ->willReturn( [
+ 'ns' => 1,
+ ] );
+ $this->page = new Page( $pageRepo, $this->project, 'Talk:Test_page' );
$edit = $this->getEditFactory();
static::assertEquals(
[
'project' => 'en.wikipedia.org',
'username' => 'Testuser',
'page_title' => 'Test page',
- 'namespace' => $this->page->getNamespace(),
+ 'namespace' => 1,
'rev_id' => 1,
'timestamp' => '2017-01-01T10:00:00Z',
'minor' => false,
diff --git a/tests/Model/GlobalContribsTest.php b/tests/Model/GlobalContribsTest.php
index abd60d000..9d85c1e65 100644
--- a/tests/Model/GlobalContribsTest.php
+++ b/tests/Model/GlobalContribsTest.php
@@ -73,8 +73,39 @@ public function testGlobalEditCounts(): void {
/**
* Test global edits.
+ * @dataProvider globalEditsProvider
+ * @param array $contribs
+ * @param array $projects
+ * @param int $count
+ * @param int $projectCount
*/
- public function testGlobalEdits(): void {
+ public function testGlobalEdits(
+ array $contribs,
+ array $projects,
+ int $count,
+ int $projectCount
+ ): void {
+ $globalContribsRepo = $this->createMock( GlobalContribsRepository::class );
+ $globalContribsRepo->expects( static::exactly( 2 + ( count( $projects ) ? 0 : 1 ) ) )
+ ->method( 'getProjectsWithEdits' )
+ ->willReturn( $projects );
+ $globalContribsRepo->expects( static::any() )
+ ->method( 'getRevisions' )
+ ->willReturn( $contribs );
+ $this->globalContribs->setRepository( $globalContribsRepo );
+
+ $edits = $this->globalContribs->globalEdits();
+
+ static::assertCount( $count, $edits );
+ if ( $count > 0 ) {
+ static::assertEquals( 'My user page', $edits['1514764800-1']->getComment() );
+ }
+ static::assertEquals( $projectCount, $this->globalContribs->numProjectsWithEdits() );
+
+ $this->globalContribs->globalEdits();
+ }
+
+ public function globalEditsProvider(): array {
/** @var ProjectRepository|MockObject $wiki1Repo */
$wiki1Repo = $this->createMock( ProjectRepository::class );
$wiki1Repo->expects( static::once() )
@@ -88,8 +119,7 @@ public function testGlobalEdits(): void {
] );
$wiki1 = new Project( 'wiki1' );
$wiki1->setRepository( $wiki1Repo );
-
- $contribs = [ [
+ $edit = [ [
'dbName' => 'wiki1',
'id' => 1,
'timestamp' => '20180101000000',
@@ -104,19 +134,26 @@ public function testGlobalEdits(): void {
'namespace' => '2',
'comment' => 'My user page',
] ];
-
- $this->globalContribsRepo->expects( static::once() )
- ->method( 'getProjectsWithEdits' )
- ->willReturn( [
- 'wiki1' => $wiki1,
- ] );
- $this->globalContribsRepo->expects( static::once() )
- ->method( 'getRevisions' )
- ->willReturn( $contribs );
-
- $edits = $this->globalContribs->globalEdits();
-
- static::assertCount( 1, $edits );
- static::assertEquals( 'My user page', $edits['1514764800-1']->getComment() );
+ return [
+ [
+ // Dataset #0: normal case. 1 edit, 1 project
+ $edit,
+ [ 'wiki1' => $wiki1 ],
+ 1,
+ 1,
+ ], [
+ // Dataset #1: project for edit is null
+ $edit,
+ [ 'wiki1' => null ],
+ 0,
+ 1,
+ ], [
+ // Dataset #2: no projects and no edit
+ [],
+ [],
+ 0,
+ 0,
+ ],
+ ];
}
}
diff --git a/tests/Model/PageAssessmentsTest.php b/tests/Model/PageAssessmentsTest.php
index e1f9af907..8f15ecac6 100644
--- a/tests/Model/PageAssessmentsTest.php
+++ b/tests/Model/PageAssessmentsTest.php
@@ -63,7 +63,13 @@ public function testBasics(): void {
* Badges
*/
public function testBadges(): void {
- $pa = new PageAssessments( $this->paRepo, $this->project );
+ $config = $this->paRepo->getConfig( $this->project );
+ $config['class']['Unknown'] = null;
+ $paRepo = $this->createMock( PageAssessmentsRepository::class );
+ $paRepo->expects( $this->once() )
+ ->method( 'getConfig' )
+ ->willReturn( $config );
+ $pa = new PageAssessments( $paRepo, $this->project );
static::assertEquals(
'https://upload.wikimedia.org/wikipedia/commons/b/bc/Featured_article_star.svg',
@@ -74,6 +80,11 @@ public function testBadges(): void {
'Featured_article_star.svg',
$pa->getBadgeURL( 'FA', true )
);
+
+ static::assertSame(
+ '',
+ $pa->getBadgeURL( 'Bonjour', true )
+ );
}
/**
@@ -87,7 +98,7 @@ public function testGetAssessments(): void {
] );
$page = new Page( $pageRepo, $this->project, 'Test_page' );
- $this->paRepo->expects( $this->once() )
+ $this->paRepo->expects( $this->exactly( 2 ) )
->method( 'getAssessments' )
->with( $page )
->willReturn( [
@@ -106,6 +117,7 @@ public function testGetAssessments(): void {
$pa = new PageAssessments( $this->paRepo, $this->project );
$assessments = $pa->getAssessments( $page );
+ $assessment = $pa->getAssessment( $page );
// Picks the first assessment.
static::assertEquals( [
@@ -114,7 +126,67 @@ public function testGetAssessments(): void {
'category' => 'Category:Start-Class articles',
'badge' => 'https://upload.wikimedia.org/wikipedia/commons/a/a4/Symbol_start_class.svg',
], $assessments['assessment'] );
+ static::assertEquals( [
+ 'color' => '#FFAA66',
+ 'category' => 'Category:Start-Class articles',
+ 'badge' => 'https://upload.wikimedia.org/wikipedia/commons/a/a4/Symbol_start_class.svg',
+ 'value' => 'Start',
+ ], $assessment );
static::assertCount( 2, $assessments['wikiprojects'] );
}
+
+ public function testWrongNsAssessments(): void {
+ $pageRepo = $this->createMock( PageRepository::class );
+ $pageRepo->method( 'getPageInfo' )->willReturn( [
+ 'title' => 'Talk:Test Page',
+ 'ns' => 1,
+ ] );
+ $page = new Page( $pageRepo, $this->project, 'Talk:Test_page' );
+ $pa = new PageAssessments( $this->paRepo, $this->project );
+ static::assertFalse( $pa->getAssessment( $page ) );
+ static::assertNull( $pa->getAssessments( $page ) );
+ }
+
+ public function testUnknownAssessment(): void {
+ $pageRepo = $this->createMock( PageRepository::class );
+ $pageRepo->method( 'getPageInfo' )->willReturn( [
+ 'title' => 'Test Page',
+ 'ns' => 6,
+ ] );
+ $page = new Page( $pageRepo, $this->project, 'Test_page' );
+ $this->paRepo->expects( static::exactly( 2 ) )
+ ->method( 'getAssessments' )
+ ->willReturn( [] );
+ $pa = new PageAssessments( $this->paRepo, $this->project );
+ static::assertEquals( [
+ 'badge' => 'https://upload.wikimedia.org/wikipedia/commons/e/e0/Symbol_question.svg',
+ 'color' => '',
+ 'category' => 'Category:Unassessed articles',
+ 'value' => '???',
+ ], $pa->getAssessment( $page ) );
+ static::assertEquals( [], $pa->getAssessments( $page ) );
+ }
+
+ public function testImportanceFromUnknownAssessment(): void {
+ $pa = new PageAssessments( $this->paRepo, $this->project );
+ static::assertEquals( [
+ 'color' => '',
+ 'category' => 'Category:Unknown-importance articles',
+ 'weight' => 0,
+ 'value' => '???',
+ ], $pa->getImportanceFromAssessment( [ 'importance' => '' ] ) );
+ }
+
+ public function testImportanceWithMissingConfig(): void {
+ // To make it happy about being used once:
+ $this->paRepo->getConfig( $this->project );
+ // Also ensures we don't use it by mistake in the next tests.
+ $paRepo = $this->createMock( PageAssessmentsRepository::class );
+ $paRepo->expects( static::once() )
+ ->method( 'getConfig' )
+ ->willReturn( [] );
+ $pa = new PageAssessments( $paRepo, $this->project );
+ static::assertNull( $pa->getImportanceFromAssessment( [ 'importance' => '' ] ) );
+ }
}
diff --git a/tests/Model/PageInfoTest.php b/tests/Model/PageInfoTest.php
index 29ee9b783..14d4dd8e7 100644
--- a/tests/Model/PageInfoTest.php
+++ b/tests/Model/PageInfoTest.php
@@ -16,6 +16,7 @@
use App\Repository\PageRepository;
use App\Repository\UserRepository;
use App\Tests\TestAdapter;
+use DateTime;
use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
use ReflectionClass;
@@ -47,7 +48,7 @@ public function setUp(): void {
$i18nHelper = static::getContainer()->get( 'app.i18n_helper' );
$this->project = $this->getMockEnwikiProject();
$this->pageRepo = $this->createMock( PageRepository::class );
- $this->page = new Page( $this->pageRepo, $this->project, 'Test page' );
+ $this->page = $this->createMock( Page::class );
$this->editRepo = $this->createMock( EditRepository::class );
$this->editRepo->method( 'getAutoEditsHelper' )
->willReturn( $autoEditsHelper );
@@ -62,8 +63,7 @@ public function setUp(): void {
$this->page
);
- // Don't care that private methods "shouldn't" be tested...
- // In PageInfo they are all super test-worthy and otherwise fragile.
+ // Used to set a few private properties without having to recreate everything
$this->reflectionClass = new ReflectionClass( $this->pageInfo );
}
@@ -71,9 +71,11 @@ public function setUp(): void {
* Number of revisions
*/
public function testNumRevisions(): void {
- $this->pageRepo->expects( $this->once() )
+ $this->setupData();
+ $this->page->expects( static::once() )
->method( 'getNumRevisions' )
->willReturn( 10 );
+ $this->pageInfo->prepareData();
static::assertEquals( 10, $this->pageInfo->getNumRevisions() );
// Should be cached (will error out if repo's getNumRevisions is called again).
static::assertEquals( 10, $this->pageInfo->getNumRevisions() );
@@ -86,7 +88,7 @@ public function testNumRevisions(): void {
* @param int $assertion
*/
public function testRevisionsProcessed( int $numRevisions, int $assertion ): void {
- $this->pageRepo->method( 'getNumRevisions' )->willReturn( $numRevisions );
+ $this->page->method( 'getNumRevisions' )->willReturn( $numRevisions );
static::assertEquals(
$this->pageInfo->getNumRevisionsProcessed(),
$assertion
@@ -108,17 +110,31 @@ public function revisionsProcessedProvider(): array {
* Whether there are too many revisions to process.
*/
public function testTooManyRevisions(): void {
- $this->pageRepo->expects( $this->once() )
+ $this->page->expects( static::once() )
->method( 'getNumRevisions' )
->willReturn( 1000000 );
static::assertTrue( $this->pageInfo->tooManyRevisions() );
}
/**
- * Getting the number of edits made to the page by current or former bots.
+ * Various bot-related methods
*/
- public function testBotRevisionCount(): void {
- $bots = [
+ public function testBots(): void {
+ $this->pageInfoRepo->expects( static::once() )
+ ->method( 'getBotData' )
+ ->willReturn( [
+ [
+ 'username' => 'Foo',
+ 'count' => 3,
+ 'current' => '1',
+ ],
+ [
+ 'username' => 'Bar',
+ 'count' => 12,
+ 'current' => '0',
+ ],
+ ] );
+ static::assertEquals( [
'Foo' => [
'count' => 3,
'current' => true,
@@ -127,16 +143,75 @@ public function testBotRevisionCount(): void {
'count' => 12,
'current' => false,
],
- ];
+ ], $this->pageInfo->getBots() );
+ static::assertEquals( 2, $this->pageInfo->getNumBots() );
+ static::assertEquals( 15, $this->pageInfo->getBotRevisionCount() );
+ // second time for caching
+ static::assertEquals( 15, $this->pageInfo->getBotRevisionCount() );
+ }
- static::assertEquals(
- 15,
- $this->pageInfo->getBotRevisionCount( $bots )
- );
+ public function testTopEditorsByEditCount(): void {
+ $this->pageInfoRepo->expects( static::once() )
+ ->method( 'getTopEditorsByEditCount' )
+ ->willReturn( [
+ [
+ 'username' => 'Foo',
+ 'count' => 22,
+ 'minor' => 6,
+ 'first_revid' => 100,
+ 'first_timestamp' => '10000101000100',
+ 'latest_revid' => 300,
+ 'latest_timestamp' => '10000101000300',
+ ],
+ [
+ 'username' => 'Bar',
+ 'count' => 20,
+ 'minor' => 4,
+ 'first_revid' => 200,
+ 'first_timestamp' => '10000101000200',
+ 'latest_revid' => 400,
+ 'latest_timestamp' => '10000101000400',
+ ],
+ ] );
+ static::assertEquals( [
+ [
+ 'rank' => 1,
+ 'username' => 'Foo',
+ 'count' => 22,
+ 'minor' => 6,
+ 'first_edit' => [
+ 'id' => 100,
+ 'timestamp' => '1000-01-01T00:01:00Z',
+ ],
+ 'latest_edit' => [
+ 'id' => 300,
+ 'timestamp' => '1000-01-01T00:03:00Z',
+ ],
+ ],
+ [
+ 'rank' => 2,
+ 'username' => 'Bar',
+ 'count' => 20,
+ 'minor' => 4,
+ 'first_edit' => [
+ 'id' => 200,
+ 'timestamp' => '1000-01-01T00:02:00Z',
+ ],
+ 'latest_edit' => [
+ 'id' => 400,
+ 'timestamp' => '1000-01-01T00:04:00Z',
+ ],
+ ],
+ ], $this->pageInfo->getTopEditorsByEditCount() );
+ // Test caching
+ $this->pageInfo->getTopEditorsByEditCount();
}
public function testLinksAndRedirects(): void {
- $this->pageRepo->expects( $this->once() )
+ $this->setupData();
+ // Ensure we don't call the revisions (the second time will complain).
+ $this->pageInfo->prepareData();
+ $this->page->expects( static::once() )
->method( 'countLinksAndRedirects' )
->willReturn( [
'links_ext_count' => 5,
@@ -144,29 +219,47 @@ public function testLinksAndRedirects(): void {
'links_in_count' => 10,
'redirects_count' => 0,
] );
- $this->page->setRepository( $this->pageRepo );
static::assertEquals( 5, $this->pageInfo->linksExtCount() );
static::assertEquals( 3, $this->pageInfo->linksOutCount() );
static::assertEquals( 10, $this->pageInfo->linksInCount() );
static::assertSame( 0, $this->pageInfo->redirectsCount() );
}
+ public function testBugs(): void {
+ $this->page->expects( static::once() )
+ ->method( 'getErrors' )
+ ->willReturn( [] );
+ static::assertSame( [], $this->pageInfo->getBugs() );
+ // Ensure caching
+ static::assertSame( [], $this->pageInfo->getBugs() );
+ static::assertSame( 0, $this->pageInfo->numBugs() );
+ }
+
/**
* Test some of the more important getters.
*/
public function testGetters(): void {
- $edits = $this->setupData();
+ $this->setupData();
+ $this->pageInfo->prepareData();
+ static::assertEquals(
+ 32,
+ $this->pageInfo->getFirstEdit()->getId()
+ );
+ static::assertEquals(
+ 60,
+ $this->pageInfo->getLastEdit()->getId()
+ );
static::assertEquals( 3, $this->pageInfo->getNumEditors() );
static::assertEquals( 2, $this->pageInfo->getAnonCount() );
static::assertEquals( 40, $this->pageInfo->anonPercentage() );
static::assertEquals( 3, $this->pageInfo->getMinorCount() );
static::assertEquals( 60, $this->pageInfo->minorPercentage() );
static::assertSame( 1, $this->pageInfo->getBotRevisionCount() );
- static::assertEquals( 93, $this->pageInfo->getTotalDays() );
- static::assertEquals( 18, (int)$this->pageInfo->averageDaysPerEdit() );
+ static::assertEquals( 63, $this->pageInfo->getTotalDays() );
+ static::assertEquals( 12, (int)$this->pageInfo->averageDaysPerEdit() );
static::assertSame( 0, (int)$this->pageInfo->editsPerDay() );
- static::assertEquals( 1.6, $this->pageInfo->editsPerMonth() );
+ static::assertEquals( 2.4, $this->pageInfo->editsPerMonth() );
static::assertEquals( 5, $this->pageInfo->editsPerYear() );
static::assertEquals( 1.7, $this->pageInfo->editsPerEditor() );
static::assertEquals( 2, $this->pageInfo->getAutomatedCount() );
@@ -175,20 +268,11 @@ public function testGetters(): void {
static::assertEquals( 80, $this->pageInfo->topTenPercentage() );
static::assertEquals( 4, $this->pageInfo->getTopTenCount() );
- static::assertEquals(
- $edits[0]->getId(),
- $this->pageInfo->getFirstEdit()->getId()
- );
- static::assertEquals(
- $edits[4]->getId(),
- $this->pageInfo->getLastEdit()->getId()
- );
-
static::assertSame( 1, $this->pageInfo->getMaxAddition()->getId() );
static::assertEquals( 32, $this->pageInfo->getMaxDeletion()->getId() );
static::assertEquals(
- [ 'Mick Jagger', '192.168.0.1', '192.168.0.2' ],
+ [ 'Mick Jagger', '192.168.0.2', '192.168.0.1' ],
array_keys( $this->pageInfo->getEditors() )
);
static::assertEquals(
@@ -232,6 +316,106 @@ public function testGetters(): void {
);
static::assertSame( 1, $this->pageInfo->numDeletedRevisions() );
+ static::assertEquals( 2, $this->pageInfo->getMobileCount() );
+ static::assertEquals( 2, $this->pageInfo->getVisualCount() );
+ }
+
+ /**
+ * Test max removal reverting.
+ * Could theoretically be done above but would require changing many values.
+ */
+ public function testMaxRemovalRevert(): void {
+ $this->page->expects( static::once() )
+ ->method( 'getRevisions' )
+ ->willReturn( [
+ [
+ 'id' => 1,
+ 'timestamp' => '20010203040506',
+ 'minor' => '0',
+ 'length' => '30',
+ 'length_change' => '-1',
+ 'username' => null,
+ 'comment' => 'Foo bar',
+ 'rev_sha1' => 'aaaaaa',
+ ],
+ [
+ 'id' => 2,
+ 'timestamp' => '20010203040506',
+ 'minor' => '0',
+ 'length' => '30',
+ 'length_change' => '-2',
+ 'username' => null,
+ 'comment' => 'Foo bar',
+ 'rev_sha1' => 'bbbbbb',
+ ],
+ [
+ 'id' => 3,
+ 'timestamp' => '20010203040508',
+ 'minor' => '0',
+ 'length' => '30',
+ 'length_change' => '2',
+ 'username' => null,
+ 'comment' => 'Foo bar',
+ 'rev_sha1' => 'aaaaaa',
+ ],
+ ] );
+ $this->pageInfoRepo->expects( static::exactly( 3 ) )
+ ->method( 'getEdit' )
+ ->willReturnCallback( fn ( $page, $rev ) => new Edit( $this->editRepo, $this->userRepo, $page, $rev ) );
+ $this->pageInfo->prepareData();
+ static::assertSame( 1, $this->pageInfo->getMaxDeletion()->getId() );
+ }
+
+ /**
+ * Make sure we don't divide by 0
+ */
+ public function testEmptyFallbacks(): void {
+ $this->page->expects( static::once() )
+ ->method( 'getRevisions' )
+ ->willReturn( [
+ [
+ 'id' => 1,
+ 'timestamp' => '20010203040506',
+ 'minor' => '0',
+ 'length' => '30',
+ 'length_change' => '30',
+ 'username' => null,
+ 'comment' => 'Foo bar',
+ 'rev_sha1' => 'aaaaaa',
+ 'tags' => '["mobile edit"]',
+ ],
+ ] );
+ $this->pageInfoRepo->expects( static::once() )
+ ->method( 'getEdit' )
+ ->willReturnCallback( fn ( $page, $rev ) => new Edit( $this->editRepo, $this->userRepo, $page, $rev ) );
+ $this->pageInfo->prepareData();
+ static::assertSame( 0, (int)$this->pageInfo->editsPerDay() );
+ static::assertSame( 0, (int)$this->pageInfo->editsPerMonth() );
+ static::assertSame( 0, (int)$this->pageInfo->editsPerYear() );
+ static::assertSame( 0, (int)$this->pageInfo->editsPerEditor() );
+ }
+
+ public function testCountHistory(): void {
+ $this->page->expects( static::once() )
+ ->method( 'getRevisions' )
+ ->willReturn( [
+ [
+ 'id' => 1,
+ 'timestamp' => ( new DateTime( 'now' ) )->format( 'YmdHis' ),
+ 'minor' => '0',
+ 'length' => '30',
+ 'length_change' => '30',
+ 'username' => null,
+ 'comment' => 'Foo bar',
+ 'rev_sha1' => 'aaaaaa',
+ 'tags' => '["mobile edit"]',
+ ],
+ ] );
+ $this->pageInfoRepo->expects( static::once() )
+ ->method( 'getEdit' )
+ ->willReturnCallback( fn ( $page, $rev ) => new Edit( $this->editRepo, $this->userRepo, $page, $rev ) );
+ $this->pageInfo->prepareData();
+ static::assertEquals( [ 1, 1, 1, 1 ], array_values( $this->pageInfo->getCountHistory() ) );
}
/**
@@ -239,6 +423,7 @@ public function testGetters(): void {
*/
public function testMonthYearCounts(): void {
$this->setupData();
+ $this->pageInfo->prepareData();
$yearMonthCounts = $this->pageInfo->getYearMonthCounts();
@@ -253,21 +438,15 @@ public function testMonthYearCounts(): void {
], $yearMonthCounts[2016] );
static::assertEquals(
- [ '07', '08', '09', '10', '11', '12' ],
+ [ '08', '09', '10', '11', '12' ],
array_keys( $yearMonthCounts[2016]['months'] )
);
static::assertEquals(
- [ '2016-07', '2016-08', '2016-09', '2016-10', '2016-11', '2016-12' ],
+ [ '2016-08', '2016-09', '2016-10', '2016-11', '2016-12' ],
$this->pageInfo->getMonthLabels()
);
// Just test a few, not every month.
- static::assertArraySubset( [
- 'all' => 1,
- 'minor' => 0,
- 'anon' => 0,
- 'automated' => 0,
- ], $yearMonthCounts[2016]['months']['07'] );
static::assertArraySubset( [
'all' => 3,
'minor' => 2,
@@ -282,7 +461,7 @@ public function testMonthYearCounts(): void {
public function testLogEvents(): void {
$this->setupData();
- $this->pageInfoRepo->expects( $this->once() )
+ $this->pageInfoRepo->expects( static::once() )
->method( 'getLogEvents' )
->willReturn( [
[
@@ -293,47 +472,57 @@ public function testLogEvents(): void {
'log_type' => 'delete',
'timestamp' => '20160905000000',
],
+ [
+ 'log_type' => 'delete',
+ 'timestamp' => '20160905000001',
+ ],
[
'log_type' => 'move',
'timestamp' => '20161005000000',
],
] );
- $method = $this->reflectionClass->getMethod( 'setLogsEvents' );
- $method->setAccessible( true );
- $method->invoke( $this->pageInfo );
-
+ $this->pageInfo->prepareData();
$yearMonthCounts = $this->pageInfo->getYearMonthCounts();
// Just test a few, not every month.
static::assertEquals( [
'protections' => 1,
- 'deletions' => 1,
+ 'deletions' => 2,
'moves' => 1,
], $yearMonthCounts[2016]['events'] );
}
/**
- * Use ReflectionClass to set up some data and populate the class properties for testing.
- *
- * We don't care that private methods "shouldn't" be tested...
- * In PageInfo the update methods are all super test-worthy and otherwise fragile.
- *
- * @return Edit[] Array of Edit objects that represent the revision history.
+ * Make sure that setLogEvents does nothing when yearMonthCounts is not set
*/
- private function setupData(): array {
- $edits = [
- new Edit( $this->editRepo, $this->userRepo, $this->page, [
+ public function testLogEventsFallback(): void {
+ // Intentionally don't setup, so addYearMonthCountEntry never gets called
+ $this->pageInfoRepo->expects( static::once() )
+ ->method( 'getLogEvents' )
+ ->willReturn( [ [ 'timestamp' => 'yesterday' ] ] );
+ // Will call setLogEvents under the hood
+ $this->pageInfo->prepareData();
+ static::assertSame( [], $this->pageInfo->getYearMonthCounts() );
+ }
+
+ /**
+ * Set repository returns
+ */
+ private function setupData(): void {
+ $revisions = [
+ [
'id' => 1,
- 'timestamp' => '20160701101205',
+ 'timestamp' => '20160801000001',
'minor' => '0',
'length' => '30',
'length_change' => '30',
'username' => 'Mick Jagger',
'comment' => 'Foo bar',
'rev_sha1' => 'aaaaaa',
- ] ),
- new Edit( $this->editRepo, $this->userRepo, $this->page, [
+ 'tags' => '["mobile edit"]',
+ ],
+ [
'id' => 32,
'timestamp' => '20160801000000',
'minor' => '1',
@@ -342,28 +531,31 @@ private function setupData(): array {
'username' => 'Mick Jagger',
'comment' => 'Blah',
'rev_sha1' => 'bbbbbb',
- ] ),
- new Edit( $this->editRepo, $this->userRepo, $this->page, [
+ 'tags' => '[]',
+ ],
+ [
'id' => 40,
'timestamp' => '20161003000000',
'minor' => '0',
'length' => '15',
- 'length_change' => '-10',
+ 'length_change' => '1000',
'username' => '192.168.0.1',
'comment' => 'Weeee using [[WP:AWB|AWB]]',
'rev_sha1' => 'cccccc',
- ] ),
- new Edit( $this->editRepo, $this->userRepo, $this->page, [
+ 'tags' => '["mobile edit","visualeditor"]',
+ ],
+ [
'id' => 50,
'timestamp' => '20161003010000',
'minor' => '1',
'length' => '25',
- 'length_change' => '10',
+ 'length_change' => '-1000',
'username' => '192.168.0.2',
'comment' => 'I undo your edit cuz it bad',
'rev_sha1' => 'bbbbbb',
- ] ),
- new Edit( $this->editRepo, $this->userRepo, $this->page, [
+ 'tags' => '["visualeditor"]',
+ ],
+ [
'id' => 60,
'timestamp' => '20161003020000',
'minor' => '1',
@@ -373,47 +565,21 @@ private function setupData(): array {
'comment' => 'Weeee using [[WP:AWB|AWB]]',
'rev_sha1' => 'ddddd',
'rev_deleted' => Edit::DELETED_USER,
- ] ),
- ];
-
- $prevEdits = [
- 'prev' => null,
- 'prevSha' => null,
- 'maxAddition' => null,
- 'maxDeletion' => null,
+ 'tags' => '[]',
+ ],
];
-
- $prop = $this->reflectionClass->getProperty( 'firstEdit' );
- $prop->setAccessible( true );
- $prop->setValue( $this->pageInfo, $edits[0] );
-
- $prop = $this->reflectionClass->getProperty( 'numRevisionsProcessed' );
- $prop->setAccessible( true );
- $prop->setValue( $this->pageInfo, 5 );
-
- $prop = $this->reflectionClass->getProperty( 'bots' );
- $prop->setAccessible( true );
- $prop->setValue( $this->pageInfo, [
- 'XtoolsBot' => [ 'count' => 1 ],
- ] );
-
- $prop = $this->reflectionClass->getProperty( 'numDeletedRevisions' );
- $prop->setAccessible( true );
- $prop->setValue( $this->pageInfo, 1 );
-
- $method = $this->reflectionClass->getMethod( 'updateCounts' );
- $method->setAccessible( true );
- $prevEdits = $method->invoke( $this->pageInfo, $edits[0], $prevEdits );
- $prevEdits = $method->invoke( $this->pageInfo, $edits[1], $prevEdits );
- $prevEdits = $method->invoke( $this->pageInfo, $edits[2], $prevEdits );
- $prevEdits = $method->invoke( $this->pageInfo, $edits[3], $prevEdits );
- $method->invoke( $this->pageInfo, $edits[4], $prevEdits );
-
- $method = $this->reflectionClass->getMethod( 'doPostPrecessing' );
- $method->setAccessible( true );
- $method->invoke( $this->pageInfo );
-
- return $edits;
+ $this->page->expects( static::once() )
+ ->method( 'getRevisions' )
+ ->willReturn( $revisions );
+ $this->pageInfoRepo->expects( static::exactly( count( $revisions ) ) )
+ ->method( 'getEdit' )
+ ->willReturnCallback( fn ( $page, $rev ) => new Edit( $this->editRepo, $this->userRepo, $page, $rev ) );
+ $this->pageInfoRepo->expects( static::once() )
+ ->method( 'getBotData' )
+ ->willReturn( [ [ 'count' => 1, 'username' => 'XtoolsBot', 'current' => 1 ] ] );
+ $this->pageInfoRepo->expects( static::any() )
+ ->method( 'getMaxPageRevisions' )
+ ->willReturn( 10 );
}
/**
@@ -425,10 +591,9 @@ public function testProseStats(): void {
$ret = $client->request( 'GET', 'https://en.wikipedia.org/api/rest_v1/page/html/Hanksy/747629772' )
->getBody()
->getContents();
- $this->pageRepo->expects( $this->once() )
+ $this->page->expects( static::once() )
->method( 'getHTMLContent' )
->willReturn( $ret );
- $this->page->setRepository( $this->pageRepo );
static::assertEquals( [
'bytes' => 1539,
@@ -438,6 +603,44 @@ public function testProseStats(): void {
'unique_references' => 12,
'sections' => 2,
], $this->pageInfo->getProseStats() );
+ // Test caching
+ $this->pageInfo->getProseStats();
+ }
+
+ /**
+ * Ensure we react appropriately when getHTMLContent fails
+ */
+ public function testProseStatFallback(): void {
+ $this->page->expects( static::once() )
+ ->method( 'getHTMLContent' )
+ ->willThrowException( $this->createMock( BadGateWayException::class ) );
+ static::assertNull( $this->pageInfo->getProseStats() );
+ }
+
+ /**
+ * Ensure we don't divide by 0 when the page had no added text
+ */
+ public function testZeroAddedBytes(): void {
+ $this->page->expects( static::once() )
+ ->method( 'getRevisions' )
+ ->willReturn( [
+ [
+ 'id' => 1,
+ 'timestamp' => '20160801000001',
+ 'minor' => '0',
+ 'length' => '0',
+ 'length_change' => '0',
+ 'username' => 'Mick Jagger',
+ 'comment' => 'Foo bar',
+ 'rev_sha1' => 'aaaaaa',
+ 'tags' => '["mobile edit"]',
+ ],
+ ] );
+ $this->pageInfoRepo->expects( static::once() )
+ ->method( 'getEdit' )
+ ->willReturnCallback( fn ( $page, $rev ) => new Edit( $this->editRepo, $this->userRepo, $page, $rev ) );
+ $this->pageInfo->prepareData();
+ static::assertSame( 0, $this->pageInfo->topTenEditorsByAdded()[0]['percentage'] );
}
/**
@@ -445,14 +648,16 @@ public function testProseStats(): void {
*/
public function testWithDates(): void {
$this->setupData();
+ $this->pageInfo->prepareData();
- $prop = $this->reflectionClass->getProperty( 'start' );
- $prop->setAccessible( true );
- $prop->setValue( $this->pageInfo, strtotime( '2016-06-30' ) );
+ $start = $this->reflectionClass->getProperty( 'start' );
+ $start->setValue( $this->pageInfo, strtotime( '2016-06-30' ) );
- $prop = $this->reflectionClass->getProperty( 'end' );
- $prop->setAccessible( true );
- $prop->setValue( $this->pageInfo, strtotime( '2016-10-14' ) );
+ $end = $this->reflectionClass->getProperty( 'end' );
+ $end->setValue( $this->pageInfo, strtotime( '2016-10-14' ) );
+
+ $meth = $this->reflectionClass->getMethod( 'getLastDay' );
+ $lastDayOfMonth = $meth->invoke( $this->pageInfo );
static::assertTrue( $this->pageInfo->hasDateRange() );
static::assertEquals( '2016-06-30', $this->pageInfo->getStartDate() );
@@ -461,21 +666,25 @@ public function testWithDates(): void {
'start' => '2016-06-30',
'end' => '2016-10-14',
], $this->pageInfo->getDateParams() );
+ static::assertEquals( strtotime( '2016-10-31' ), $lastDayOfMonth );
// Uses length of last edit because there is a date range.
static::assertEquals( 20, $this->pageInfo->getLength() );
// Pageviews with a date range.
- $this->pageRepo->expects( $this->once() )
+ $this->page->expects( static::once() )
->method( 'getPageviews' )
- ->with( $this->page, '2016-06-30', '2016-10-14' )
- ->willReturn( [
- 'items' => [
- [ 'views' => 1000 ],
- [ 'views' => 500 ],
- ],
- ] );
+ ->willReturn( 1500 );
static::assertEquals( 1500, $this->pageInfo->getPageviews()['count'] );
+
+ // no dates
+ $start->setValue( $this->pageInfo, false );
+ $end->setValue( $this->pageInfo, false );
+ $this->page->expects( static::once() )
+ ->method( 'getLength' )
+ ->willReturn( 42 );
+ static::assertEquals( [], $this->pageInfo->getDateParams() );
+ static::assertEquals( 42, $this->pageInfo->getLength() );
}
/**
@@ -498,14 +707,12 @@ public function testTransclusionData(): void {
}
public function testPageviews(): void {
- $this->pageRepo->expects( $this->once() )
+ $this->page->expects( static::exactly( $this->pageInfo->hasDateRange() ? 1 : 0 ) )
->method( 'getPageviews' )
- ->willReturn( [
- 'items' => [
- [ 'views' => 1000 ],
- [ 'views' => 500 ],
- ],
- ] );
+ ->willReturn( 1500 );
+ $this->page->expects( static::exactly( $this->pageInfo->hasDateRange() ? 0 : 1 ) )
+ ->method( 'getLatestPageviews' )
+ ->willReturn( 1500 );
static::assertEquals( [
'count' => 1500,
@@ -517,9 +724,12 @@ public function testPageviews(): void {
}
public function testPageviewsFailing(): void {
- $this->pageRepo->expects( $this->once() )
+ $this->page->expects( static::exactly( $this->pageInfo->hasDateRange() ? 1 : 0 ) )
->method( 'getPageviews' )
- ->willThrowException( $this->createMock( BadGatewayException::class ) );
+ ->willReturn( null );
+ $this->page->expects( static::exactly( $this->pageInfo->hasDateRange() ? 0 : 1 ) )
+ ->method( 'getLatestPageviews' )
+ ->willReturn( null );
static::assertEquals( [
'count' => null,
diff --git a/tests/Model/PageTest.php b/tests/Model/PageTest.php
index 42e451050..0e9b0f20c 100644
--- a/tests/Model/PageTest.php
+++ b/tests/Model/PageTest.php
@@ -12,6 +12,7 @@
use App\Repository\UserRepository;
use App\Tests\TestAdapter;
use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
+use GuzzleHttp\Exception\ClientException;
use Psr\Log\LoggerInterface;
/**
@@ -57,6 +58,30 @@ public function testTitles(): void {
static::assertEquals( 'talk:Test Page_3', $page->getTitle( true ) );
}
+ /**
+ * A Page can be built through processing of a database row
+ */
+ public function testNewFromRow(): void {
+ $pageRepo = $this->createMock( PageRepository::class );
+ $data = [
+ [ [ 'page_title' => 'A', 'namespace' => 0 ], 'A' ],
+ [ [ 'page_title' => 'B', 'namespace' => 1, 'length' => 4, ], 'Talk:B' ],
+ ];
+ $project = $this->createMock( Project::class );
+ $project->expects( static::once() )
+ ->method( 'getNamespaces' )
+ ->willReturn( [
+ 0 => '',
+ 1 => 'Talk',
+ ] );
+ foreach ( $data as [ $row, $fullPageTitle ] ) {
+ $page = Page::newFromRow( $pageRepo, $project, $row );
+ static::assertEquals( $row['namespace'], $page->getNamespace() );
+ static::assertInstanceOf( Page::class, $page );
+ static::assertEquals( $fullPageTitle, $page->getTitle( true ) );
+ }
+ }
+
/**
* A page either exists or doesn't.
*/
@@ -94,6 +119,9 @@ public function testBasicGetters(): void {
'Talk',
'User',
] );
+ $project->expects( static::once() )
+ ->method( 'getLang' )
+ ->willReturn( 'en' );
$pageRepo = $this->createMock( PageRepository::class );
$pageRepo->expects( $this->once() )
@@ -111,14 +139,20 @@ public function testBasicGetters(): void {
$page = new Page( $this->pageRepo, $project, 'User:Test:123' );
$page->setRepository( $pageRepo );
+ // Should set the pageInfo
+ static::assertEquals( 2, $page->getNamespace() );
static::assertEquals( 42, $page->getId() );
static::assertEquals( 'https://example.org/User:Test:123', $page->getUrl() );
static::assertEquals( 5000, $page->getWatchers() );
static::assertEquals( 300, $page->getLength() );
- static::assertEquals( 2, $page->getNamespace() );
static::assertEquals( 'User', $page->getNamespaceName() );
static::assertEquals( 'Q95', $page->getWikidataId() );
static::assertEquals( 'Test:123', $page->getTitleWithoutNamespace() );
+ // Intentionally defaults to project lang
+ static::assertEquals( 'en', $page->getLang() );
+ // Ensure caching
+ static::assertEquals( 300, $page->getLength() );
+ static::assertEquals( 2, $page->getNamespace() );
}
/**
@@ -134,6 +168,24 @@ public function testWikitext(): void {
static::assertStringContainsString( '{{Main Page banner}}', $content );
}
+ /**
+ * Test fetching of HTML
+ */
+ public function testHtml(): void {
+ $page = new Page( $this->pageRepo, $this->getMockEnwikiProject(), 'A' );
+ // 01:01:01 UTC, January 1, 2001
+ $date = new \DateTime( '20010101010101' );
+ $this->pageRepo->expects( static::once() )
+ ->method( 'getRevisionIdAtDate' )
+ ->with( $page, $date )
+ ->willReturn( 1234 );
+ $this->pageRepo->expects( static::once() )
+ ->method( 'getHTMLContent' )
+ ->with( $page, 1234 )
+ ->willReturn( 'Hello' );
+ static::assertEquals( 'Hello', $page->getHTMLContent( $date ) );
+ }
+
/**
* Tests wikidata item getter.
*/
@@ -163,6 +215,8 @@ public function testWikidataItems(): void {
$page->setRepository( $pageRepo );
static::assertArraySubset( $wikidataItems, $page->getWikidataItems() );
+ // Ensure that we count the above
+ static::assertEquals( 2, $page->countWikidataItems() );
// If no wikidata item...
$pageRepo2 = $this->createMock( PageRepository::class );
@@ -212,9 +266,43 @@ public function testUsersEdits(): void {
$page = new Page( $this->pageRepo, new Project( 'exampleWiki' ), 'Page' );
$user = new User( $this->createMock( UserRepository::class ), 'Testuser' );
static::assertCount( 2, $page->getRevisions( $user ) );
+ // Test caching
+ static::assertCount( 2, $page->getRevisions( $user ) );
static::assertEquals( 2, $page->getNumRevisions() );
}
+ /**
+ * Cases for counting of number of edits
+ */
+ public function testNumRevisions(): void {
+ $pageRepo = $this->createMock( PageRepository::class );
+ $pageRepo->expects( static::exactly( 2 ) )
+ ->method( 'getNumRevisions' )
+ ->willReturn( 42 );
+ $pageRepo->expects( static::once() )
+ ->method( 'getRevisions' )
+ ->willReturn( [] );
+ $page = new Page( $pageRepo, new Project( 'examplewiki' ), 'Page' );
+
+ // #1: user given, so we query repo and don't cache
+ static::assertEquals( 42, $page->getNumRevisions( $this->createMock( User::class ) ) );
+
+ // #2: revisions happens to be set, so count that. doesn't query repo, but caches
+ static::assertEquals( [], $page->getRevisions() );
+ static::assertSame( 0, $page->getNumRevisions() );
+ // Test caching
+ static::assertSame( 0, $page->getNumRevisions() );
+
+ // #3: normal case, go out of our way to check
+ // reset caching
+ $page = new Page( $pageRepo, new Project( 'examplewiki' ), 'Page' );
+ // queries repo for the second time
+ static::assertEquals( 42, $page->getNumRevisions() );
+
+ // #4: caching did work. If it doesn't we call the Repo method a third time
+ static::assertEquals( 42, $page->getNumRevisions() );
+ }
+
/**
* Test getErros and getCheckWikiErrors.
*/
@@ -270,10 +358,17 @@ public function testPageviews(): void {
static::assertEquals( 3500, $page->getLatestPageviews( 30 ) );
// When the API fails.
- $this->pageRepo->expects( $this->once() )
+ $this->pageRepo->expects( static::once() )
->method( 'getPageviews' )
->willThrowException( $this->createMock( BadGatewayException::class ) );
static::assertNull( $page->getPageviews( '20230101', '20230131' ) );
+ // 404, must return 0
+ $pageRepo = $this->createMock( PageRepository::class );
+ $pageRepo->expects( static::once() )
+ ->method( 'getPageviews' )
+ ->willThrowException( $this->createMock( ClientException::class ) );
+ $page = new Page( $pageRepo, new Project( 'exampleWiki' ), 'Page' );
+ static::assertSame( 0, $page->getPageviews( '20230101', '20230131' ) );
}
/**
diff --git a/tests/Model/PagesTest.php b/tests/Model/PagesTest.php
index deb39c5a6..fe4dae414 100644
--- a/tests/Model/PagesTest.php
+++ b/tests/Model/PagesTest.php
@@ -85,9 +85,9 @@ public function provideSummaryColumnsData(): array {
public function testResults(): void {
$this->setPagesResults();
- $pages = new Pages( $this->pagesRepo, $this->project, $this->user, 0, 'all' );
- $pages->setRepository( $this->pagesRepo );
- $pages->prepareData();
+ $pages = new Pages( $this->pagesRepo, $this->project, $this->user, 'all', 'all' );
+ // Ensure it does prepare
+ $pages->getResults();
static::assertEquals( 3, $pages->getNumResults() );
static::assertSame( 1, $pages->getNumDeleted() );
static::assertSame( 1, $pages->getNumRedirects() );
@@ -109,6 +109,7 @@ public function testResults(): void {
],
], $pages->getCounts() );
+ // Also ensures it does cache
$results = $pages->getResults();
static::assertEquals( [ 0, 1 ], array_keys( $results ) );
@@ -146,14 +147,109 @@ public function testResults(): void {
'badge' => 'https://upload.wikimedia.org/wikipedia/commons/2/25/Symbol_a_class.svg',
'color' => '#66FFFF',
'category' => 'Category:A-Class articles',
- 'projects' => [ 'Technology', 'Websites', 'Internet' ],
+ 'projects' => [ 'Technology', 'Internet' ],
],
], $results[1][0] );
static::assertTrue( $pages->isMultiNamespace() );
+ static::assertNull( $pages->getLastTimestamp() );
+ static::assertEquals( 27, $pages->getTotalPageSize() );
+ static::assertEquals( 9, $pages->averagePageSize() );
+ static::assertSame( 'all', $pages->getNamespace() );
+ static::assertEquals( 50, $pages->resultsPerPage() );
+ static::assertFalse( $pages->resultsPerPage( true ) );
+ static::assertEquals( [
+ [ 'pap_project_title' => 'Technology', 'count' => 2 ],
+ [ 'pap_project_title' => 'Random', 'count' => 1 ],
+ [ 'pap_project_title' => 'Computing', 'count' => 1 ],
+ [ 'pap_project_title' => 'Internet', 'count' => 1 ],
+ ], $pages->getWikiprojectCounts() );
+ static::assertEquals( [
+ 'A' => 1,
+ 'Unknown' => 1,
+ 'FA' => 1,
+ ], $pages->getAssessmentCounts() );
+ }
+
+ /**
+ * Make sure we just spit out what the repo says,
+ * when there are more than 1 pages of results.
+ */
+ public function testPaManyPages(): void {
+ $project = $this->createMock( Project::class );
+ $pagesRepo = $this->createMock( PagesRepository::class );
+ $pagesRepo->expects( static::once() )
+ ->method( 'countPagesCreated' )
+ ->willReturn( [ [
+ 'namespace' => 0,
+ 'count' => 5001,
+ 'total_length' => 0,
+ 'deleted' => 0,
+ 'redirects' => 0,
+ ] ] );
+ $pages = new Pages( $pagesRepo, $project, $this->user, 'all', 'all' );
+ static::assertEquals( 5001, $pages->getNumPages() );
+ $value = [ 'Exactly the value given as input.' ];
+ $pagesRepo->expects( static::once() )
+ ->method( 'getWikiprojectCounts' )
+ ->willReturn( $value );
+ static::assertSame( $value, $pages->getWikiprojectCounts() );
+ $pagesRepo->expects( static::once() )
+ ->method( 'getAssessmentCounts' )
+ ->willReturn( $value );
+ static::assertSame( $value, $pages->getAssessmentCounts() );
+ }
+
+ public function testSingleNamespace(): void {
+ // Also does the ProofreadPage tests.
+ $project = $this->createMock( Project::class );
+ $project->method( 'hasPageAssessments' )
+ ->willReturn( false );
+ $project->method( 'isPrpPage' )
+ ->with( 104 )
+ ->willReturn( true );
+ $project->method( 'getNamespaces' )
+ ->willReturn( [ 0 => 'Main', 1 => 'Talk', 104 => 'Page' ] );
+ $pages = new Pages( $this->pagesRepo, $project, $this->user, 104, 'all' );
+ $pagesRepo = $this->createMock( PagesRepository::class );
+ $pagesRepo->expects( static::once() )
+ ->method( 'getPagesCreated' )
+ ->willReturn( [ [
+ 'namespace' => 104,
+ 'type' => 'rev',
+ 'page_title' => 'AAA',
+ 'redirect' => '1',
+ 'rev_length' => 2,
+ 'length' => 20,
+ 'timestamp' => '20250101000000',
+ 'rev_id' => 42,
+ 'recreated' => null,
+ 'prp_quality' => 3,
+ 'was_redirect' => null,
+ ] ] );
+ $pagesRepo->expects( static::once() )
+ ->method( 'countPagesCreated' )
+ ->willReturn( [ [
+ 'namespace' => 104,
+ 'count' => 1,
+ 'deleted' => 0,
+ 'redirects' => 1,
+ 'total_length' => 20,
+ 'prp_quality0' => 0,
+ 'prp_quality1' => 0,
+ 'prp_quality2' => 0,
+ 'prp_quality3' => 1,
+ 'prp_quality4' => 0,
+ ] ] );
+ $pages->setRepository( $pagesRepo );
+ static::assertFalse( $pages->isMultiNamespace() );
+ static::assertEquals( '2025-01-01T00:00:00Z', $pages->getLastTimestamp() );
+ static::assertSame( 1, $pages->getNumPages() );
+ $counts = $pages->getCounts();
+ static::assertSame( 1, $counts[104]['prp_quality3'] );
}
public function setPagesResults(): void {
- $this->pagesRepo->expects( $this->exactly( 2 ) )
+ $this->pagesRepo->expects( static::exactly( 2 ) )
->method( 'getPagesCreated' )
->willReturn( [
[
@@ -168,7 +264,7 @@ public function setPagesResults(): void {
'recreated' => null,
'pa_class' => 'A',
'was_redirect' => null,
- 'pap_project_title' => '["Technology","Websites","Internet"]',
+ 'pap_project_title' => '["Technology","Internet"]',
], [
'namespace' => 0,
'type' => 'arc',
@@ -194,7 +290,7 @@ public function setPagesResults(): void {
'recreated' => null,
'pa_class' => 'FA',
'was_redirect' => null,
- 'pap_project_title' => '["Computing","Technology","Linguistics"]',
+ 'pap_project_title' => '["Computing","Technology"]',
],
] );
$this->pagesRepo->expects( $this->once() )
@@ -216,24 +312,55 @@ public function setPagesResults(): void {
] );
}
- public function testDeletionSummary(): void {
+ /**
+ * Users get tooltips containing deletion summaries, for deleted pages.
+ * @dataProvider deletionSummaryProvider
+ * @param array|null $data
+ * @param int $ns
+ * @param string $title
+ * @param string $offset
+ * @param string|null $result
+ */
+ public function testDeletionSummary(
+ ?array $data,
+ int $ns,
+ string $title,
+ string $offset,
+ ?string $result
+ ): void {
$project = new Project( 'testWiki' );
$project->setRepository( $this->getProjectRepo() );
$this->pagesRepo->expects( static::once() )
->method( 'getDeletionSummary' )
- ->willReturn( [
- 'actor_name' => 'MusikAnimal',
- 'comment_text' => '[[WP:AfD|Articles for deletion]]',
- 'log_timestamp' => '20210108224022',
- ] );
+ ->willReturn( $data );
$pages = new Pages( $this->pagesRepo, $project, $this->user );
$pages->setRepository( $this->pagesRepo );
static::assertEquals(
+ $result,
+ $pages->getDeletionSummary( $ns, $title, $offset )
+ );
+ }
+
+ public function deletionSummaryProvider(): array {
+ return [ [
+ [
+ 'actor_name' => 'MusikAnimal',
+ 'comment_text' => '[[WP:AfD|Articles for deletion]]',
+ 'log_timestamp' => '20210108224022',
+ ],
+ 0,
+ 'Foobar',
+ '20210108224000',
"2021-01-08 22:40 (" .
"MusikAnimal): " .
"Articles for deletion",
- $pages->getDeletionSummary( 0, 'Foobar', '20210108224000' )
- );
+ ], [
+ [],
+ 0,
+ 'Foobar',
+ '202101082240000',
+ null,
+ ] ];
}
/**
diff --git a/tests/Model/ProjectTest.php b/tests/Model/ProjectTest.php
index afe1d3743..7a050f540 100644
--- a/tests/Model/ProjectTest.php
+++ b/tests/Model/ProjectTest.php
@@ -4,8 +4,11 @@
namespace App\Tests\Model;
+use App\Model\Page;
+use App\Model\PageAssessments;
use App\Model\Project;
use App\Model\User;
+use App\Repository\PageRepository;
use App\Repository\ProjectRepository;
use App\Repository\UserRepository;
use App\Tests\TestAdapter;
@@ -35,20 +38,42 @@ public function testBasicMetadata(): void {
'general' => [
'articlePath' => '/test_wiki/$1',
'scriptPath' => '/test_w',
+ 'wikiName' => 'Test Wiki',
+ 'mainpage' => 'Test Main Page',
],
] );
+ $this->projectRepo->expects( static::once() )
+ ->method( 'getApiPath' )
+ ->willReturn( '/w/api.php' );
$project = new Project( 'testWiki' );
$project->setRepository( $this->projectRepo );
static::assertEquals( 'test.example.org', $project->getDomain() );
static::assertEquals( 'test_wiki', $project->getDatabaseName() );
+ static::assertEquals( 'test_wiki', $project->getCacheKey() );
static::assertEquals( 'https://test.example.org/', $project->getUrl() );
static::assertEquals( 'en', $project->getLang() );
static::assertEquals( '/test_w', $project->getScriptPath() );
static::assertEquals( '/test_wiki/$1', $project->getArticlePath() );
+ static::assertEquals( 'https://test.example.org/w/api.php', $project->getApiUrl() );
+ static::assertEquals( 'Test Wiki (test.example.org)', $project->getTitle() );
+ static::assertEquals( 'Test Main Page', $project->getMainPage() );
static::assertTrue( $project->exists() );
}
+ /**
+ * Test fallback behaviour when URL not found
+ */
+ public function testMetadataNoUrl(): void {
+ $projectRepo = $this->createMock( ProjectRepository::class );
+ $projectRepo->expects( static::once() )
+ ->method( 'getOne' )
+ ->willReturn( [] );
+ $project = new Project( 'testWiki' );
+ $project->setRepository( $projectRepo );
+ static::assertSame( '', $project->getMainPage() );
+ }
+
/**
* A project has a set of namespaces, comprising integer IDs and string titles.
*/
@@ -68,6 +93,47 @@ public function testNamespaces(): void {
static::assertEquals( 'Main', $project->getNamespaces()[0] );
}
+ /**
+ * Each namespace has a language-independent canonical name.
+ */
+ public function testCanonicalNamespaces(): void {
+ $projectRepo = $this->getProjectRepo();
+ $projectRepo->expects( static::once() )
+ ->method( 'getMetadata' )
+ ->willReturn( [
+ 'canonical_namespaces' => [ 0 => '', 1 => 'Talk', 104 => 'Page' ],
+ ] );
+ $projectRepo->expects( static::once() )
+ ->method( 'getInstalledExtensions' )
+ ->willReturn( [ 'ProofreadPage' ] );
+
+ $project = new Project( 'testWiki' );
+ $project->setRepository( $projectRepo );
+ static::assertTrue( $project->isPrpPage( 104 ) );
+
+ // Tests that getMetadata was in fact called only once and cached afterwards
+ static::assertSame( '', $project->getCanonicalNamespace( 0 ) );
+
+ // Ensure we default to '' when not found
+ static::assertSame( '', $project->getCanonicalNamespace( -1 ) );
+ }
+
+ /**
+ * A project has a list of installed extensions
+ */
+ public function testExtensions(): void {
+ $projectRepo = $this->getProjectRepo();
+ $projectRepo->expects( static::once() )
+ ->method( 'getInstalledExtensions' )
+ ->willReturn( [ 'NoThing', 'ProofreadPage' ] );
+
+ $project = new Project( 'testWiki' );
+ $project->setRepository( $projectRepo );
+ static::assertTrue( $project->hasProofreadPage() );
+ static::assertFalse( $project->hasVisualEditor() );
+ static::assertFalse( $project->hasPageTriage() );
+ }
+
/**
* XTools can be run in single-wiki mode, where there is only one project.
*/
@@ -131,40 +197,95 @@ public function testGetScript(): void {
static::assertEquals( '/w/index.php', $project2->getScript() );
}
+ /**
+ * Projects can have varying temporary account config.
+ */
+ public function testTempAccounts(): void {
+ $projectRepo = $this->getProjectRepo();
+ $projectRepo->expects( static::once() )
+ ->method( 'getMetadata' )
+ ->willReturn( [
+ 'tempAccountPatterns' => [
+ "*$1",
+ "~2$1",
+ ],
+ ] );
+ $project = new Project( 'testWiki' );
+ $project->setRepository( $projectRepo );
+ static::assertTrue( $project->hasTempAccounts() );
+ static::assertEquals( [ "*$1", "~2$1" ], $project->getTempAccountPatterns() );
+ }
+
+ /**
+ * A project may use PageAssessments in specific namespaces
+ */
+ public function testPageAssessments(): void {
+ $pa = $this->createMock( PageAssessments::class );
+ $pa->expects( static::once() )
+ ->method( 'isSupportedNamespace' )
+ ->willReturn( false );
+ $pa->expects( static::once() )
+ ->method( 'isEnabled' )
+ ->willReturn( true );
+ $project = new Project( 'testWiki' );
+ $project->setPageAssessments( $pa );
+ static::assertEquals( $project->getPageAssessments(), $pa );
+ static::assertTrue( $project->hasPageAssessments() );
+ static::assertFalse( $project->hasPageAssessments( 42 ) );
+ }
+
/**
* A user or a whole project can opt in to displaying restricted statistics.
* @dataProvider optedInProvider
* @param string[] $optedInProjects List of projects.
* @param string $dbName The database name.
* @param string $domain The domain name.
+ * @param \stdClass|null $ident Identification information.
+ * @param bool $localExists
+ * @param bool $globalExists
* @param bool $hasOptedIn The result to check against.
*/
- public function testOptedIn( array $optedInProjects, string $dbName, string $domain, bool $hasOptedIn ): void {
+ public function testOptedIn(
+ array $optedInProjects,
+ string $dbName,
+ string $domain,
+ ?\stdClass $ident,
+ bool $localExists,
+ bool $globalExists,
+ bool $hasOptedIn
+ ): void {
$project = new Project( $dbName );
$globalProject = new Project( 'metawiki' );
-
- /** @var ProjectRepository|MockObject $globalProjectRepo */
$globalProjectRepo = $this->createMock( ProjectRepository::class );
-
- $this->projectRepo->expects( static::once() )
+ $globalProjectRepo->expects( static::any() )
+ ->method( 'pageHasContent' )
+ ->with( $globalProject, 2, 'TestUser/EditCounterGlobalOptIn.js' )
+ ->willReturn( $globalExists );
+ $projectRepo = $this->createMock( ProjectRepository::class );
+ $projectRepo->expects( static::once() )
->method( 'optedIn' )
->willReturn( $optedInProjects );
- $this->projectRepo->expects( static::once() )
+ $projectRepo->expects( static::once() )
->method( 'getOne' )
->willReturn( [
'dbName' => $dbName,
'domain' => "https://$domain.org",
] );
- $this->projectRepo->method( 'getGlobalProject' )
+ $projectRepo->method( 'getGlobalProject' )
->willReturn( $globalProject );
- $this->projectRepo->method( 'pageHasContent' )
+ $projectRepo->method( 'pageHasContent' )
->with( $project, 2, 'TestUser/EditCounterOptIn.js' )
- ->willReturn( $hasOptedIn );
- $project->setRepository( $this->projectRepo );
+ ->willReturn( $localExists );
+ $project->setRepository( $projectRepo );
$globalProject->setRepository( $globalProjectRepo );
// Check that the user has opted in or not.
- $user = new User( $this->userRepo, 'TestUser' );
+ $userRepo = $this->createMock( UserRepository::class );
+ $userRepo->expects( static::any() )
+ ->method( 'getXtoolsUserInfo' )
+ ->willReturn( $ident );
+ static::assertEquals( $ident, $userRepo->getXtoolsUserInfo() );
+ $user = new User( $userRepo, 'TestUser' );
static::assertEquals( $hasOptedIn, $project->userHasOptedIn( $user ) );
}
@@ -175,9 +296,20 @@ public function testOptedIn( array $optedInProjects, string $dbName, string $dom
public function optedInProvider(): array {
$optedInProjects = [ 'project1' ];
return [
- [ $optedInProjects, 'project1', 'test.example.org', true ],
- [ $optedInProjects, 'project2', 'test2.example.org', false ],
- [ $optedInProjects, 'project3', 'test3.example.org', false ],
+ [ $optedInProjects, 'project1', 'test.example.org', null, false, false, true ],
+ [ $optedInProjects, 'project2', 'test2.example.org', null, false, false, false ],
+ [ $optedInProjects, 'project3', 'test3.example.org', null, false, false, false ],
+ [
+ $optedInProjects,
+ 'project4',
+ 'test4.example.org',
+ (object)[ 'username' => 'TestUser' ],
+ false,
+ false,
+ true
+ ],
+ [ $optedInProjects, 'project5', 'test5.example.org', null, true, false, true ],
+ [ $optedInProjects, 'project6', 'test6.example.org', null, false, true, true ],
];
}
@@ -227,12 +359,18 @@ public function testUsersInGroups(): void {
public function testGetUrlForPage(): void {
$projectRepo = $this->getProjectRepo();
- $projectRepo->expects( static::once() )->method( 'getMetadata' );
+ $projectRepo->expects( static::exactly( 2 ) )->method( 'getMetadata' );
$project = new Project( 'testWiki' );
$project->setRepository( $projectRepo );
static::assertEquals(
"https://test.example.org/wiki/Foobar",
$project->getUrlForPage( 'Foobar' )
);
+ $pageRepo = $this->createMock( PageRepository::class );
+ $page = new Page( $pageRepo, $project, 'Foobar' );
+ static::assertEquals(
+ "https://test.example.org/wiki/Foobar",
+ $project->getUrlForPage( $page )
+ );
}
}
diff --git a/tests/Model/TopEditsTest.php b/tests/Model/TopEditsTest.php
index f93239025..2f92240f6 100644
--- a/tests/Model/TopEditsTest.php
+++ b/tests/Model/TopEditsTest.php
@@ -84,6 +84,10 @@ public function testBasic(): void {
$page = new Page( $this->pageRepo, $this->project, 'Test page' );
$te->setPage( $page );
static::assertEquals( $page, $te->getPage() );
+
+ // Explicit pagination
+ $te = $this->getTopEdits( null, 'all', false, false, 20, 1 );
+ static::assertSame( 1, $te->getPagination() );
}
/**
@@ -115,6 +119,7 @@ public function testTopEditsAllNamespaces(): void {
'assessment' => [
'class' => 'List',
],
+ 'pap_project_title' => '["Biography","India"]',
], $result[0][0] );
// Fetching again should use value of class property.
@@ -127,25 +132,49 @@ public function testTopEditsAllNamespaces(): void {
* Getting top edited pages within a single namespace.
*/
public function testTopEditsNamespace(): void {
- $te = $this->getTopEdits( null, 3, false, false, 2 );
- $this->teRepo->expects( $this->once() )
+ $te = $this->getTopEdits( null, 0, false, false, 2 );
+ $this->teRepo->expects( static::once() )
->method( 'getTopEditsNamespace' )
- ->with( $this->project, $this->user, 3, false, false, 2 )
- ->willReturn( $this->topEditsNamespaceFactory()[3] );
+ ->with( $this->project, $this->user, 0, false, false, 2 )
+ ->willReturn( $this->topEditsNamespaceFactory()[0] );
+ $this->teRepo->expects( static::once() )
+ ->method( 'countEdits' )
+ ->willReturn( 42 );
$te->setRepository( $this->teRepo );
$te->prepareData();
$result = $te->getTopEdits();
- static::assertEquals( [ 3 ], array_keys( $result ) );
+ static::assertEquals( 42, $te->getNumTopEdits() );
+ static::assertEquals( [ 0 ], array_keys( $result ) );
static::assertCount( 1, $result );
- static::assertCount( 2, $result[3] );
+ static::assertCount( 2, $result[0] );
static::assertEquals( [
- 'namespace' => '3',
- 'page_title' => 'Jimbo Wales',
+ 'namespace' => '0',
+ 'page_title' => '101st Airborne Division',
'redirect' => '0',
- 'count' => '1',
- 'full_page_title' => 'User talk:Jimbo Wales',
- ], $result[3][1] );
+ 'count' => '18',
+ 'full_page_title' => '101st Airborne Division',
+ 'pap_project_title' => null,
+ 'assessment' => [ 'class' => 'C' ],
+ ], $result[0][1] );
+ }
+
+ /**
+ * Ensure we do not show any data if the user has not opted in.
+ */
+ public function testNotOptedIn(): void {
+ $project = $this->createMock( Project::class );
+ $project->expects( static::once() )
+ ->method( 'userHasOptedIn' )
+ ->willReturn( false );
+ $te = new TopEdits(
+ $this->teRepo,
+ $this->autoEditsHelper,
+ $project,
+ $this->user
+ );
+ $te->prepareData();
+ static::assertCount( 0, $te->getTopEdits() );
}
/**
@@ -162,6 +191,10 @@ private function topEditsNamespaceFactory(): array {
'count' => '24',
'pa_class' => 'List',
'full_page_title' => 'Foo_bar',
+ 'pap_project_title' => json_encode( [
+ 'Biography',
+ 'India',
+ ] ),
], [
'namespace' => '0',
'page_title' => '101st_Airborne_Division',
@@ -169,6 +202,7 @@ private function topEditsNamespaceFactory(): array {
'count' => '18',
'pa_class' => 'C',
'full_page_title' => '101st_Airborne_Division',
+ 'pap_project_title' => null,
],
],
3 => [
@@ -276,6 +310,7 @@ private function topEditsPageFactory(): array {
* @param int|false $start Start date as Unix timestamp.
* @param int|false $end End date as Unix timestamp.
* @param int|null $limit Number of rows to fetch.
+ * @param int $pagination = 0
* @return TopEdits
*/
private function getTopEdits(
@@ -283,7 +318,8 @@ private function getTopEdits(
$namespace = 0,
$start = false,
$end = false,
- ?int $limit = null
+ ?int $limit = null,
+ int $pagination = 0
): TopEdits {
return new TopEdits(
$this->teRepo,
@@ -294,7 +330,8 @@ private function getTopEdits(
$namespace,
$start,
$end,
- $limit
+ $limit,
+ $pagination
);
}
}
diff --git a/tests/Model/UserRightsTest.php b/tests/Model/UserRightsTest.php
index 068b57128..d75f0ffb4 100644
--- a/tests/Model/UserRightsTest.php
+++ b/tests/Model/UserRightsTest.php
@@ -22,9 +22,14 @@ class UserRightsTest extends TestAdapter {
protected UserRights $userRights;
protected UserRightsRepository $userRightsRepo;
protected UserRepository $userRepo;
+ protected Project $project;
public function setUp(): void {
- $this->i18n = static::createClient()->getContainer()->get( 'app.i18n_helper' );
+ $this->i18n = $this->createMock( I18nHelper::class );
+ $this->i18n->expects( static::any() )
+ ->method( 'getLang' )
+ ->willReturn( 'en' );
+ // static::createClient()->getContainer()->get('app.i18n_helper');
$project = new Project( 'test.example.org' );
$projectRepo = $this->getProjectRepo();
$projectRepo->method( 'getMetadata' )
@@ -32,6 +37,7 @@ public function setUp(): void {
'tempAccountPatterns' => [ '~2$1' ],
] );
$project->setRepository( $projectRepo );
+ $this->project = $project;
$this->userRepo = $this->createMock( UserRepository::class );
$this->user = new User( $this->userRepo, 'Testuser' );
$this->userRightsRepo = $this->createMock( UserRightsRepository::class );
@@ -126,6 +132,19 @@ public function testUserRightsChanges(): void {
'log_deleted' => '2',
],
] );
+ $this->userRightsRepo->expects( static::once() )
+ ->method( 'getAutoConfirmedAgeAndCount' )
+ ->willReturn( [
+ // 1 second, 1 edit
+ 'wgAutoConfirmAge' => 1,
+ 'wgAutoConfirmCount' => 1,
+ ] );
+ $this->userRightsRepo->expects( static::once() )
+ ->method( 'getNumEditsByTimestamp' )
+ ->willReturn( 2 );
+ $this->userRightsRepo->expects( static::once() )
+ ->method( 'getRightsNames' )
+ ->willReturn( [ 'sysop' => 'Administrator' ] );
/** @var MockObject|UserRepository $userRepo */
$userRepo = $this->createMock( UserRepository::class );
@@ -136,7 +155,20 @@ public function testUserRightsChanges(): void {
] );
$this->user->setRepository( $userRepo );
+ static::assertEquals( 20180101000001, $this->userRights->getAutoConfirmedTimeStamp() );
static::assertEquals( [
+ 20180101000001 => [
+ 'logId' => null,
+ 'performer' => null,
+ 'comment' => null,
+ 'added' => [ 'autoconfirmed' ],
+ 'removed' => [],
+ 'grantType' => 'automatic',
+ 'type' => 'local',
+ 'paramsDeleted' => false,
+ 'commentDeleted' => false,
+ 'performerDeleted' => false,
+ ],
20181025000000 => [
'logId' => '92769185',
'performer' => 'Worm That Turned',
@@ -273,9 +305,15 @@ public function testUserRightsChanges(): void {
->willReturn( [ 'sysop' ] );
$this->user->setRepository( $userRepo );
+ // Global rights and changes.
+ static::assertEquals( [
+ 'current' => [ 'sysop' ],
+ 'former' => [],
+ ], $this->userRights->getGlobalRightsStates() );
+
// Current rights.
static::assertEquals(
- [ 'sysop', 'bureaucrat' ],
+ [ 'sysop', 'bureaucrat', 'autoconfirmed' ],
$this->userRights->getRightsStates()['local']['current']
);
@@ -285,7 +323,391 @@ public function testUserRightsChanges(): void {
$this->userRights->getRightsStates()['local']['former']
);
- // Admin status.
- static::assertEquals( 'current', $this->userRights->getAdminStatus() );
+ // Rights names.
+ static::assertEquals( 'Administrator', $this->userRights->getRightsName( 'sysop' ) );
+ // Missing key, and ensure caching.
+ static::assertEquals( 'example', $this->userRights->getRightsName( 'example' ) );
+ }
+
+ /**
+ * Test various edge cases and unexpected incidents during log processsing
+ * @dataProvider edgeCaseProvider
+ * @param array $logData
+ * @param bool $hasImpossibleLogs
+ * @param array $result
+ */
+ public function testChangesEdgeCases(
+ array $logData,
+ bool $hasImpossibleLogs,
+ array $result
+ ): void {
+ $this->userRightsRepo->expects( static::once() )
+ ->method( 'getRightsChanges' )
+ ->willReturn( $logData );
+ static::assertEquals( $result, $this->userRights->getRightsChanges() );
+ static::assertEquals( $hasImpossibleLogs, $this->userRights->hasImpossibleLogs() );
+ }
+
+ public function edgeCaseProvider(): array {
+ return [ [
+ // Dataset #0: Expiry modification
+ [
+ [
+ // Temporary intadmin grant until timestamp 4
+ 'log_id' => '1234',
+ 'log_timestamp' => '0',
+ 'log_params' => 'a:4:{s:12:"4::oldgroups";a:0:{}s:12:"5::newgroups";a:1:{i:0;s:15:' .
+ '"interface-admin";}s:11:"oldmetadata";a:0:{}s:11:"newmetadata";a:1:{i:0;a:1:' .
+ '{s:6:"expiry";s:1:"8";}}}',
+ 'log_action' => 'rights',
+ 'performer' => 'Random',
+ 'log_comment' => 'One',
+ 'type' => 'local',
+ 'log_deleted' => 0,
+ ],
+ [
+ // One second before, extended until 8
+ 'log_id' => '5678',
+ 'log_timestamp' => '3',
+ 'log_params' => 'a:4:{s:12:"4::oldgroups";a:1:{i:0;s:15:"interface-admin";}s:12:"5::newgroups";' .
+ 'a:1:{i:0;s:15:"interface-admin";}s:11:"oldmetadata";a:1:{i:0;a:1:{s:6:"expiry";s:1:"4";}}s:' .
+ '11:"newmetadata";a:1:{i:0;a:1:{s:6:"expiry";s:1:"8";}}}',
+ 'log_action' => 'rights',
+ 'performer' => 'Random',
+ 'log_comment' => 'Two!',
+ 'type' => 'local',
+ 'log_deleted' => 0,
+ ],
+ ],
+ false,
+ [
+ 0 => [
+ 'logId' => '1234',
+ 'performer' => 'Random',
+ 'comment' => 'One',
+ 'added' => [ 'interface-admin' ],
+ 'removed' => [],
+ 'grantType' => 'manual',
+ 'type' => 'local',
+ 'paramsDeleted' => false,
+ 'commentDeleted' => false,
+ 'performerDeleted' => false,
+ ],
+ 3 => [
+ 'logId' => '5678',
+ 'performer' => 'Random',
+ 'comment' => 'Two!',
+ 'added' => [ 'interface-admin' ],
+ 'removed' => [],
+ 'grantType' => 'manual',
+ 'type' => 'local',
+ 'paramsDeleted' => false,
+ 'commentDeleted' => false,
+ 'performerDeleted' => false,
+ ],
+ 8 => [
+ 'logId' => '5678',
+ 'performer' => 'Random',
+ 'comment' => null,
+ 'added' => [],
+ 'removed' => [ 'interface-admin' ],
+ 'grantType' => 'automatic',
+ 'type' => 'local',
+ 'paramsDeleted' => false,
+ 'commentDeleted' => false,
+ 'performerDeleted' => false,
+ ],
+ ],
+ ], [
+ // Dataset #1: Impossible logs
+ [
+ [
+ // removal of sysop
+ 'log_id' => '1234',
+ 'log_timestamp' => '0',
+ 'log_params' => "sysop\n",
+ 'log_action' => 'rights',
+ 'performer' => 'Random',
+ 'log_comment' => '...',
+ 'type' => 'local',
+ 'log_deleted' => 0,
+ ],
+ ],
+ true,
+ [
+ [
+ 'logId' => '1234',
+ 'performer' => 'Random',
+ 'comment' => '...',
+ 'added' => [],
+ 'removed' => [ 'sysop' ],
+ 'grantType' => 'manual',
+ 'type' => 'local',
+ 'paramsDeleted' => false,
+ 'commentDeleted' => false,
+ 'performerDeleted' => false,
+ ],
+ ],
+ ], [
+ // Dataset #2: everything revdeleted
+ [
+ [
+ // removal of sysop
+ 'log_id' => '1234',
+ 'log_timestamp' => '0',
+ 'log_params' => null,
+ 'log_action' => 'rights',
+ 'performer' => null,
+ 'log_comment' => null,
+ 'type' => 'local',
+ 'log_deleted' => 7,
+ ],
+ ],
+ false,
+ [
+ 0 => [
+ 'logId' => '1234',
+ 'performer' => null,
+ 'comment' => null,
+ 'added' => [],
+ 'removed' => [],
+ 'grantType' => 'manual',
+ 'type' => 'local',
+ 'paramsDeleted' => true,
+ 'commentDeleted' => true,
+ 'performerDeleted' => true,
+ ],
+ ],
+ ], [
+ // Dataset #3: (none)s to splice out
+ [
+ [
+ // none in old
+ 'log_id' => '1234',
+ 'log_timestamp' => '0',
+ 'log_params' => "(none)\nsysop",
+ 'log_action' => 'rights',
+ 'performer' => 'Random',
+ 'log_comment' => '...',
+ 'type' => 'local',
+ 'log_deleted' => 0,
+ ],
+ [
+ // none in new
+ 'log_id' => '5678',
+ 'log_timestamp' => '1',
+ 'log_params' => "sysop\n(none)",
+ 'log_action' => 'rights',
+ 'performer' => 'Random',
+ 'log_comment' => '...',
+ 'type' => 'local',
+ 'log_deleted' => 0,
+ ],
+ ],
+ false,
+ [
+ 0 => [
+ 'logId' => '1234',
+ 'performer' => 'Random',
+ 'comment' => '...',
+ 'added' => [ 'sysop' ],
+ 'removed' => [],
+ 'grantType' => 'manual',
+ 'type' => 'local',
+ 'paramsDeleted' => false,
+ 'commentDeleted' => false,
+ 'performerDeleted' => false,
+ ],
+ 1 => [
+ 'logId' => '5678',
+ 'performer' => 'Random',
+ 'comment' => '...',
+ 'added' => [],
+ 'removed' => [ 'sysop' ],
+ 'grantType' => 'manual',
+ 'type' => 'local',
+ 'paramsDeleted' => false,
+ 'commentDeleted' => false,
+ 'performerDeleted' => false,
+ ],
+ ],
+ ], [
+ // Dataset #4: removing pending auto removals on manual removal
+ [
+ [
+ // Temporary intadmin grant until timestamp 4
+ 'log_id' => '1234',
+ 'log_timestamp' => '0',
+ 'log_params' => 'a:4:{s:12:"4::oldgroups";a:0:{}s:12:"5::newgroups";a:1:{i:0;s:15:' .
+ '"interface-admin";}s:11:"oldmetadata";a:0:{}s:11:"newmetadata";a:1:{i:0;a:1:' .
+ '{s:6:"expiry";s:1:"8";}}}',
+ 'log_action' => 'rights',
+ 'performer' => 'Random',
+ 'log_comment' => 'One',
+ 'type' => 'local',
+ 'log_deleted' => 0,
+ ],
+ [
+ // One second before, removed manually
+ 'log_id' => '5678',
+ 'log_timestamp' => '3',
+ 'log_params' => 'a:4:{s:12:"4::oldgroups";a:1:{i:0;s:15:"interface-admin";}s:12:"5::newgroups";' .
+ 'a:0:{}s:11:"oldmetadata";a:1:{i:0;a:1:{s:6:"expiry";s:1:"4";}}s:11:"newmetadata";a:0:{}}',
+ 'log_action' => 'rights',
+ 'performer' => 'Random',
+ 'log_comment' => 'Two!',
+ 'type' => 'local',
+ 'log_deleted' => 0,
+ ],
+ ],
+ false,
+ [
+ 0 => [
+ 'logId' => '1234',
+ 'performer' => 'Random',
+ 'comment' => 'One',
+ 'added' => [ 'interface-admin' ],
+ 'removed' => [],
+ 'grantType' => 'manual',
+ 'type' => 'local',
+ 'paramsDeleted' => false,
+ 'commentDeleted' => false,
+ 'performerDeleted' => false,
+ ],
+ 3 => [
+ 'logId' => '5678',
+ 'performer' => 'Random',
+ 'comment' => 'Two!',
+ 'added' => [],
+ 'removed' => [ 'interface-admin' ],
+ 'grantType' => 'manual',
+ 'type' => 'local',
+ 'paramsDeleted' => false,
+ 'commentDeleted' => false,
+ 'performerDeleted' => false,
+ ],
+ ],
+ ] ];
+ }
+
+ /**
+ * Admin status
+ * @dataProvider adminStatusProvider
+ * @param array $currentRights
+ * @param array $rightsChanges
+ * @param string|bool $adminStatus
+ */
+ public function testAdminStatus(
+ array $currentRights,
+ array $rightsChanges,
+ $adminStatus
+ ): void {
+ $user = $this->createMock( User::class );
+ $user->expects( static::once() )
+ ->method( 'getUserRights' )
+ ->willReturn( $currentRights );
+ $this->userRightsRepo->expects( static::once() )
+ ->method( 'getRightsChanges' )
+ ->willReturn( $rightsChanges );
+ $userRights = new UserRights( $this->userRightsRepo, $this->project, $user, $this->i18n );
+ static::assertEquals( $adminStatus, $userRights->getAdminStatus() );
+ }
+
+ public function adminStatusProvider(): array {
+ return [
+ [
+ [ 'sysop' ],
+ [],
+ 'current',
+ ],
+ [
+ [],
+ [
+ [
+ 'log_timestamp' => 0,
+ 'log_action' => '',
+ 'log_id' => 3,
+ 'log_params' => "\nsysop",
+ 'log_comment' => null,
+ 'performer' => 'Ghost',
+ 'type' => '',
+ 'log_deleted' => 2,
+ ],
+ [
+ 'log_timestamp' => 1,
+ 'log_action' => '',
+ 'log_id' => 4,
+ 'log_params' => "sysop\n",
+ 'log_comment' => null,
+ 'performer' => 'Ghost',
+ 'type' => '',
+ 'log_deleted' => 2,
+ ],
+ ],
+ 'former',
+ ],
+ [
+ [],
+ [],
+ false,
+ ],
+ ];
+ }
+
+ /**
+ * Test autoconfirmed calculations
+ * @dataProvider autoconfirmedTimestampProvider
+ * @param bool $isTemp
+ * @param array|null $thresholds
+ * @param \DateTime|null $regDate
+ * @param int $editsByAcDate
+ * @param \DateTime|false $nthEditTimestamp
+ * @param \DateTime|false $resTimestamp
+ */
+ public function testAutoconfirmedTimestamp(
+ bool $isTemp,
+ ?array $thresholds,
+ $regDate,
+ int $editsByAcDate,
+ $nthEditTimestamp,
+ $resTimestamp
+ ): void {
+ $user = $this->createMock( User::class );
+ $user->expects( static::once() )
+ ->method( 'isTemp' )
+ ->willReturn( $isTemp );
+ $this->userRightsRepo->expects( static::any() )
+ ->method( 'getAutoconfirmedAgeAndCount' )
+ ->willReturn( $thresholds );
+ $user->expects( static::any() )
+ ->method( 'getRegistrationDate' )
+ ->willReturn( $regDate );
+ $this->userRightsRepo->expects( static::any() )
+ ->method( 'getNumEditsByTimestamp' )
+ ->willReturn( $editsByAcDate );
+ $this->userRightsRepo->expects( static::any() )
+ ->method( 'getNthEditTimestamp' )
+ ->willReturn( $nthEditTimestamp );
+ $userRights = new UserRights( $this->userRightsRepo, $this->project, $user, $this->i18n );
+ static::assertEquals( $resTimestamp, $userRights->getAutoconfirmedTimestamp() );
+ }
+
+ public function autoconfirmedTimestampProvider(): array {
+ $stamp = static fn ( $s ) => strval( 20250101000000 + $s );
+ $time = static fn ( $s ) => new \DateTime( $stamp( $s ) );
+ return [
+ // Dataset #0: temporary used
+ [ true, null, null, 3, $time( 2 ), false ],
+ // Dataset #1: null thresholds
+ [ false, null, null, 3, $time( 2 ), false ],
+ // Dataset #2: null registration date
+ [ false, [ 'wgAutoConfirmAge' => 4, 'wgAutoConfirmCount' => 2 ], null, 3, $time( 2 ), false ],
+ // Dataset #3: got the required edits before required age
+ [ false, [ 'wgAutoConfirmAge' => 4, 'wgAutoConfirmCount' => 2 ], $time( 0 ), 3, $time( 2 ), $stamp( 4 ) ],
+ // Dataset #4: got the required edits after required age
+ [ false, [ 'wgAutoConfirmAge' => 4, 'wgAutoConfirmCount' => 2 ], $time( 0 ), 1, $time( 6 ), $stamp( 6 ) ],
+ // Dataset #5: never got the required edits
+ [ false, [ 'wgAutoConfirmAge' => 4, 'wgAutoConfirmCount' => 2 ], $time( 0 ), 1, false, false ],
+ ];
}
}
diff --git a/tests/Model/UserTest.php b/tests/Model/UserTest.php
index f05c4cf83..9da70b9de 100644
--- a/tests/Model/UserTest.php
+++ b/tests/Model/UserTest.php
@@ -10,6 +10,9 @@
use App\Repository\UserRepository;
use App\Tests\TestAdapter;
use DateTime;
+use Exception;
+use PHPUnit\Framework\MockObject\Stub\Stub;
+use UnexpectedValueException;
/**
* Tests for the User class.
@@ -28,6 +31,7 @@ public function setUp(): void {
public function testUsernameHasInitialCapital(): void {
$user = new User( $this->userRepo, 'lowercasename' );
static::assertEquals( 'Lowercasename', $user->getUsername() );
+ static::assertEquals( md5( 'Lowercasename' ), $user->getCacheKey() );
$user2 = new User( $this->userRepo, 'UPPERCASENAME' );
static::assertEquals( 'UPPERCASENAME', $user2->getUsername() );
}
@@ -38,7 +42,7 @@ public function testUsernameHasInitialCapital(): void {
*/
public function testUserHasIdOnProject(): void {
// Set up stub user and project repositories.
- $this->userRepo->expects( $this->once() )
+ $this->userRepo->expects( $this->exactly( 2 ) )
->method( 'getIdAndRegistration' )
->willReturn( [
'userId' => 12,
@@ -54,6 +58,7 @@ public function testUserHasIdOnProject(): void {
$project = new Project( 'wiki.example.org' );
$project->setRepository( $projectRepo );
static::assertEquals( 12, $user->getId( $project ) );
+ static::assertTrue( $user->existsOnProject( $project ) );
}
/**
@@ -138,7 +143,7 @@ public function testRegistrationDate(): void {
* System edit count.
*/
public function testEditCount(): void {
- $this->userRepo->expects( $this->once() )
+ $this->userRepo->expects( static::once() )
->method( 'getEditCount' )
->willReturn( 12345 );
$user = new User( $this->userRepo, 'TestUser' );
@@ -166,6 +171,9 @@ public function testHasTooManyEdits(): void {
$this->userRepo->expects( $this->exactly( 3 ) )
->method( 'maxEdits' )
->willReturn( 250000 );
+ $this->userRepo->expects( static::once() )
+ ->method( 'numEditsRequiringLogin' )
+ ->willReturn( 12344 );
$user = new User( $this->userRepo, 'TestUser' );
$projectRepo = $this->createMock( ProjectRepository::class );
@@ -180,6 +188,9 @@ public function testHasTooManyEdits(): void {
// User::tooManyEdits()
static::assertTrue( $user->hasTooManyEdits( $project ) );
+
+ // User:hasManyEdits()
+ static::assertTrue( $user->hasManyEdits( $project ) );
}
/**
@@ -191,6 +202,8 @@ public function testIpMethods(): void {
static::assertFalse( $user->isIpRange() );
static::assertFalse( $user->isIPv6() );
static::assertEquals( '192.168.0.0', $user->getUsernameIdent() );
+ // should not call any Project methods
+ static::assertTrue( $user->isAnon( $this->createMock( Project::class ) ) );
$user = new User( $this->userRepo, '74.24.52.13/20' );
static::assertTrue( $user->isIP() );
@@ -249,16 +262,29 @@ public function testIsQueryableRange(): void {
/**
* From Core's PatternTest https://w.wiki/BZQH (GPL-2.0-or-later)
* @dataProvider provideIsTempUsername
+ * @param bool $hasTemp
* @param string $stringPattern
* @param string $name
* @param bool $expected
* @return void
*/
- public function testIsTemp( string $stringPattern, string $name, bool $expected ): void {
+ public function testIsTemp( bool $hasTemp, string $stringPattern, string $name, bool $expected ): void {
$project = $this->createMock( Project::class );
- $project->method( 'hasTempAccounts' )->willReturn( true );
- $project->method( 'getTempAccountPatterns' )->willReturn( [ $stringPattern ] );
- static::assertSame( $expected, User::isTempUsername( $project, $name ) );
+ $project->expects( static::once() )
+ ->method( 'hasTempAccounts' )
+ ->willReturn( $hasTemp );
+ $project->expects( $hasTemp ? static::once() : static::never() )
+ ->method( 'getTempAccountPatterns' )
+ ->willReturn( [ $stringPattern ] );
+ $user = new User( $this->userRepo, $name );
+ try {
+ static::assertSame( $expected, $user->isTemp( $project ) );
+ // Check that if the pattern is invalid we errored
+ static::assertStringContainsString( '$1', $stringPattern );
+ } catch ( UnexpectedValueException $e ) {
+ // Check that we get here only if the pattern is invalid
+ static::assertStringNotContainsString( '$1', $stringPattern );
+ }
}
/**
@@ -267,45 +293,100 @@ public function testIsTemp( string $stringPattern, string $name, bool $expected
public static function provideIsTempUsername(): array {
return [
'prefix mismatch' => [
+ 'hasTemp' => true,
'pattern' => '*$1',
'name' => 'Test',
'expected' => false,
],
'prefix match' => [
+ 'hasTemp' => true,
'pattern' => '*$1',
'name' => '*Some user',
'expected' => true,
],
'suffix only match' => [
+ 'hasTemp' => true,
'pattern' => '$1*',
'name' => 'Some user*',
'expected' => true,
],
'suffix only mismatch' => [
+ 'hasTemp' => true,
'pattern' => '$1*',
'name' => 'Some user',
'expected' => false,
],
'prefix and suffix match' => [
+ 'hasTemp' => true,
'pattern' => '*$1*',
'name' => '*Unregistered 123*',
'expected' => true,
],
'prefix and suffix mismatch' => [
+ 'hasTemp' => true,
'pattern' => '*$1*',
'name' => 'Unregistered 123*',
'expected' => false,
],
'prefix and suffix zero length match' => [
+ 'hasTemp' => true,
'pattern' => '*$1*',
'name' => '**',
'expected' => true,
],
'prefix and suffix overlapping' => [
+ 'hasTemp' => true,
'pattern' => '*$1*',
'name' => '*',
'expected' => false,
],
+ 'no temp accounts' => [
+ 'hasTemp' => false,
+ 'pattern' => '*$1*',
+ 'name' => '**',
+ 'expected' => false,
+ ],
+ 'invalid pattern' => [
+ 'hasTemp' => true,
+ 'pattern' => '',
+ 'nam' => '*',
+ 'expected' => false,
+ ],
+ ];
+ }
+
+ /**
+ * Test identification logic
+ * @dataProvider isCurrentlyLoggedInProvider
+ * @param Stub $userInfo
+ * @param bool $expected
+ */
+ public function testIsCurrentlyLoggedIn( Stub $userInfo, bool $expected ): void {
+ $this->userRepo->expects( static::once() )
+ ->method( 'getXtoolsUserInfo' )
+ ->will( $userInfo );
+ $user = new User( $this->userRepo, 'Foo' );
+ static::assertEquals( $expected, $user->isCurrentlyLoggedIn() );
+ }
+
+ public function isCurrentlyLoggedInProvider(): array {
+ return [
+ 'not_logged_in' => [
+ $this->throwException( new Exception( '' ) ),
+ false,
+ ],
+ 'malformed_ident' => [
+ $this->returnValue( (object)[] ),
+ false,
+ ],
+ 'wrong_user' => [
+ $this->returnValue( (object)[ 'username' => 'Bar' ] ),
+ false,
+ ],
+ 'right_user' => [
+ $this->returnValue( (object)[ 'username' => 'Foo' ] ),
+ true,
+ ],
];
}
}
+ {{ msg('proofreadpage-qualitychanges') }}*
+ {{
+ chart.pie_chart('prp_qualitychanges',
+ [0, 1, 2, 3, 4]|map((i) => {
+ label: qualityNames[i],
+ value: qualityChanges[i],
+ percentage: ((qualityChanges[i] / qualityChanges.total) * 100),
+ color: color([11, 0, 4, 2, 1][i])
+ }),
+ true,
+ 'qualitychangechart'
+ )
+ }}
+
+ {% endif %}
+ {% endif %}
* {{ msg('data-limit', [5000, 5000|num_format]) }}
diff --git a/templates/editCounter/timecard.html.twig b/templates/editCounter/timecard.html.twig
index 74e48ea20..c9d90e05a 100644
--- a/templates/editCounter/timecard.html.twig
+++ b/templates/editCounter/timecard.html.twig
@@ -64,7 +64,7 @@
{% for i in 0..6 %}
{
backgroundColor: "{{ chartColor(i) }}",
- data: {{ ec.timeCard|slice(i*24, 24)|json_encode()|raw }}
+ data: {{ ec.timecard|slice(i*24, 24)|json_encode()|raw }}
},
{% endfor %}
];
diff --git a/templates/macros/pieChart.html.twig b/templates/macros/pieChart.html.twig
index 727ab2601..ad9298072 100644
--- a/templates/macros/pieChart.html.twig
+++ b/templates/macros/pieChart.html.twig
@@ -9,10 +9,10 @@
{% for entry in data %}
{% set labels = labels | merge([entry.label]) %}
{% set values = values | merge([entry.value]) %}
- {% set colors = colors | merge([chartColor(loop.index0)]) %}
+ {% set colors = colors | merge([entry.color ?? chartColor(loop.index0)]) %}
{% if legend %}
-
+
{{ entry.label }}
·
diff --git a/templates/pages/_pages_list.html.twig b/templates/pages/_pages_list.html.twig
index 360c1bf9d..f9ddffb32 100644
--- a/templates/pages/_pages_list.html.twig
+++ b/templates/pages/_pages_list.html.twig
@@ -1,5 +1,6 @@
{% import 'macros/layout.html.twig' as layout %}
{% import 'macros/wiki.html.twig' as wiki %}
+{% import 'macros/pieChart.html.twig' as chart %}
{% set content %}
{% if pages.getNumPages == 0 %}
@@ -25,119 +26,157 @@
[{{ msg('hide')|lower }}]
-
+
+
{% endfor %}
{##### PAGINATION #####}
diff --git a/templates/pages/result.csv.twig b/templates/pages/result.csv.twig
index cfea841a5..427e16369 100644
--- a/templates/pages/result.csv.twig
+++ b/templates/pages/result.csv.twig
@@ -5,6 +5,10 @@
{% if project.hasPageAssessments and pages.deleted != 'deleted' %}
{% set columns = columns|merge(['assessment']) %}
{% endif %}
+{% if project.hasProofreadPage and pages.deleted != 'deleted' %}
+{% set columns = columns|merge(['proofreadpage-quality']) %}
+{% set qualityNames = project.prpQualityNames %}
+{% endif %}
{% for thKey in columns %}
{{ msg(thKey) }}{% if not loop.last %},{% endif %}
{% endfor %}
@@ -12,7 +16,7 @@
{% for ns in pages.results|keys %}
{% for page in pages.results[ns] %}
{% set pageTitle = titleWithNs(page.page_title, ns, project.namespaces) %}
-{{ ns }},"{{ pageTitle }}",{{ page.timestamp|date_format }},{{ page.rev_length }}{% if pages.deleted != 'deleted' %},{% if page.length is not null %}{{ page.length }}{% endif %}{% endif %}{% if project.hasPageAssessments %},{{ page.assessment.class ? page.assessment.class|ucfirst : msg('unknown') }}{% endif %}
+{{ ns }},"{{ pageTitle }}",{{ page.timestamp|date_format }},{{ page.rev_length }}{% if pages.deleted != 'deleted' %},{% if page.length is not null %}{{ page.length }}{% endif %}{% endif %}{% if project.hasPageAssessments %},{{ page.assessment.class ? page.assessment.class|ucfirst : msg('unknown') }}{% endif %}{% if project.hasProofreadPage %},{{ page.prp_quality ? qualityNames[page.prp_quality] : '' }}{% endif %}
{% endfor %}
{% endfor %}
diff --git a/templates/pages/result.tsv.twig b/templates/pages/result.tsv.twig
index f9c1f89cd..f69e0be0f 100644
--- a/templates/pages/result.tsv.twig
+++ b/templates/pages/result.tsv.twig
@@ -5,6 +5,10 @@
{% if project.hasPageAssessments and pages.deleted != 'deleted' %}
{% set columns = columns|merge(['assessment']) %}
{% endif %}
+{% if project.hasProofreadPage and pages.deleted != 'deleted' %}
+{% set columns = columns|merge(['proofreadpage-quality']) %}
+{% set qualityNames = project.prpQualityNames %}
+{% endif %}
{% for thKey in columns %}
{{ msg(thKey) }}{% if not loop.last %} {% endif %}
{% endfor %}
@@ -12,7 +16,7 @@
{% for ns in pages.results|keys %}
{% for page in pages.results[ns] %}
{% set pageTitle = titleWithNs(page.page_title, ns, project.namespaces) %}
-{{ ns }} {{ pageTitle }} {{ page.timestamp|date_format }} {{ page.rev_length }}{% if pages.deleted != 'deleted' %} {% if page.length is not null %}{{ page.length }}{% endif %}{% endif %}{% if project.hasPageAssessments %} {{ page.assessment.class ? page.assessment.class|ucfirst : msg('unknown') }}{% endif %}
+{{ ns }} {{ pageTitle }} {{ page.timestamp|date_format }} {{ page.rev_length }}{% if pages.deleted != 'deleted' %} {% if page.length is not null %}{{ page.length }}{% endif %}{% endif %}{% if project.hasPageAssessments %} {{ page.assessment.class ? page.assessment.class|ucfirst : msg('unknown') }}{% endif %}{% if project.hasProofreadPage %} {{ page.prp_quality ? qualityNames[page.prp_quality] : '' }}{% endif %}
{% endfor %}
{% endfor %}
diff --git a/templates/pages/result.wikitext.twig b/templates/pages/result.wikitext.twig
index 467e38f19..b37849603 100644
--- a/templates/pages/result.wikitext.twig
+++ b/templates/pages/result.wikitext.twig
@@ -19,6 +19,10 @@
{% if project.hasPageAssessments(ns) and pages.deleted != 'deleted' %}
{% set columns = columns|merge(['assessment']) %}
{% endif %}
+{% if project.isPrpPage(ns) %}
+{% set columns = columns|merge(['proofreadpage-quality']) %}
+{% set qualityNames = project.prpQualityNames %}
+{% endif %}
{% for thKey in columns %}
! {{ msg(thKey)|ucfirst }}
{% endfor %}
@@ -42,6 +46,9 @@
[[File:{{ project.pageAssessments.badgeURL(page.assessment.class, true) }}|20px]] {{ page.assessment.class ? page.assessment.class : msg('unknown') }}
{% endif %}
{% endif %}
+{% if page.prp_quality is defined %}
+| {{ qualityNames[page.prp_quality] }}
+{% endif %}
{% endif %}
| [{{ wiki.pageLogUrlRaw(pageTitle, project) }} {{ msg('log') }}]{% if not(page.deleted) %} · [{{ wiki.pageHistUrlRaw(pageTitle, project) }} {{ msg('history') }}]{% if enabled('PageInfo') %} · [{{ url('PageInfoResult', {'project': project.domain, 'page': pageTitle}) }} {{ msg('tool-pageinfo') }}]{% endif %}{% if enabled('TopEdits') %} · [{{ url('topedits', {'project': project.domain, 'username': user.usernameIdent, 'namespace': ns, 'page': page.page_title}) }} {{ msg('tool-topedits') }}]{% endif %}{% if isWMF() %} · [https://pageviews.wmcloud.org/?project={{ project.domain }}&pages={{ pageTitle|e('url') }} {{ msg('pageviews') }}]{% endif %}{% endif %}
diff --git a/templates/topedits/result_namespace.html.twig b/templates/topedits/result_namespace.html.twig
index e2a17331b..fa02c2417 100644
--- a/templates/topedits/result_namespace.html.twig
+++ b/templates/topedits/result_namespace.html.twig
@@ -79,6 +79,15 @@
{% endif %}
+ {% if project.isPrpPage(ns) %}
+