Merge remote-tracking branch 'upstream/master'

1 files changed, 5 insertions, 5 deletions

diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php
index 789540f..0236a5f 100644
--- a/tests/Bookmark2TagTest.php
+++ b/tests/Bookmark2TagTest.php
@@ -282,10 +282,10 @@ class Bookmark2TagTest extends TestBase
     public function testGetPopularTagsDays()
     {
         $user = $this->addUser();
-        $this->addTagBookmark($user, array('one', 'two'), 'today');
-        $this->addTagBookmark($user, array('one', 'thr'), 'today');
-        $this->addTagBookmark($user, array('one', 'two'), '-1 day 1 hour');
-        $this->addTagBookmark($user, array('one', 'thr'), '-3 days 1 hour');
+        $this->addTagBookmark($user, array('one', 'two'), 'now');
+        $this->addTagBookmark($user, array('one', 'thr'), 'now');
+        $this->addTagBookmark($user, array('one', 'two'), '-1 day -1 hour');
+        $this->addTagBookmark($user, array('one', 'thr'), '-3 days -1 hour');
 
         $arTags = $this->b2ts->getPopularTags(null, 10, null, 1);
         $this->assertInternalType('array', $arTags);
@@ -608,4 +608,4 @@ class Bookmark2TagTest extends TestBase
         $this->assertContains(array('tag' => 'usable', 'bCount' => '2'), $arTags);
     }
 }
-?>
\ No newline at end of file
+?>