From 1a51d4c4c715a0f30d9a91793b78702f18cd94bc Mon Sep 17 00:00:00 2001 From: Sergio Bertolin Date: Thu, 5 Nov 2015 09:10:46 +0000 Subject: [PATCH] Added changes in the verification of sharing get responses --- .../features/bootstrap/FeatureContext.php | 26 ++++++++++++++++++- build/integration/features/sharing-v1.feature | 13 +++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php index d3a04ee782..93073263d8 100644 --- a/build/integration/features/bootstrap/FeatureContext.php +++ b/build/integration/features/bootstrap/FeatureContext.php @@ -666,6 +666,30 @@ class FeatureContext implements Context, SnippetAcceptingContext { } + public function isFieldInResponse($field, $content_expected){ + $data = $this->response->xml()->data[0]; + foreach($data as $element) { + if ($element->$field == $content_expected){ + return True; + } + } + return False; + } + + /** + * @Then /^File "([^"]*)" should be included in the response$/ + */ + public function checkSharedFileInResponse($filename){ + PHPUnit_Framework_Assert::assertEquals(True, $this->isFieldInResponse('file_target', "/$filename")); + } + + /** + * @Then /^File "([^"]*)" should not be included in the response$/ + */ + public function checkSharedFileNotInResponse($filename){ + PHPUnit_Framework_Assert::assertEquals(False, $this->isFieldInResponse('file_target', "/$filename")); + } + public function isUserInSharedData($user){ $data = $this->response->xml()->data[0]; foreach($data as $element) { @@ -709,7 +733,7 @@ class FeatureContext implements Context, SnippetAcceptingContext { public static function removeFile($path, $filename){ if (file_exists("$path" . "$filename")) { - unlink("$path" . "$filename"); + unlink("$path" . "$filename"); } } diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature index b7bd8b70db..8bdfd72265 100644 --- a/build/integration/features/sharing-v1.feature +++ b/build/integration/features/sharing-v1.feature @@ -58,7 +58,17 @@ Feature: sharing And the HTTP status code should be "200" And Public shared file "welcome.txt" with password "publicpw" can be downloaded - Scenario: getting all shares of a user + Scenario: getting all shares of a user using that user + Given user "user0" exists + And user "user1" exists + And file "textfile0.txt" from user "user0" is shared with user "user1" + And As an "user0" + When sending "GET" to "/apps/files_sharing/api/v1/shares" + Then the OCS status code should be "100" + And the HTTP status code should be "200" + And File "textfile0.txt" should be included in the response + + Scenario: getting all shares of a user using another user Given user "user0" exists And user "user1" exists And file "textfile0.txt" from user "user0" is shared with user "user1" @@ -66,6 +76,7 @@ Feature: sharing When sending "GET" to "/apps/files_sharing/api/v1/shares" Then the OCS status code should be "100" And the HTTP status code should be "200" + And File "textfile0.txt" should not be included in the response Scenario: delete a share Given user "user0" exists