summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2020-05-28 20:50:02 +0200
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2020-05-29 15:23:15 +0200
commitc8dafceb36ce80707f346ae4a08699d54849591c (patch)
tree25301a382194c24dba4123eacf0a1edce50da574 /build
parent8349172c64006aedbc87058aed6b159196a00c9b (diff)
downloadnextcloud-server-c8dafceb36ce80707f346ae4a08699d54849591c.tar.gz
nextcloud-server-c8dafceb36ce80707f346ae4a08699d54849591c.zip
Generalize integration test steps to download last share
Note that the "last link share can be downloaded" step was kept as it tests the "url" property specific of link shares. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'build')
-rw-r--r--build/integration/features/bootstrap/Sharing.php18
-rw-r--r--build/integration/sharing_features/sharing-v1.feature4
2 files changed, 18 insertions, 4 deletions
diff --git a/build/integration/features/bootstrap/Sharing.php b/build/integration/features/bootstrap/Sharing.php
index f13abd6efad..fee8f7d2692 100644
--- a/build/integration/features/bootstrap/Sharing.php
+++ b/build/integration/features/bootstrap/Sharing.php
@@ -164,9 +164,23 @@ trait Sharing {
}
/**
- * @Then /^last link share with password "([^"]*)" can be downloaded$/
+ * @Then /^last share can be downloaded$/
*/
- public function lastLinkShareWithPasswordCanBeDownloaded($password) {
+ public function lastShareCanBeDownloaded() {
+ if (count($this->lastShareData->data->element) > 0) {
+ $token = $this->lastShareData->data[0]->token;
+ } else {
+ $token = $this->lastShareData->data->token;
+ }
+
+ $fullUrl = substr($this->baseUrl, 0, -4) . "index.php/s/" . $token . "/download";
+ $this->checkDownload($fullUrl, null, 'text/plain');
+ }
+
+ /**
+ * @Then /^last share with password "([^"]*)" can be downloaded$/
+ */
+ public function lastShareWithPasswordCanBeDownloaded($password) {
if (count($this->lastShareData->data->element) > 0){
$token = $this->lastShareData->data[0]->token;
}
diff --git a/build/integration/sharing_features/sharing-v1.feature b/build/integration/sharing_features/sharing-v1.feature
index 8440a2d874e..498fe1456f6 100644
--- a/build/integration/sharing_features/sharing-v1.feature
+++ b/build/integration/sharing_features/sharing-v1.feature
@@ -75,7 +75,7 @@ Feature: sharing
| password | publicpw |
Then the OCS status code should be "100"
And the HTTP status code should be "200"
- And last link share with password "publicpw" can be downloaded
+ And last share with password "publicpw" can be downloaded
Scenario: Creating a new public share of a folder
Given user "user0" exists
@@ -108,7 +108,7 @@ Feature: sharing
| expireDate | +3 days |
Then the OCS status code should be "100"
And the HTTP status code should be "200"
- And last link share with password "publicpw" can be downloaded
+ And last share with password "publicpw" can be downloaded
Scenario: Creating a new public share, updating its expiration date and getting its info
Given user "user0" exists