aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2016-01-21 20:18:44 +0100
committerArthurHoaro <arthur@hoa.ro>2016-02-15 21:18:43 +0100
commit195acf9f0931aa3b1a6db8832ab52a260d11090d (patch)
tree351663f03ed606f095b88b2f96ca0ef3d41e7f6a /tests
parent1e7331126d81a5759ab91c221f7e0f164aeebfb5 (diff)
downloadShaarli-195acf9f0931aa3b1a6db8832ab52a260d11090d.tar.gz
Shaarli-195acf9f0931aa3b1a6db8832ab52a260d11090d.tar.zst
Shaarli-195acf9f0931aa3b1a6db8832ab52a260d11090d.zip
Private/Hidden tags
Tags starting with a dot '.' are now private. They can only be seen and searched when logged in. Fixes #315
Diffstat (limited to 'tests')
-rw-r--r--tests/LinkDBTest.php19
-rw-r--r--tests/Updater/UpdaterTest.php1
-rw-r--r--tests/utils/ReferenceLinkDB.php2
3 files changed, 20 insertions, 2 deletions
diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php
index 06edea79..765f771e 100644
--- a/tests/LinkDBTest.php
+++ b/tests/LinkDBTest.php
@@ -298,6 +298,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
298 'css' => 1, 298 'css' => 1,
299 'Mercurial' => 1, 299 'Mercurial' => 1,
300 '-exclude' => 1, 300 '-exclude' => 1,
301 '.hidden' => 1,
301 ), 302 ),
302 self::$privateLinkDB->allTags() 303 self::$privateLinkDB->allTags()
303 ); 304 );
@@ -349,4 +350,22 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
349 count(self::$privateLinkDB->filter(LinkFilter::$FILTER_TAG, $tags, true, false)) 350 count(self::$privateLinkDB->filter(LinkFilter::$FILTER_TAG, $tags, true, false))
350 ); 351 );
351 } 352 }
353
354 /**
355 * Test hidden tags feature:
356 * tags starting with a dot '.' are only visible when logged in.
357 */
358 public function testHiddenTags()
359 {
360 $tags = '.hidden';
361 $this->assertEquals(
362 1,
363 count(self::$privateLinkDB->filter(LinkFilter::$FILTER_TAG, $tags, true, false))
364 );
365
366 $this->assertEquals(
367 0,
368 count(self::$publicLinkDB->filter(LinkFilter::$FILTER_TAG, $tags, true, false))
369 );
370 }
352} 371}
diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php
index 84b82350..d865066b 100644
--- a/tests/Updater/UpdaterTest.php
+++ b/tests/Updater/UpdaterTest.php
@@ -239,7 +239,6 @@ class UpdaterTest extends PHPUnit_Framework_TestCase
239 $this->assertEmpty($linkDB->filter(LinkFilter::$FILTER_TAG, 'exclude')); 239 $this->assertEmpty($linkDB->filter(LinkFilter::$FILTER_TAG, 'exclude'));
240 $updater = new Updater(array(), self::$configFields, $linkDB, true); 240 $updater = new Updater(array(), self::$configFields, $linkDB, true);
241 $updater->updateMethodRenameDashTags(); 241 $updater->updateMethodRenameDashTags();
242 var_dump($linkDB->filter(LinkFilter::$FILTER_TAG, 'exclude'));
243 $this->assertNotEmpty($linkDB->filter(LinkFilter::$FILTER_TAG, 'exclude')); 242 $this->assertNotEmpty($linkDB->filter(LinkFilter::$FILTER_TAG, 'exclude'));
244 } 243 }
245} 244}
diff --git a/tests/utils/ReferenceLinkDB.php b/tests/utils/ReferenceLinkDB.php
index 2f188d29..da3e8c65 100644
--- a/tests/utils/ReferenceLinkDB.php
+++ b/tests/utils/ReferenceLinkDB.php
@@ -28,7 +28,7 @@ class ReferenceLinkDB
28 'A free software media publishing platform', 28 'A free software media publishing platform',
29 0, 29 0,
30 '20130614_184135', 30 '20130614_184135',
31 'gnu media web' 31 'gnu media web .hidden'
32 ); 32 );
33 33
34 $this->addLink( 34 $this->addLink(