wip : fixup

Signed-off-by: fenn-cs <[email protected]>

Author: nfebe

build/integration/features/bootstrap/Sharing.php

@@ -54,7 +54,7 @@ public function asCreatingAShareWith($user, $body) {
 			$fd = $body->getRowsHash();
 			if (array_key_exists('expireDate', $fd)) {
 				$dateModification = $fd['expireDate'];
-				if ($dateModification !== 'EMPTY_STRING') {
+				if (!empty($dateModification)) {
 					$fd['expireDate'] = date('Y-m-d', strtotime($dateModification));
 				}
 			}
@@ -296,15 +296,16 @@ public function createShare($user,
 			$this->lastShareData = simplexml_load_string($this->response->getBody());
 		} catch (\GuzzleHttp\Exception\ClientException $ex) {
 			$this->response = $ex->getResponse();
-			print(json_encode($this->response));
 			throw new \Exception($this->response->getBody());
 		}
 	}
 
 	public function isFieldInResponse($field, $contentExpected) {
 		$data = simplexml_load_string($this->response->getBody())->data[0];
 		if ((string)$field == 'expiration') {
-			$contentExpected = date('Y-m-d', strtotime($contentExpected)) . " 00:00:00";
+			if(!empty($contentExpected)) {
+				$contentExpected = date('Y-m-d', strtotime($contentExpected)) . " 00:00:00";
+			}
 		}
 		if (count($data->element) > 0) {
 			foreach ($data as $element) {
@@ -314,8 +315,8 @@ public function isFieldInResponse($field, $contentExpected) {
 					return is_numeric((string)$element->$field);
 				} elseif ($contentExpected == "AN_URL") {
 					return $this->isExpectedUrl((string)$element->$field, "index.php/s/");
-				} elseif ($contentExpected == "EMPTY_STRING") {
-					return ((string)$element->$field === '');
+				} elseif ($contentExpected == "EMPTY") {
+					return empty((string)$element->$field);
 				} elseif ((string)$element->$field == $contentExpected) {
 					return true;
 				} else {
@@ -331,6 +332,8 @@ public function isFieldInResponse($field, $contentExpected) {
 				return is_numeric((string)$data->$field);
 			} elseif ($contentExpected == "AN_URL") {
 				return $this->isExpectedUrl((string)$data->$field, "index.php/s/");
+			} elseif ($contentExpected == "EMPTY") {
+				return empty((string)$data->$field);
 			} elseif ($contentExpected == $data->$field) {
 				return true;
 			}

build/integration/sharing_features/sharing-v1.feature

@@ -238,14 +238,14 @@ Feature: sharing
       | path | welcome.txt |
       | shareWith | user1 |
       | shareType | 0 |
-      | expireDate | EMPTY_STRING |
+      | expireDate | |
     Then the OCS status code should be "100"
     And the HTTP status code should be "200"
     And Getting info of last share
     Then the OCS status code should be "100"
     And the HTTP status code should be "200"
     And Share fields of last share match with
-      | expiration | EMPTY_STRING |
+      | expiration ||
 
   Scenario: Creating a new public share, updating its password and getting its info
     Given user "user0" exists