test(refactor): change the structure of When step while moving, copyi…

…ng and renaming
owncloud · Nov 19, 2024 · 0baccb9 · 0baccb9
1 parent a7e8069
commit 0baccb9
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 72 deletions.
diff --git a/tests/acceptance/bootstrap/SpacesContext.php b/tests/acceptance/bootstrap/SpacesContext.php
@@ -1997,31 +1997,22 @@ public function copyFilesAndFoldersRequest(string $user, string $fullUrl, array
 	}
 
 	/**
-	 * @When /^user "([^"]*)" (copies|moves|renames) a file "([^"]*)" into "([^"]*)" inside space "([^"]*)" using file-id "([^"]*)"$/
+	 * @When /^user "([^"]*)" (copies|moves) file with id "([^"]*)" as "([^"]*)" into folder "([^"]*)" inside space "([^"]*)"$/
 	 *
 	 * @param string $user
 	 * @param string $actionType
-	 * @param string $sourceFile
+	 * @param string $fileId
 	 * @param string $destinationFile
+	 * @param string $destinationFolder
 	 * @param string $toSpaceName
-	 * @param string $fileId
 	 *
 	 * @throws GuzzleException
 	 * @return void
 	 */
-	public function userCopiesMovesFileIntoInsideSpaceUsingFileId(string $user, string $actionType, string $sourceFile, string $destinationFile, string $toSpaceName, string $fileId): void {
-		// split the source when there are sub-folders
-		$sourceFile = \trim($sourceFile, "/");
-		$sourceFile = \explode("/", $sourceFile);
-		$sourceFile = \end($sourceFile);
+	public function userCopiesOrMovesFileWithIdAsIntoFolderInsideSpace(string $user, string $actionType, string $fileId, string $destinationFile, string $destinationFolder, string $toSpaceName): void {
 		$destinationFile = \trim($destinationFile, "/");
-		$fileDestination = '';
-		if ($actionType === 'copies' || $actionType === 'moves') {
-			$fileDestination = $this->escapePath($destinationFile) . '/' . $this->escapePath($sourceFile);
-		} elseif ($actionType === 'renames') {
-			$fileDestination = $destinationFile;
-		}
-
+		$destinationFolder = \trim($destinationFolder, "/");
+		$fileDestination = $destinationFolder . '/' . $this->escapePath($destinationFile);
 		$baseUrl = $this->featureContext->getBaseUrl();
 		$sourceDavPath = WebdavHelper::getDavPath($this->featureContext->getDavPathVersion());
 		if ($toSpaceName === 'Shares') {
@@ -2034,11 +2025,45 @@ public function userCopiesMovesFileIntoInsideSpaceUsingFileId(string $user, stri
 		$fullUrl = "$baseUrl/$sourceDavPath/$fileId";
 		if ($actionType === 'copies') {
 			$this->featureContext->setResponse($this->copyFilesAndFoldersRequest($user, $fullUrl, $headers));
-		} elseif ($actionType === 'moves' || $actionType === 'renames') {
+		} else {
 			$this->featureContext->setResponse($this->moveFilesAndFoldersRequest($user, $fullUrl, $headers));
 		}
 	}
 
+	/**
+	 * @Given /^user "([^"]*)" renames file with id "([^"]*)" to "([^"]*)" inside space "([^"]*)"$/
+	 *
+	 * @param string $user
+	 * @param string $fileId
+	 * @param string $destinationFile
+	 * @param string $spaceName
+	 *
+	 * @throws GuzzleException
+	 * @return void
+	 */
+	public function userRenamesFileWithIdToInsideSpace(
+		string $user,
+		string $fileId,
+		string $destinationFile,
+		string $spaceName
+	): void {
+		$destinationFile = \trim($destinationFile, "/");
+
+		$fileDestination = $this->escapePath($destinationFile);
+
+		$baseUrl = $this->featureContext->getBaseUrl();
+		$sourceDavPath = WebdavHelper::getDavPath($this->featureContext->getDavPathVersion());
+		if ($spaceName === 'Shares') {
+			$sharesPath = $this->featureContext->getSharesMountPath($user, $fileDestination);
+			$davPath = WebDavHelper::getDavPath($this->featureContext->getDavPathVersion());
+			$headers['Destination'] = "$baseUrl/$davPath/$sharesPath";
+		} else {
+			$headers['Destination'] = $this->destinationHeaderValueWithSpaceName($user, $fileDestination, $spaceName, $fileId);
+		}
+		$fullUrl = "$baseUrl/$sourceDavPath/$fileId";
+		$this->featureContext->setResponse($this->moveFilesAndFoldersRequest($user, $fullUrl, $headers));
+	}
+
 	/**
 	 * @Given /^user "([^"]*)" has (copied|moved) file with id "([^"]*)" as "([^"]*)" into folder "([^"]*)" inside space "([^"]*)"$/
 	 *

diff --git a/tests/acceptance/features/apiSpacesDavOperation/copyByFileId.feature b/tests/acceptance/features/apiSpacesDavOperation/copyByFileId.feature
@@ -12,7 +12,7 @@ Feature: copying file using file id
     Given user "Alice" has created folder "/folder"
     And user "Alice" has uploaded file with content "some data" to "/textfile.txt"
     And we save it into "FILEID"
-    When user "Alice" copies a file "/textfile.txt" into "/folder" inside space "Personal" using file-id "<<FILEID>>"
+    When user "Alice" copies file with id "<<FILEID>>" as "/textfile.txt" into folder "/folder" inside space "Personal"
     Then the HTTP status code should be "201"
     And for user "Alice" folder "/" of the space "Personal" should contain these files:
       | textfile.txt |
@@ -25,7 +25,7 @@ Feature: copying file using file id
     And user "Alice" has created folder "folder/sub-folder"
     And user "Alice" has uploaded file with content "some data" to "/textfile.txt"
     And we save it into "FILEID"
-    When user "Alice" copies a file "/textfile.txt" into "/folder/sub-folder" inside space "Personal" using file-id "<<FILEID>>"
+    When user "Alice" copies file with id "<<FILEID>>" as "textfile.txt" into folder "/folder/sub-folder" inside space "Personal"
     Then the HTTP status code should be "201"
     And for user "Alice" folder "/" of the space "Personal" should contain these files:
       | textfile.txt |
@@ -37,7 +37,7 @@ Feature: copying file using file id
     Given user "Alice" has created folder "/folder"
     And user "Alice" has uploaded file with content "some data" to "folder/textfile.txt"
     And we save it into "FILEID"
-    When user "Alice" copies a file "folder/textfile.txt" into "/" inside space "Personal" using file-id "<<FILEID>>"
+    When user "Alice" copies file with id "<<FILEID>>" as "textfile.txt" into folder "/" inside space "Personal"
     Then the HTTP status code should be "201"
     And for user "Alice" folder "/" of the space "Personal" should contain these files:
       | textfile.txt |
@@ -50,7 +50,7 @@ Feature: copying file using file id
     And user "Alice" has created folder "folder/sub-folder"
     And user "Alice" has uploaded file with content "some data" to "folder/sub-folder/textfile.txt"
     And we save it into "FILEID"
-    When user "Alice" copies a file "folder/sub-folder/textfile.txt" into "/" inside space "Personal" using file-id "<<FILEID>>"
+    When user "Alice" copies file with id "<<FILEID>>" as "/textfile.txt" into folder "/" inside space "Personal"
     Then the HTTP status code should be "201"
     And for user "Alice" folder "/" of the space "Personal" should contain these files:
       | textfile.txt |
@@ -64,7 +64,7 @@ Feature: copying file using file id
     And user "Alice" has created a folder "/folder" in space "project-space"
     And user "Alice" has uploaded a file inside space "project-space" with content "some data" to "textfile.txt"
     And we save it into "FILEID"
-    When user "Alice" copies a file "/textfile.txt" into "/folder" inside space "project-space" using file-id "<<FILEID>>"
+    When user "Alice" copies file with id "<<FILEID>>" as "/textfile.txt" into folder "/folder" inside space "project-space"
     Then the HTTP status code should be "201"
     And for user "Alice" folder "/" of the space "project-space" should contain these files:
       | textfile.txt |
@@ -78,7 +78,7 @@ Feature: copying file using file id
     And user "Alice" has created a folder "folder/sub-folder" in space "project-space"
     And user "Alice" has uploaded a file inside space "project-space" with content "some data" to "textfile.txt"
     And we save it into "FILEID"
-    When user "Alice" copies a file "/textfile.txt" into "/folder/sub-folder" inside space "project-space" using file-id "<<FILEID>>"
+    When user "Alice" copies file with id "<<FILEID>>" as "/textfile.txt" into folder "/folder/sub-folder" inside space "project-space"
     Then the HTTP status code should be "201"
     And for user "Alice" folder "/" of the space "project-space" should contain these files:
       | textfile.txt |
@@ -92,7 +92,7 @@ Feature: copying file using file id
     And user "Alice" has created a folder "folder" in space "project-space"
     And user "Alice" has uploaded a file inside space "project-space" with content "some data" to "folder/textfile.txt"
     And we save it into "FILEID"
-    When user "Alice" copies a file "folder/textfile.txt" into "/" inside space "project-space" using file-id "<<FILEID>>"
+    When user "Alice" copies file with id "<<FILEID>>" as "textfile.txt" into folder "/" inside space "project-space"
     Then the HTTP status code should be "201"
     And for user "Alice" folder "/" of the space "project-space" should contain these files:
       | textfile.txt |
@@ -106,7 +106,7 @@ Feature: copying file using file id
     And user "Alice" has created a folder "folder/sub-folder" in space "project-space"
     And user "Alice" has uploaded a file inside space "project-space" with content "some data" to "folder/sub-folder/textfile.txt"
     And we save it into "FILEID"
-    When user "Alice" copies a file "folder/sub-folder/textfile.txt" into "/" inside space "project-space" using file-id "<<FILEID>>"
+    When user "Alice" copies file with id "<<FILEID>>" as "textfile.txt" into folder "/" inside space "project-space"
     Then the HTTP status code should be "201"
     And for user "Alice" folder "/" of the space "project-space" should contain these files:
       | textfile.txt |
@@ -119,7 +119,7 @@ Feature: copying file using file id
     And user "Alice" has created a space "project-space" with the default quota using the Graph API
     And user "Alice" has uploaded file with content "some data" to "textfile.txt"
     And we save it into "FILEID"
-    When user "Alice" copies a file "/textfile.txt" into "/" inside space "project-space" using file-id "<<FILEID>>"
+    When user "Alice" copies file with id "<<FILEID>>" as "/textfile.txt" into folder "/" inside space "project-space"
     Then the HTTP status code should be "201"
     And for user "Alice" folder "/" of the space "project-space" should contain these files:
       | textfile.txt |
@@ -140,7 +140,7 @@ Feature: copying file using file id
       | shareType       | user     |
       | permissionsRole | Editor   |
     And user "Brian" has a share "folder" synced
-    When user "Brian" copies a file "Shares/folder/sub-folder/test.txt" into "Shares/folder" inside space "Shares" using file-id "<<FILEID>>"
+    When user "Brian" copies file with id "<<FILEID>>" as "test.txt" into folder "Shares/folder" inside space "Shares"
     Then the HTTP status code should be "201"
     And for user "Brian" folder "folder" of the space "Shares" should contain these files:
       | test.txt |
@@ -165,7 +165,7 @@ Feature: copying file using file id
     And user "Brian" has uploaded file with content "some data" to "/test.txt"
     And we save it into "FILEID"
     And user "Brian" has a share "folder" synced
-    When user "Brian" copies a file "/test.txt" into "Shares/folder" inside space "Shares" using file-id "<<FILEID>>"
+    When user "Brian" copies file with id "<<FILEID>>" as "/test.txt" into folder "Shares/folder" inside space "Shares"
     Then the HTTP status code should be "201"
     And for user "Brian" folder "folder" of the space "Shares" should contain these files:
       | test.txt |
@@ -187,7 +187,7 @@ Feature: copying file using file id
       | shareType       | user              |
       | permissionsRole | <permission-role> |
     And user "Brian" has a share "folder" synced
-    When user "Brian" copies a file "/test.txt" into "/" inside space "Personal" using file-id "<<FILEID>>"
+    When user "Brian" copies file with id "<<FILEID>>" as "/test.txt" into folder "/" inside space "Personal"
     Then the HTTP status code should be "201"
     And for user "Brian" folder "folder" of the space "Shares" should contain these files:
       | test.txt |
@@ -215,7 +215,7 @@ Feature: copying file using file id
       | shareType       | user          |
       | permissionsRole | Secure Viewer |
     And user "Brian" has a share "folder" synced
-    When user "Brian" copies a file "/test.txt" into "/" inside space "Personal" using file-id "<<FILEID>>"
+    When user "Brian" copies file with id "<<FILEID>>" as "/test.txt" into folder "/" inside space "Personal"
     Then the HTTP status code should be "403"
     And for user "Brian" folder "folder" of the space "Shares" should contain these files:
       | test.txt |
@@ -242,7 +242,7 @@ Feature: copying file using file id
       | sharee          | Brian         |
       | shareType       | user          |
       | permissionsRole | <space-role>  |
-    When user "Brian" copies a file "Shares/folder/test.txt" into "/" inside space "project-space" using file-id "<<FILEID>>"
+    When user "Brian" copies file with id "<<FILEID>>" as "test.txt" into folder "/" inside space "project-space"
     Then the HTTP status code should be "201"
     And for user "Brian" folder "folder" of the space "Shares" should contain these files:
       | test.txt |
@@ -280,7 +280,7 @@ Feature: copying file using file id
       | sharee          | Brian         |
       | shareType       | user          |
       | permissionsRole | <space-role>  |
-    When user "Brian" copies a file "Shares/folder/test.txt" into "/" inside space "project-space" using file-id "<<FILEID>>"
+    When user "Brian" copies file with id "<<FILEID>>" as "/test.txt" into folder "/" inside space "project-space"
     Then the HTTP status code should be "403"
     And for user "Brian" folder "folder" of the space "Shares" should contain these files:
       | test.txt |
@@ -318,7 +318,7 @@ Feature: copying file using file id
       | shareType       | user            |
       | permissionsRole | <to-share-role> |
     And user "Brian" has a share "share2" synced
-    When user "Brian" copies a file "Shares/share1/test.txt" into "share2" inside space "Shares" using file-id "<<FILEID>>"
+    When user "Brian" copies file with id "<<FILEID>>" as "/test.txt" into folder "share2" inside space "Shares"
     Then the HTTP status code should be "201"
     And for user "Brian" folder "share1" of the space "Shares" should contain these files:
       | test.txt |
@@ -359,7 +359,7 @@ Feature: copying file using file id
       | shareType       | user            |
       | permissionsRole | <to-share-role> |
     And user "Brian" has a share "share2" synced
-    When user "Brian" copies a file "Shares/share1/test.txt" into "share2" inside space "Shares" using file-id "<<FILEID>>"
+    When user "Brian" copies file with id "<<FILEID>>" as "test.txt" into folder "share2" inside space "Shares"
     Then the HTTP status code should be "403"
     And for user "Brian" folder "share1" of the space "Shares" should contain these files:
       | test.txt |
@@ -394,7 +394,7 @@ Feature: copying file using file id
       | sharee          | Brian         |
       | shareType       | user          |
       | permissionsRole | <space-role>  |
-    When user "Brian" copies a file "/textfile.txt" into "/" inside space "Personal" using file-id "<<FILEID>>"
+    When user "Brian" copies file with id "<<FILEID>>" as "/textfile.txt" into folder "/" inside space "Personal"
     Then the HTTP status code should be "201"
     And for user "Brian" folder "/" of the space "project-space" should contain these files:
       | textfile.txt |
@@ -424,7 +424,7 @@ Feature: copying file using file id
       | sharee          | Brian                |
       | shareType       | user                 |
       | permissionsRole | <to-space-role>      |
-    When user "Brian" copies a file "textfile.txt" into "/" inside space "second-project-space" using file-id "<<FILEID>>"
+    When user "Brian" copies file with id "<<FILEID>>" as "textfile.txt" into folder "/" inside space "second-project-space"
     Then the HTTP status code should be "201"
     And for user "Brian" the space "second-project-space" should contain these entries:
       | textfile.txt |
@@ -459,7 +459,7 @@ Feature: copying file using file id
       | sharee          | Brian                |
       | shareType       | user                 |
       | permissionsRole | <to-space-role>      |
-    When user "Brian" copies a file "textfile.txt" into "/" inside space "second-project-space" using file-id "<<FILEID>>"
+    When user "Brian" copies file with id "<<FILEID>>" as "textfile.txt" into folder "/" inside space "second-project-space"
     Then the HTTP status code should be "403"
     And for user "Brian" the space "second-project-space" should not contain these entries:
       | textfile.txt |
@@ -493,7 +493,7 @@ Feature: copying file using file id
       | shareType       | user          |
       | permissionsRole | <permissions> |
     And user "Brian" has a share "testshare" synced
-    When user "Brian" copies a file "textfile.txt" into "testshare" inside space "Shares" using file-id "<<FILEID>>"
+    When user "Brian" copies file with id "<<FILEID>>" as "textfile.txt" into folder "testshare" inside space "Shares"
     Then the HTTP status code should be "201"
     And for user "Brian" folder "/" of the space "project-space" should contain these files:
       | textfile.txt |
@@ -531,7 +531,7 @@ Feature: copying file using file id
       | shareType       | user          |
       | permissionsRole | <permissions> |
     And user "Brian" has a share "testshare" synced
-    When user "Brian" copies a file "textfile.txt" into "testshare" inside space "Shares" using file-id "<<FILEID>>"
+    When user "Brian" copies file with id "<<FILEID>>" as "textfile.txt" into folder "testshare" inside space "Shares"
     Then the HTTP status code should be "403"
     And for user "Brian" folder "/" of the space "project-space" should contain these files:
       | textfile.txt |

diff --git a/tests/acceptance/features/apiSpacesDavOperation/fileVersionByFileID.feature b/tests/acceptance/features/apiSpacesDavOperation/fileVersionByFileID.feature
@@ -125,7 +125,7 @@ Feature: checking file versions using file id
     And user "Alice" has uploaded file with content "some data - edited" to "<source>textfile.txt"
     And we save it into "FILEID"
     And using spaces DAV path
-    When user "Alice" moves a file "<source>textfile.txt" into "<destination>" inside space "Personal" using file-id "<<FILEID>>"
+    When user "Alice" moves file with id "<<FILEID>>" as "textfile.txt" into folder "<destination>" inside space "Personal"
     Then the HTTP status code should be "201"
     When user "Alice" gets the number of versions of file "<destination>textfile.txt" using file-id "<<FILEID>>"
     Then the HTTP status code should be "207"
@@ -156,7 +156,7 @@ Feature: checking file versions using file id
     And user "Alice" has uploaded a file inside space "Project1" with content "some data" to "<source>textfile.txt"
     And user "Alice" has uploaded a file inside space "Project1" with content "some data - edited" to "<source>textfile.txt"
     And we save it into "FILEID"
-    When user "Alice" moves a file "<source>textfile.txt" into "<destination>" inside space "Project1" using file-id "<<FILEID>>"
+    When user "Alice" moves file with id "<<FILEID>>" as "textfile.txt" into folder "<destination>" inside space "Project1"
     Then the HTTP status code should be "201"
     When user "Alice" gets the number of versions of file "<destination>textfile.txt" using file-id "<<FILEID>>"
     Then the HTTP status code should be "207"