]> source.dussan.org Git - nextcloud-server.git/commitdiff
Fix unit test for expiration date without date but with default
authorDaniel Calviño Sánchez <danxuliu@gmail.com>
Thu, 12 Nov 2020 08:34:58 +0000 (09:34 +0100)
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>
Mon, 16 Nov 2020 13:16:53 +0000 (13:16 +0000)
The expiration date was explicitly given, so it was not testing what it
should. Moreover, "link_defaultExpDays" needs to be mapped when testing
the default value (even if it will just fallback to the value of
"shareapi_expire_after_n_days").

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
tests/lib/Share20/ManagerTest.php

index c7986c5f50ac7fca2990816e55440761160dce4a..ad2f536f6da7375a2699f2cc46dd3929a34a9f4e 100644 (file)
@@ -937,19 +937,17 @@ class ManagerTest extends \Test\TestCase {
        }
 
        public function testValidateExpirationDateNoDateDefault() {
-               $future = new \DateTime();
-               $future->add(new \DateInterval('P3D'));
-               $future->setTime(0,0,0);
-
-               $expected = clone $future;
-
                $share = $this->manager->newShare();
-               $share->setExpirationDate($future);
+
+               $expected = new \DateTime();
+               $expected->add(new \DateInterval('P3D'));
+               $expected->setTime(0,0,0);
 
                $this->config->method('getAppValue')
                        ->willReturnMap([
                                ['core', 'shareapi_default_expire_date', 'no', 'yes'],
                                ['core', 'shareapi_expire_after_n_days', '7', '3'],
+                               ['core', 'link_defaultExpDays', 3, '3'],
                        ]);
 
                $hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();