diff --git a/Makefile b/Makefile index 52b1d896..b547d13d 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,8 @@ doc_files=README.md CHANGELOG.md LICENSE src_dirs=appinfo css img js l10n lib templates all_src=$(src_dirs) $(doc_files) +# composer +composer_deps=vendor acceptance_test_deps=vendor-bin/behat/vendor # bin file definitions @@ -41,10 +43,11 @@ help: @fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//' | sed -e 's/ */ /' | column -t -s : .PHONY: clean -clean: clean-composer-deps +clean: clean-deps -.PHONY: clean-composer-deps -clean-composer-deps: +.PHONY: clean-deps +clean-deps: + rm -Rf ${composer_deps} rm -Rf vendor-bin/**/vendor vendor-bin/**/composer.lock ##--------------------- diff --git a/composer.lock b/composer.lock index 54ae5337..9c780cec 100644 --- a/composer.lock +++ b/composer.lock @@ -9,16 +9,16 @@ "packages-dev": [ { "name": "bamarni/composer-bin-plugin", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/bamarni/composer-bin-plugin.git", - "reference": "c1bbee3662a2a84c6aad84b7c6daefcae29e5690" + "reference": "24764700027bcd3cb072e5f8005d4a150fe714fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/c1bbee3662a2a84c6aad84b7c6daefcae29e5690", - "reference": "c1bbee3662a2a84c6aad84b7c6daefcae29e5690", + "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/24764700027bcd3cb072e5f8005d4a150fe714fe", + "reference": "24764700027bcd3cb072e5f8005d4a150fe714fe", "shasum": "" }, "require": { @@ -38,7 +38,7 @@ }, "type": "composer-plugin", "extra": { - "class": "Bamarni\\Composer\\Bin\\Plugin" + "class": "Bamarni\\Composer\\Bin\\BamarniBinPlugin" }, "autoload": { "psr-4": { @@ -60,9 +60,9 @@ ], "support": { "issues": "https://github.com/bamarni/composer-bin-plugin/issues", - "source": "https://github.com/bamarni/composer-bin-plugin/tree/1.7.0" + "source": "https://github.com/bamarni/composer-bin-plugin/tree/1.8.0" }, - "time": "2022-07-10T17:28:16+00:00" + "time": "2022-07-14T10:29:51+00:00" } ], "aliases": [], diff --git a/tests/acceptance/features/apiEncryption/quotaOc10Issue40140.feature b/tests/acceptance/features/apiEncryption/quotaOc10Issue40140.feature deleted file mode 100644 index bc87bd5d..00000000 --- a/tests/acceptance/features/apiEncryption/quotaOc10Issue40140.feature +++ /dev/null @@ -1,64 +0,0 @@ -@api @issue-40140 -Feature: quota - - Background: - Given using OCS API version "1" - And user "Alice" has been created with default attributes and without skeleton files - - @files_sharing-app-required - Scenario: share receiver with insufficient quota should not be able to copy received shared file to home folder - Given the administrator has set the default folder for received shares to "Shares" - And auto-accept shares has been disabled - And user "Brian" has been created with default attributes and without skeleton files - And the quota of user "Brian" has been set to "10 B" - And the quota of user "Alice" has been set to "10 MB" - And user "Alice" has uploaded file with content "test-content-15" to "/testquota.txt" - And user "Alice" has shared file "/testquota.txt" with user "Brian" - And user "Brian" has accepted share "/testquota.txt" offered by user "Alice" - When user "Brian" copies file "/Shares/testquota.txt" to "/testquota.txt" using the WebDAV API - # The status indicates that the copy was successful, but actually 507 InsufficientStorage should happen - Then the HTTP status code should be "201" - #Then the HTTP status code should be "507" - #And the DAV exception should be "Sabre\DAV\Exception\InsufficientStorage" - # And as "Brian" file "/testquota.txt" should not exist - And as "Brian" file "/testquota.txt" should exist - - @files_sharing-app-required - Scenario: share receiver with insufficient quota should not be able to copy file from shared folder to home folder - Given the administrator has set the default folder for received shares to "Shares" - And auto-accept shares has been disabled - And user "Brian" has been created with default attributes and without skeleton files - And the quota of user "Brian" has been set to "10 B" - And the quota of user "Alice" has been set to "10 MB" - And user "Alice" has created folder "shareFolder" - And user "Alice" has uploaded file with content "test-content-15" to "/shareFolder/testquota.txt" - And user "Alice" has shared folder "/shareFolder" with user "Brian" - And user "Brian" has accepted share "/shareFolder" offered by user "Alice" - When user "Brian" copies file "/Shares/shareFolder/testquota.txt" to "/testquota.txt" using the WebDAV API - # The status indicates that the copy was successful, but actually 507 InsufficientStorage should happen - Then the HTTP status code should be "201" - #Then the HTTP status code should be "507" - #And the DAV exception should be "Sabre\DAV\Exception\InsufficientStorage" - # And as "Brian" file "/testquota.txt" should not exist - And as "Brian" file "/testquota.txt" should exist - - @files_sharing-app-required - Scenario: share receiver of a share with insufficient quota should not be able to copy file from home folder to the received shared folder - Given the administrator has set the default folder for received shares to "Shares" - And auto-accept shares has been disabled - And user "Brian" has been created with default attributes and without skeleton files - And the quota of user "Brian" has been set to "10 MB" - And the quota of user "Alice" has been set to "10 B" - And user "Alice" has created folder "shareFolder" - And user "Alice" has shared folder "/shareFolder" with user "Brian" - And user "Brian" has accepted share "/shareFolder" offered by user "Alice" - And user "Brian" has uploaded file with content "test-content-15" to "/testquota.txt" - When user "Brian" copies file "/testquota.txt" to "/Shares/shareFolder/testquota.txt" using the WebDAV API - # The status indicates that the copy was successful, but actually 507 InsufficientStorage should happen - Then the HTTP status code should be "201" - #Then the HTTP status code should be "507" - #And the DAV exception should be "Sabre\DAV\Exception\InsufficientStorage" - And as "Brian" file "/testquota.txt" should exist - # The copy should have failed, so Alice should not see the file - # And as "Alice" file "/shareFolder/testquota.txt" should not exist - And as "Alice" file "/shareFolder/testquota.txt" should exist