| Index: trunk/extensions/FlaggedRevs/tests/FlaggedRevsTest.hooks.php |
| — | — | @@ -8,6 +8,7 @@ |
| 9 | 9 | $files[] = dirname( __FILE__ ) . '/FRUserCountersTest.php'; |
| 10 | 10 | $files[] = dirname( __FILE__ ) . '/FRUserActivityTest.php'; |
| 11 | 11 | $files[] = dirname( __FILE__ ) . '/FRParserCacheStableTest.php'; |
| | 12 | + $files[] = dirname( __FILE__ ) . '/FlaggedPageTest.php'; |
| 12 | 13 | return true; |
| 13 | 14 | } |
| 14 | 15 | |
| Index: trunk/extensions/FlaggedRevs/tests/FlaggedPageTest.php |
| — | — | @@ -0,0 +1,42 @@ |
| | 2 | +<?php |
| | 3 | + |
| | 4 | +class FlaggedPageTest extends PHPUnit_Framework_TestCase { |
| | 5 | + /** |
| | 6 | + * Prepares the environment before running a test. |
| | 7 | + */ |
| | 8 | + protected function setUp() { |
| | 9 | + parent::setUp(); |
| | 10 | + $this->user = new User(); |
| | 11 | + } |
| | 12 | + |
| | 13 | + /** |
| | 14 | + * Cleans up the environment after running a test. |
| | 15 | + */ |
| | 16 | + protected function tearDown() { |
| | 17 | + parent::tearDown(); |
| | 18 | + } |
| | 19 | + |
| | 20 | + /** |
| | 21 | + * Constructs the test case. |
| | 22 | + */ |
| | 23 | + public function __construct() {} |
| | 24 | + |
| | 25 | + public function testPageDataFromTitle() { |
| | 26 | + $title = Title::makeTitle( NS_MAIN, "somePage" ); |
| | 27 | + $article = new FlaggedPage( $title ); |
| | 28 | + |
| | 29 | + $user = $this->user; |
| | 30 | + $article->doEdit( "Some text to insert", "creating a page", EDIT_NEW, false, $user ); |
| | 31 | + |
| | 32 | + $data = (array)$article->pageDataFromTitle( wfGetDB( DB_SLAVE ), $title ); |
| | 33 | + |
| | 34 | + $this->assertEquals( true, array_key_exists( 'fpc_override', $data ), |
| | 35 | + "data->fpc_override field exists" ); |
| | 36 | + $this->assertEquals( true, array_key_exists( 'fp_stable', $data ), |
| | 37 | + "data->fp_stable field exists" ); |
| | 38 | + $this->assertEquals( true, array_key_exists( 'fp_pending_since', $data ), |
| | 39 | + "data->fp_pending_since field exists" ); |
| | 40 | + $this->assertEquals( true, array_key_exists( 'fp_reviewed', $data ), |
| | 41 | + "data->fp_reviewed field exists" ); |
| | 42 | + } |
| | 43 | +} |
| \ No newline at end of file |
| Property changes on: trunk/extensions/FlaggedRevs/tests/FlaggedPageTest.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 44 | + native |
| Index: trunk/extensions/FlaggedRevs/dataclasses/FlaggedPage.php |
| — | — | @@ -374,8 +374,11 @@ |
| 375 | 375 | public function loadPageData( $data = 'fromdb' ) { |
| 376 | 376 | $this->mDataLoaded = true; // sanity |
| 377 | 377 | # Fetch data from DB as needed... |
| 378 | | - if ( $data === 'fromdb' ) { |
| 379 | | - $data = $this->pageDataFromTitle( wfGetDB( DB_SLAVE ), $this->mTitle ); |
| | 378 | + if ( $data === 'fromdb' || $data === 'fromdbmaster' ) { |
| | 379 | + $db = ( $data == 'fromdbmaster' ) |
| | 380 | + ? wfGetDB( DB_MASTER ) |
| | 381 | + : wfGetDB( DB_SLAVE ); |
| | 382 | + $data = $this->pageDataFromTitle( $db, $this->mTitle ); |
| 380 | 383 | } |
| 381 | 384 | # Load in primary page data... |
| 382 | 385 | parent::loadPageData( $data /* Row obj */ ); |