Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'ArthurHoaro/default-links'

Browse source
This commit is contained in:
nodiscc 2015-06-26 22:03:25 +02:00
commit d72ae3d7e8
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
application/LinkDB.php
View file

@ -188,11 +188,15 @@ private function checkDB()
// Create a dummy database for example // Create a dummy database for example
$this->links = array(); $this->links = array();
$link = array( $link = array(
'title'=>'Shaarli - sebsauvage.net', 'title'=>' Shaarli: the personal, minimalist, super-fast, no-database delicious clone',
'url'=>'http://sebsauvage.net/wiki/doku.php?id=php:shaarli', 'url'=>'https://github.com/shaarli/Shaarli/wiki',
'description'=>'Welcome to Shaarli! This is a bookmark. To edit or delete me, you must first login.', 'description'=>'Welcome to Shaarli! This is your first public bookmark. To edit or delete me, you must first login.
To learn how to use Shaarli, consult the link "Help/documentation" at the bottom of this page.
You use the community supported version of the original Shaarli project, by Sebastien Sauvage.',
'private'=>0, 'private'=>0,
'linkdate'=>'20110914_190000', 'linkdate'=> date('Ymd_His'),
'tags'=>'opensource software' 'tags'=>'opensource software'
); );
$this->links[$link['linkdate']] = $link; $this->links[$link['linkdate']] = $link;
@ -200,9 +204,9 @@ private function checkDB()
$link = array( $link = array(
'title'=>'My secret stuff... - Pastebin.com', 'title'=>'My secret stuff... - Pastebin.com',
'url'=>'http://sebsauvage.net/paste/?8434b27936c09649#bR7XsXhoTiLcqCpQbmOpBi3rq2zzQUC5hBI7ZT1O3x8=', 'url'=>'http://sebsauvage.net/paste/?8434b27936c09649#bR7XsXhoTiLcqCpQbmOpBi3rq2zzQUC5hBI7ZT1O3x8=',
'description'=>'SShhhh!! I\'m a private link only YOU can see. You can delete me too.', 'description'=>'Shhhh! I\'m a private link only YOU can see. You can delete me too.',
'private'=>1, 'private'=>1,
'linkdate'=>'20110914_074522', 'linkdate'=> date('Ymd_His', strtotime('-1 minute')),
'tags'=>'secretstuff' 'tags'=>'secretstuff'
); );
$this->links[$link['linkdate']] = $link; $this->links[$link['linkdate']] = $link;

14
tests/LinkDBTest.php
View file

@ -15,7 +15,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
{ {
// datastore to test write operations // datastore to test write operations
protected static $testDatastore = 'tests/datastore.php'; protected static $testDatastore = 'tests/datastore.php';
protected static $dummyDatastoreSHA1 = 'e3edea8ea7bb50be4bcb404df53fbb4546a7156e'; protected static $dummyDatastoreFilesize = 759;
protected static $refDB = null; protected static $refDB = null;
protected static $publicLinkDB = null; protected static $publicLinkDB = null;
protected static $privateLinkDB = null; protected static $privateLinkDB = null;
@ -110,8 +110,8 @@ public function testCheckDBNew()
// ensure the correct data has been written // ensure the correct data has been written
$this->assertEquals( $this->assertEquals(
self::$dummyDatastoreSHA1, self::$dummyDatastoreFilesize,
sha1_file(self::$testDatastore) filesize(self::$testDatastore)
); );
} }
@ -122,8 +122,8 @@ public function testCheckDBLoad()
{ {
$linkDB = new LinkDB(self::$testDatastore, false, false); $linkDB = new LinkDB(self::$testDatastore, false, false);
$this->assertEquals( $this->assertEquals(
self::$dummyDatastoreSHA1, self::$dummyDatastoreFilesize,
sha1_file(self::$testDatastore) filesize(self::$testDatastore)
); );
$checkDB = self::getMethod('checkDB'); $checkDB = self::getMethod('checkDB');
@ -131,8 +131,8 @@ public function testCheckDBLoad()
// ensure the datastore is left unmodified // ensure the datastore is left unmodified
$this->assertEquals( $this->assertEquals(
self::$dummyDatastoreSHA1, self::$dummyDatastoreFilesize,
sha1_file(self::$testDatastore) filesize(self::$testDatastore)
); );
} }