]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge remote-tracking branch 'ArthurHoaro/default-links'
authornodiscc <nodiscc@gmail.com>
Fri, 26 Jun 2015 20:03:25 +0000 (22:03 +0200)
committernodiscc <nodiscc@gmail.com>
Fri, 26 Jun 2015 20:03:25 +0000 (22:03 +0200)
1  2 
application/LinkDB.php
tests/LinkDBTest.php

Simple merge
index 0d3433597adf2bfe1508ce04fb22b0910e752861,3b68dd204639c29ea7c7384041b10c98913d00bc..a54fc501caca0d3f6b3f17efc660bae65aec493e
@@@ -120,10 -126,10 +120,10 @@@ class LinkDBTest extends PHPUnit_Framew
       */
      public function testCheckDBLoad()
      {
 -        $linkDB = new LinkDB(false, false);
 +        $linkDB = new LinkDB(self::$testDatastore, false, false);
          $this->assertEquals(
-             self::$dummyDatastoreSHA1,
-             sha1_file(self::$testDatastore)
+             self::$dummyDatastoreFilesize,
+             filesize(self::$testDatastore)
          );
  
          $checkDB = self::getMethod('checkDB');