sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[tests-only] [full-ci] Refactoring unshare step definition code (#6608)

Browse Source 
* added unshare scenerio

* remove unshare keyword from step definition

* refactoring of step definition codes

* refactor
This commit is contained in:
Sabin Panta
2023-06-30 12:22:42 +05:45
committed by GitHub
parent f0d99683f0
commit 9b4244b086
7 changed files with 67 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/acceptance/features/bootstrap/WebDav.php
+25 -39
View File
@@ -3340,78 +3340,71 @@ trait WebDav {
* @return void
*/
public function fileHasBeenDeleted(string $file, string $user):void {
$this->userHasDeletedFile($user, "deleted", "file", $file);
$this->userHasDeletedResource($user, "deleted", "file", $file);
}
/**
* @When /^user "([^"]*)" (?:deletes|unshares) (?:file|folder) "([^"]*)" using the WebDAV API$/
* @When user :user deletes file/folder :resource using the WebDAV API
*
* @param string $user
* @param string $file
* @param string $resource
*
* @return void
*/
public function userDeletesFile(string $user, string $file):void {
public function userDeletesFile(string $user, string $resource):void {
$user = $this->getActualUsername($user);
$this->pauseUploadDelete();
$this->response = $this->makeDavRequest($user, 'DELETE', $file, []);
$this->response = $this->makeDavRequest($user, 'DELETE', $resource, []);
$this->lastUploadDeleteTime = \time();
$this->pushToLastHttpStatusCodesArray((string) $this->getResponse()->getStatusCode());
}
/**
* @Given /^user "([^"]*)" has (deleted|unshared) (?:file|folder|entity) "([^"]*)"$/
* @Given /^user "([^"]*)" has deleted (?:file|folder|entity) "([^"]*)"$/
*
* @param string $user
* @param string $deletedOrUnshared
* @param string $entry
* @param string $resource
*
* @return void
* @throws Exception
*/
public function userHasDeletedFile(string $user, string $deletedOrUnshared, string $entry):void {
public function userHasDeletedResource(string $user, string $resource):void {
$user = $this->getActualUsername($user);
$this->userDeletesFile($user, $entry);
$this->userDeletesFile($user, $resource);
// If the file or folder was there and got deleted then we get a 204
// That is good and the expected status
// If the file or folder was already not there then we get a 404
// That is not expected. Scenarios that use "Given user has deleted..."
// should only be using such steps when it is a file that exists and needs
// to be deleted.
if ($deletedOrUnshared === "deleted") {
$deleteText = "delete";
} else {
$deleteText = "unshare";
}
$this->theHTTPStatusCodeShouldBe(
["204"],
"HTTP status code was not 204 while trying to $deleteText resource '$entry' for user '$user'"
"HTTP status code was not 204 while trying to delete resource '$resource' for user '$user'"
);
$this->emptyLastHTTPStatusCodesArray();
}
/**
* @Given /^user "([^"]*)" has (deleted|unshared) the following (?:files|folders|resources)$/
* @Given /^user "([^"]*)" has deleted the following (?:files|folders|resources)$/
*
* @param string $user
* @param string $deletedOrUnshared
* @param TableNode $table
*
* @return void
* @throws Exception
*/
public function userHasDeletedFollowingFiles(string $user, string $deletedOrUnshared, TableNode $table):void {
public function userHasDeletedFollowingFiles(string $user, TableNode $table):void {
$this->verifyTableNodeColumns($table, ["path"]);
$paths = $table->getHash();
foreach ($paths as $file) {
$this->userHasDeletedFile($user, $deletedOrUnshared, $file["path"]);
$this->userHasDeletedResource($user, $file["path"]);
}
}
/**
* @When /^user "([^"]*)" (?:deletes|unshares) the following (?:files|folders)$/
* @When /^user "([^"]*)" deletes the following (?:files|folders)$/
*
* @param string $user
* @param TableNode $table
@@ -3431,7 +3424,7 @@ trait WebDav {
}
/**
* @When /^the user (?:deletes|unshares) (?:file|folder) "([^"]*)" using the WebDAV API$/
* @When /^the user deletes (?:file|folder) "([^"]*)" using the WebDAV API$/
*
* @param string $file
*
@@ -3442,20 +3435,19 @@ trait WebDav {
}
/**
* @Given /^the user has (deleted|unshared) (file|folder) "([^"]*)"$/
* @Given /^the user has deleted (file|folder) "([^"]*)"$/
*
* @param string $deletedOrUnshared
* @param string $fileOrFolder
* @param string $file
*
* @return void
*/
public function theUserHasDeletedFile(string $deletedOrUnshared, string $fileOrFolder, string $file):void {
$this->userHasDeletedFile($this->getCurrentUser(), $deletedOrUnshared, $fileOrFolder, $file);
public function theUserHasDeletedFile(string $fileOrFolder, string $file):void {
$this->userHasDeletedResource($this->getCurrentUser(), $fileOrFolder, $file);
}
/**
* @When /^user "([^"]*)" (?:deletes|unshares) these (?:files|folders|entries) without delays using the WebDAV API$/
* @When /^user "([^"]*)" deletes these (?:files|folders|entries) without delays using the WebDAV API$/
*
* @param string $user
* @param TableNode $table of files or folders to delete
@@ -3475,7 +3467,7 @@ trait WebDav {
}
/**
* @When /^the user (?:deletes|unshares) these (?:files|folders|entries) without delays using the WebDAV API$/
* @When /^the user deletes these (?:files|folders|entries) without delays using the WebDAV API$/
*
* @param TableNode $table of files or folders to delete
*
@@ -3487,7 +3479,7 @@ trait WebDav {
}
/**
* @When /^user "([^"]*)" on "(LOCAL|REMOTE)" (?:deletes|unshares) (?:file|folder) "([^"]*)" using the WebDAV API$/
* @When /^user "([^"]*)" on "(LOCAL|REMOTE)" deletes (?:file|folder) "([^"]*)" using the WebDAV API$/
*
* @param string $user
* @param string $server
@@ -3502,30 +3494,24 @@ trait WebDav {
}
/**
* @Given /^user "([^"]*)" on "(LOCAL|REMOTE)" has (deleted|unshared) (file|folder) "([^"]*)"$/
* @Given /^user "([^"]*)" on "(LOCAL|REMOTE)" has deleted (file|folder) "([^"]*)"$/
*
* @param string $user
* @param string $server
* @param string $deletedOrUnshared
* @param string $fileOrFolder
* @param string $entry
*
* @return void
*/
public function userOnHasDeletedFile(string $user, string $server, string $deletedOrUnshared, string $fileOrFolder, string $entry):void {
public function userOnHasDeletedFile(string $user, string $server, string $fileOrFolder, string $entry):void {
$this->userOnDeletesFile($user, $server, $entry);
// If the file was there and got deleted then we get a 204
// If the file was already not there then we get a 404
// Either way, the outcome of the "given" step is OK
if ($deletedOrUnshared === "deleted") {
$deleteText = "delete";
} else {
$deleteText = "unshare";
}
$this->theHTTPStatusCodeShouldBe(
["204", "404"],
"HTTP status code was not 204 or 404 while trying to $deleteText $fileOrFolder '$entry' for user '$user' on server '$server'"
"HTTP status code was not 204 or 404 while trying to delete $fileOrFolder '$entry' for user '$user' on server '$server'"
);
}
@@ -4456,7 +4442,7 @@ trait WebDav {
foreach ($elementList as $element) {
$element = \substr((string)$element, \strlen($davPrefix));
if ($checkEachDelete) {
$this->userHasDeletedFile($user, "deleted", "file", $element);
$this->userHasDeletedResource($user, "deleted", "file", $element);
} else {
$this->userDeletesFile($user, $element);
}