diff options
Diffstat (limited to 'tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php')
| -rw-r--r-- | tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php index f06d6b1c2f58..b3c8f3235a97 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php @@ -84,7 +84,8 @@ class PageHTMLHandlerTest extends MediaWikiIntegrationTestCase { new NullStatsdDataFactory(), new NullLogger() ), - $this->getServiceContainer()->getWikiPageFactory() + $this->getServiceContainer()->getWikiPageFactory(), + $this->getServiceContainer()->getGlobalIdGenerator() ); if ( $parsoid !== null ) { @@ -187,13 +188,15 @@ class PageHTMLHandlerTest extends MediaWikiIntegrationTestCase { // First, test it works if nothing was cached yet. // Make some time pass since page was created: - MWTimestamp::setFakeTime( $time + 10 ); + $time += 10; + MWTimestamp::setFakeTime( $time ); $handler = $this->newHandler( $cache ); $response = $this->executeHandler( $handler, $request, [ 'format' => 'html' ] ); $this->assertArrayHasKey( 'ETag', $response->getHeaders() ); $etag = $response->getHeaderLine( 'ETag' ); + $this->assertStringMatchesFormat( '"' . $page->getLatest() . '/%x-%x-%x-%x-%x"', $etag ); $this->assertArrayHasKey( 'Last-Modified', $response->getHeaders() ); $this->assertSame( MWTimestamp::convert( TS_RFC2822, $time ), $response->getHeaderLine( 'Last-Modified' ) ); @@ -204,10 +207,11 @@ class PageHTMLHandlerTest extends MediaWikiIntegrationTestCase { 'format' => 'html' ] ); $this->assertArrayHasKey( 'ETag', $response->getHeaders() ); - $this->assertNotSame( $etag, $response->getHeaderLine( 'ETag' ) ); + $this->assertSame( $etag, $response->getHeaderLine( 'ETag' ) ); $etag = $response->getHeaderLine( 'ETag' ); + $this->assertStringMatchesFormat( '"' . $page->getLatest() . '/%x-%x-%x-%x-%x"', $etag ); $this->assertArrayHasKey( 'Last-Modified', $response->getHeaders() ); - $this->assertSame( MWTimestamp::convert( TS_RFC2822, $time + 10 ), + $this->assertSame( MWTimestamp::convert( TS_RFC2822, $time ), $response->getHeaderLine( 'Last-Modified' ) ); // Now, expire the cache @@ -225,6 +229,8 @@ class PageHTMLHandlerTest extends MediaWikiIntegrationTestCase { ] ); $this->assertArrayHasKey( 'ETag', $response->getHeaders() ); $this->assertNotSame( $etag, $response->getHeaderLine( 'ETag' ) ); + $etag = $response->getHeaderLine( 'ETag' ); + $this->assertStringMatchesFormat( '"' . $page->getLatest() . '/%x-%x-%x-%x-%x"', $etag ); $this->assertArrayHasKey( 'Last-Modified', $response->getHeaders() ); $this->assertSame( MWTimestamp::convert( TS_RFC2822, $time ), $response->getHeaderLine( 'Last-Modified' ) ); |