Merge "Remove missed WatchedItem::resetNotificationTimestamp in test"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 28 Jul 2016 10:22:59 +0000 (10:22 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 Jul 2016 10:22:59 +0000 (10:22 +0000)
1  2 
tests/phpunit/includes/WatchedItemIntegrationTest.php

@@@ -1,5 -1,4 +1,5 @@@
  <?php
 +use MediaWiki\MediaWikiServices;
  
  /**
   * @author Addshore
@@@ -19,7 -18,6 +19,6 @@@ class WatchedItemIntegrationTest extend
                $this->hideDeprecated( 'WatchedItem::addWatch' );
                $this->hideDeprecated( 'WatchedItem::removeWatch' );
                $this->hideDeprecated( 'WatchedItem::isWatched' );
-               $this->hideDeprecated( 'WatchedItem::resetNotificationTimestamp' );
                $this->hideDeprecated( 'WatchedItem::duplicateEntries' );
                $this->hideDeprecated( 'WatchedItem::batchAddWatch' );
        }
@@@ -64,9 -62,7 +63,9 @@@
                        WatchedItem::fromUserTitle( $user, $title )->getNotificationTimestamp()
                );
  
 -              WatchedItem::fromUserTitle( $user, $title )->resetNotificationTimestamp();
 +              MediaWikiServices::getInstance()->getWatchedItemStore()->resetNotificationTimestamp(
 +                      $user, $title
 +              );
                $this->assertNull( WatchedItem::fromUserTitle( $user, $title )->getNotificationTimestamp() );
        }
  
                $user = $this->getUser();
                $title = Title::newFromText( 'WatchedItemIntegrationTestPage' );
                WatchedItem::fromUserTitle( $user, $title )->addWatch();
 -              WatchedItem::fromUserTitle( $user, $title )->resetNotificationTimestamp();
 +              MediaWikiServices::getInstance()->getWatchedItemStore()->resetNotificationTimestamp(
 +                      $user, $title
 +              );
  
                $this->assertEquals(
                        null,