Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[full-ci] [tests-only] Remove invokecommand related steps from occ context #5632

Merged
merged 2 commits into from
Feb 24, 2023
Merged

[full-ci] [tests-only] Remove invokecommand related steps from occ context #5632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01a007b
Removed occ invoking command steps
grgprarup Feb 23, 2023
6bc7c6e
Fixed line numbers in expected failure
grgprarup Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tests/acceptance/expected-failures-API-on-OCIS-storage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,19 +885,19 @@ Not everything needs to be implemented for ocis. While the oc10 testsuite covers
- [coreApiTrashbin/trashbinFilesFolders.feature:100](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L100)
- [coreApiTrashbin/trashbinFilesFolders.feature:136](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L136)
- [coreApiTrashbin/trashbinFilesFolders.feature:159](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L159)
- [coreApiTrashbin/trashbinFilesFolders.feature:322](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L322)
- [coreApiTrashbin/trashbinFilesFolders.feature:323](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L323)
- [coreApiTrashbin/trashbinFilesFolders.feature:324](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L324)
- [coreApiTrashbin/trashbinFilesFolders.feature:325](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L325)
- [coreApiTrashbin/trashbinFilesFolders.feature:329](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L329)
- [coreApiTrashbin/trashbinFilesFolders.feature:330](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L330)
- [coreApiTrashbin/trashbinFilesFolders.feature:331](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L331)
- [coreApiTrashbin/trashbinFilesFolders.feature:332](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L332)
- [coreApiTrashbin/trashbinFilesFolders.feature:333](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L333)
- [coreApiTrashbin/trashbinFilesFolders.feature:334](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L334)
- [coreApiTrashbin/trashbinFilesFolders.feature:335](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L335)
- [coreApiTrashbin/trashbinFilesFolders.feature:352](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L352)
- [coreApiTrashbin/trashbinFilesFolders.feature:372](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L372)
- [coreApiTrashbin/trashbinFilesFolders.feature:426](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L426)
- [coreApiTrashbin/trashbinFilesFolders.feature:463](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L463)
- [coreApiTrashbin/trashbinFilesFolders.feature:351](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L351)
- [coreApiTrashbin/trashbinFilesFolders.feature:371](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L371)
- [coreApiTrashbin/trashbinFilesFolders.feature:425](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L425)
- [coreApiTrashbin/trashbinFilesFolders.feature:462](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L462)

#### [Default capabilities for normal user and admin user not same as in oC-core](https://github.com/owncloud/ocis/issues/1285)
- [coreApiCapabilities/capabilities.feature:8](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiCapabilities/capabilities.feature#L8)
Expand Down
90 changes: 0 additions & 90 deletions tests/acceptance/features/bootstrap/OccContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,49 +543,6 @@ public function listLocalStorageShowPassword():void {
$this->invokingTheCommand('files_external:list --show-password --output=json');
}

/**
* @When /^the administrator invokes occ command "([^"]*)"$/
*
* @param string $cmd
*
* @return void
* @throws Exception
*/
public function theAdministratorInvokesOccCommand(string $cmd):void {
$this->invokingTheCommand($cmd);
}

/**
* @When /^the administrator invokes occ command "([^"]*)" for user "([^"]*)"$/
*
* @param string $cmd
* @param string $user
*
* @return void
* @throws Exception
*/
public function theAdministratorInvokesOccCommandForUser(string $cmd, string $user):void {
$user = $this->featureContext->getActualUsername($user);
$cmd = $this->featureContext->substituteInLineCodes(
$cmd,
$user
);
$this->invokingTheCommand($cmd);
}

/**
* @Given /^the administrator has invoked occ command "([^"]*)"$/
*
* @param string $cmd
*
* @return void
* @throws Exception
*/
public function theAdministratorHasInvokedOccCommand(string $cmd):void {
$this->invokingTheCommand($cmd);
$this->theCommandShouldHaveBeenSuccessful();
}

/**
* @Given the administrator has selected master key encryption type using the occ command
*
Expand Down Expand Up @@ -634,53 +591,6 @@ public function theAdministratorRemovesTheSecurityCertificate(string $certificat
\array_push($this->removedCertificates, $certificate);
}

/**
* @When /^the administrator invokes occ command "([^"]*)" with environment variable "([^"]*)" set to "([^"]*)"$/
*
* @param string $cmd
* @param string $envVariableName
* @param string $envVariableValue
*
* @return void
* @throws Exception
*/
public function theAdministratorInvokesOccCommandWithEnvironmentVariable(
string $cmd,
string $envVariableName,
string $envVariableValue
):void {
$this->featureContext->setOccLastCode(
$this->invokingTheCommandWithEnvVariable(
$cmd,
$envVariableName,
$envVariableValue
)
);
}

/**
* @Given /^the administrator has invoked occ command "([^"]*)" with environment variable "([^"]*)" set to "([^"]*)"$/
*
* @param string $cmd
* @param string $envVariableName
* @param string $envVariableValue
*
* @return void
* @throws Exception
*/
public function theAdministratorHasInvokedOccCommandWithEnvironmentVariable(
string $cmd,
string $envVariableName,
string $envVariableValue
):void {
$this->invokingTheCommandWithEnvVariable(
$cmd,
$envVariableName,
$envVariableValue
);
$this->theCommandShouldHaveBeenSuccessful();
}

/**
* @When the administrator runs upgrade routines on local server using the occ command
*
Expand Down
1 change: 0 additions & 1 deletion tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ Feature: files and folders exist in the trashbin after being deleted
@local_storage @files_external-app-required @skipOnEncryptionType:user-keys @encryption-issue-42 @skip_on_objectstore
Scenario Outline: Deleting a folder into external storage moves it to the trashbin
Given using <dav-path> DAV path
And the administrator has invoked occ command "files:scan --all"
And user "Alice" has created folder "/local_storage/tmp"
And user "Alice" has moved file "/textfile0.txt" to "/local_storage/tmp/textfile0.txt"
When user "Alice" deletes folder "/local_storage/tmp" using the WebDAV API
Expand Down
2 changes: 0 additions & 2 deletions tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ Feature: Restore deleted files/folders
@local_storage @files_external-app-required @skipOnEncryptionType:user-keys @encryption-issue-42 @skip_on_objectstore
Scenario Outline: Deleting a file into external storage moves it to the trashbin and can be restored
Given using <dav-path> DAV path
And the administrator has invoked occ command "files:scan --all"
And user "Alice" has created folder "/local_storage/tmp"
And user "Alice" has moved file "/textfile0.txt" to "/local_storage/tmp/textfile0.txt"
And user "Alice" has deleted file "/local_storage/tmp/textfile0.txt"
Expand All @@ -156,7 +155,6 @@ Feature: Restore deleted files/folders
@local_storage @files_external-app-required @skipOnEncryptionType:user-keys @encryption-issue-42 @skip_on_objectstore
Scenario: Deleting an updated file into external storage moves it to the trashbin and can be restored
Given using old DAV path
And the administrator has invoked occ command "files:scan --all"
And user "Alice" has created folder "/local_storage/tmp"
And user "Alice" has moved file "/textfile0.txt" to "/local_storage/tmp/textfile0.txt"
And user "Alice" has uploaded chunk file "1" of "1" with "AA" to "/local_storage/tmp/textfile0.txt"
Expand Down