From: Daniel Calviño Sánchez <danxuliu@gmail.com>
Date: Thu, 12 Nov 2020 08:34:58 +0000 (+0100)
Subject: Fix unit test for expiration date without date but with default
X-Git-Tag: v20.0.2RC2~1^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=115a988cd29fcc0d0e629bd815096614d48bf269;p=nextcloud-server.git

Fix unit test for expiration date without date but with default

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>
---

diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index c7986c5f50a..ad2f536f6da 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -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();