diff options
author | Sergio Bertolin <sbertolin@solidgear.es> | 2016-08-09 11:24:03 +0300 |
---|---|---|
committer | Sergio BertolĂn <sbertolin@solidgear.es> | 2016-08-31 13:32:46 +0300 |
commit | 7431cd921141c5f30aa9023b7bbec1b412dffa9c (patch) | |
tree | ae99943098e560cf3ee01a83fc247be9477bd1a9 /build | |
parent | 7bc069a6e36c667a3ff6a4822a578af8454a351d (diff) |
Removed extra context added needed option and remove storage after external storage scenarios
Conflicts:
build/integration/features/bootstrap/BasicStructure.php
build/integration/run.sh
Diffstat (limited to 'build')
-rw-r--r-- | build/integration/features/bootstrap/ExternalStorageContext.php | 24 | ||||
-rw-r--r-- | build/integration/features/external-storage.feature | 2 | ||||
-rwxr-xr-x | build/integration/run.sh | 1 |
3 files changed, 2 insertions, 25 deletions
diff --git a/build/integration/features/bootstrap/ExternalStorageContext.php b/build/integration/features/bootstrap/ExternalStorageContext.php deleted file mode 100644 index 90dc06cf571..00000000000 --- a/build/integration/features/bootstrap/ExternalStorageContext.php +++ /dev/null @@ -1,24 +0,0 @@ -<?php - - -require __DIR__ . '/../../vendor/autoload.php'; - -use Behat\Gherkin\Node\TableNode; -use GuzzleHttp\Client; -use GuzzleHttp\Message\ResponseInterface; - -class ExternalStorageContext implements \Behat\Behat\Context\Context { - - - /** - * @AfterScenario - */ - public static function removeFilesFromLocalStorage(){ - $dir = "./local_storage/"; - $di = new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS); - $ri = new RecursiveIteratorIterator($di, RecursiveIteratorIterator::CHILD_FIRST); - foreach ( $ri as $file ) { - $file->isDir() ? rmdir($file) : unlink($file); - } - } -} diff --git a/build/integration/features/external-storage.feature b/build/integration/features/external-storage.feature index ac8bd971edf..9e53b01346e 100644 --- a/build/integration/features/external-storage.feature +++ b/build/integration/features/external-storage.feature @@ -3,6 +3,7 @@ Feature: external-storage Given using api version "1" Given using dav path "remote.php/webdav" + @local_storage Scenario: Share by link a file inside a local external storage Given user "user0" exists And user "user1" exists @@ -21,6 +22,5 @@ Feature: external-storage | url | AN_URL | | token | A_TOKEN | | mimetype | httpd/unix-directory | - And Public shared file "/foo/textfile0.txt" can be downloaded diff --git a/build/integration/run.sh b/build/integration/run.sh index ac8c61893af..33fb254acd4 100755 --- a/build/integration/run.sh +++ b/build/integration/run.sh @@ -32,6 +32,7 @@ OUTPUT_CREATE_STORAGE=`../../occ files_external:create local_storage local null: ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}` + ../../occ files_external:option $ID_STORAGE enable_sharing true vendor/bin/behat -f junit -f pretty $SCENARIO_TO_RUN |