Merge pull request #3904 from nextcloud/revert-3893-downstream-27069

Revert "Add integration test for trashbin"

Author: MorrisJobke

.drone.yml

@@ -423,15 +423,6 @@ pipeline:
       when:
         matrix:
           TESTS: integration-ldap-features
-  integration-trashbin:
-    image: nextcloudci/integration-php7.0:integration-php7.0-3
-    commands:
-      - ./occ maintenance:install --admin-pass=admin
-      - cd build/integration
-      - ./run.sh features/trashbin.feature
-    when:
-      matrix:
-        TESTS: integration-trashbin
   nodb-codecov:
     image: nextcloudci/php7.0:php7.0-7
     commands:
@@ -500,7 +491,6 @@ matrix:
     - TESTS: integration-filesdrop-features
     - TESTS: integration-transfer-ownership-features
     - TESTS: integration-ldap-features
-    - TESTS: integration-trashbin
     - TESTS: jsunit
     - TESTS: check-autoloader
     - TESTS: app-check-code

build/integration/features/bootstrap/BasicStructure.php

@@ -35,7 +35,6 @@
 trait BasicStructure {
 
 	use Auth;
-	use Trashbin;
 
 	/** @var string */
 	private $currentUser = '';
@@ -354,6 +353,16 @@ public function createFileSpecificSize($name, $size) {
 		fclose($file);
 	}
 
+	/**
+	 * @When User :user empties trashbin
+	 * @param string $user
+	 */
+	public function emptyTrashbin($user) {
+		$body = new \Behat\Gherkin\Node\TableNode([['allfiles', 'true'], ['dir', '%2F']]);
+		$this->sendingToWithDirectUrl('POST', "/index.php/apps/files_trashbin/ajax/delete.php", $body);
+		$this->theHTTPStatusCodeShouldBe('200');
+	}
+
 	/**
 	 * @When Sleep for :seconds seconds
 	 * @param int $seconds

build/integration/features/bootstrap/Trashbin.php

@@ -134,16 +134,3 @@ Feature: favorite
             | /subfolder/textfile0.txt |
             | /subfolder/textfile2.txt |
 
-    Scenario: moving a favorite file out of a share keeps favorite state
-        Given using old dav path
-        And As an "admin"
-        And user "user0" exists
-        And user "user1" exists
-        And user "user0" created a folder "/shared"
-        And User "user0" moved file "/textfile0.txt" to "/shared/shared_file.txt"
-        And folder "/shared" of user "user0" is shared with user "user1"
-        And user "user1" favorites element "/shared/shared_file.txt"
-        When User "user1" moved file "/shared/shared_file.txt" to "/taken_out.txt"
-        Then user "user1" in folder "/" should have favorited the following elements
-            | /taken_out.txt |
-

build/integration/features/favorites.feature

@@ -988,33 +988,3 @@ Feature: sharing
     And Updating last share with
       | publicUpload | true |
     Then the OCS status code should be "404"
-    And the HTTP status code should be "200"
-
-  Scenario: deleting file out of a share as recipient creates a backup for the owner
-    Given As an "admin"
-    And user "user0" exists
-    And user "user1" exists
-    And user "user0" created a folder "/shared"
-    And User "user0" moved file "/textfile0.txt" to "/shared/shared_file.txt"
-    And folder "/shared" of user "user0" is shared with user "user1"
-    When User "user1" deletes file "/shared/shared_file.txt"
-    Then as "user1" the file "/shared/shared_file.txt" does not exist
-    And as "user0" the file "/shared/shared_file.txt" does not exist
-    And as "user0" the file "/shared_file.txt" exists in trash
-    And as "user1" the file "/shared_file.txt" exists in trash
-
-  Scenario: deleting folder out of a share as recipient creates a backup for the owner
-    Given As an "admin"
-    And user "user0" exists
-    And user "user1" exists
-    And user "user0" created a folder "/shared"
-    And user "user0" created a folder "/shared/sub"
-    And User "user0" moved file "/textfile0.txt" to "/shared/sub/shared_file.txt"
-    And folder "/shared" of user "user0" is shared with user "user1"
-    When User "user1" deletes folder "/shared/sub"
-    Then as "user1" the folder "/shared/sub" does not exist
-    And as "user0" the folder "/shared/sub" does not exist
-    And as "user0" the folder "/sub" exists in trash
-    And as "user0" the file "/sub/shared_file.txt" exists in trash
-    And as "user1" the folder "/sub" exists in trash
-    And as "user1" the file "/sub/shared_file.txt" exists in trash