From edabe5516e1472fdeb8ea65ea84149532ce4e92d Mon Sep 17 00:00:00 2001 From: Huji Lee Date: Mon, 18 Sep 2017 14:03:04 -0400 Subject: [PATCH] Assert that blocks were inserted successfully in UserTest Bug: T176103 Change-Id: Ia8afc37605a844590abe49eaad1e806bd2c7f6f8 --- tests/phpunit/includes/user/UserTest.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php index aa368de746..52fd3208d0 100644 --- a/tests/phpunit/includes/user/UserTest.php +++ b/tests/phpunit/includes/user/UserTest.php @@ -610,7 +610,8 @@ class UserTest extends MediaWikiTestCase { 'expiry' => wfTimestamp( TS_MW, $expiryFiveHours ), ] ); $block->setTarget( $user1tmp ); - $block->insert(); + $res = $block->insert(); + $this->assertTrue( (bool)$res['id'], 'Failed to insert block' ); $user1 = User::newFromSession( $request1 ); $user1->mBlock = $block; $user1->load(); @@ -678,7 +679,8 @@ class UserTest extends MediaWikiTestCase { $request1->getSession()->setUser( $testUser ); $block = new Block( [ 'enableAutoblock' => true ] ); $block->setTarget( $testUser ); - $block->insert(); + $res = $block->insert(); + $this->assertTrue( (bool)$res['id'], 'Failed to insert block' ); $user = User::newFromSession( $request1 ); $user->mBlock = $block; $user->load(); @@ -714,7 +716,8 @@ class UserTest extends MediaWikiTestCase { $request1->getSession()->setUser( $user1Tmp ); $block = new Block( [ 'enableAutoblock' => true, 'expiry' => 'infinity' ] ); $block->setTarget( $user1Tmp ); - $block->insert(); + $res = $block->insert(); + $this->assertTrue( (bool)$res['id'], 'Failed to insert block' ); $user1 = User::newFromSession( $request1 ); $user1->mBlock = $block; $user1->load(); @@ -801,7 +804,8 @@ class UserTest extends MediaWikiTestCase { $request1->getSession()->setUser( $user1tmp ); $block = new Block( [ 'enableAutoblock' => true ] ); $block->setTarget( $user1tmp ); - $block->insert(); + $res = $block->insert(); + $this->assertTrue( (bool)$res['id'], 'Failed to insert block' ); $user1 = User::newFromSession( $request1 ); $user1->mBlock = $block; $user1->load(); @@ -838,7 +842,8 @@ class UserTest extends MediaWikiTestCase { $request1->getSession()->setUser( $user1tmp ); $block = new Block( [ 'enableAutoblock' => true ] ); $block->setTarget( $user1tmp ); - $block->insert(); + $res = $block->insert(); + $this->assertTrue( (bool)$res['id'], 'Failed to insert block' ); $user1 = User::newFromSession( $request1 ); $user1->mBlock = $block; $user1->load(); -- 2.20.1