fix(CI): Clear the trash between tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · May 10, 2023 · 5bc9f25 · 5bc9f25
1 parent ccb92d6
commit 5bc9f25
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/tests/Integration/features/bootstrap/FeatureContext.php b/tests/Integration/features/bootstrap/FeatureContext.php
@@ -82,6 +82,14 @@ public function cleanUpBetweenTests() {
 			$this->userDeletesFile('test1', 'file', '/foobar.txt');
 		} catch (\Exception $e) {
 		}
+		try {
+			$this->userDeletesFile('test1', 'file', '/definitely.notexe');
+		} catch (\Exception $e) {
+		}
+		try {
+			$this->emptyTrashbin('test1');
+		} catch (\Exception $e) {
+		}
 	}
 
 	/**

diff --git a/tests/Integration/features/bootstrap/WebDav.php b/tests/Integration/features/bootstrap/WebDav.php
@@ -655,6 +655,16 @@ public function userDeletesFile($user, $type, $file) {
 		}
 	}
 
+	/**
+	 * @When User "([^"]*)" empties trashbin
+	 * @param string $user user
+	 */
+	public function emptyTrashbin($user) {
+		$client = $this->getSabreClient($user);
+		$response = $client->request('DELETE', $this->makeSabrePath($user, 'trash', 'trashbin'));
+		Assert::assertEquals(204, $response['statusCode']);
+	}
+
 	/**
 	 * @Given User :user created a folder :destination
 	 * @param string $user