Skip to content

Commit

Permalink
Merge pull request #40597 from roshanlc/remove-ocis-implementation-tags
Browse files Browse the repository at this point in the history
[tests-only][full-ci] Remove scenario tag `skipOnOcis` from feature files
  • Loading branch information
phil-davis authored Jan 24, 2023
2 parents 6d0f3ce + 55a8908 commit 86c13e8
Show file tree
Hide file tree
Showing 25 changed files with 75 additions and 90 deletions.
2 changes: 1 addition & 1 deletion tests/acceptance/features/apiAuth/cors.feature
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@api @issue-ocis-reva-26 @issue-ocis-reva-27 @skipOnOcis
@api @issue-ocis-reva-26 @issue-ocis-reva-27
Feature: CORS headers

Background:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@api @skipOnOcis
@api
Feature: COPY file/folder

As a user
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@api @skipOnOcis
@api
Feature: create folder using MKCOL

Background:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@api @issue-39597 @skipOnOcis
@api @issue-39597
Feature: get file info using PUT

Background:
Expand Down
94 changes: 47 additions & 47 deletions tests/acceptance/features/apiCapabilities/capabilities.feature

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Feature: resources shared with the same name are received with unique names
And user "Carol" should see the following elements
| Shares/foo/ |
| <share> |
@skipOnOcis
Examples:
| share |
| /Shares/foo (2)/ |
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@api @files_sharing-app-required @issue-ocis-reva-41 @skipOnOcis
@api @files_sharing-app-required @issue-ocis-reva-41
Feature: cannot share resources when in a group that is excluded from sharing

Background:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Feature: share resources where the sharee receives the share in multiple ways
| mimetype | text/plain |
| storage_id | ANY_VALUE |
| share_type | user |
@skipOnOcis
Examples:
| ocs_api_version | ocs_status_code | file_target |
| 1 | 100 | /Shares/textfile0 (2).txt |
Expand Down Expand Up @@ -123,7 +122,6 @@ Feature: share resources where the sharee receives the share in multiple ways
| permissions | read,update |
And the content of file "/Shares/randomfile.txt" for user "Alice" should be "First data"
And the content of file "/Shares/randomfile (2).txt" for user "Alice" should be "Second data"
@skipOnOcis
Examples:
| ocs_api_version | file_target_1 | file_target_2 |
| 1 | /Shares/randomfile.txt | /Shares/randomfile (2).txt |
Expand Down Expand Up @@ -157,7 +155,6 @@ Feature: share resources where the sharee receives the share in multiple ways
| permissions | read,share |
And as "Alice" folder "/Shares/zzzfolder/Brian" should exist
And as "Alice" folder "/Shares/zzzfolder (2)/Carol" should exist
@skipOnOcis
Examples:
| ocs_api_version | file_target_1 | file_target_2 | ocs_status_code |
| 1 | /Shares/zzzfolder | /Shares/zzzfolder (2) | 100 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Feature: cannot share resources outside the group when share with membership gro
And auto-accept shares has been disabled
And user "Alice" has been created with default attributes and without skeleton files

@issue-ocis-1328 @skipOnOcis
@issue-ocis-1328
Scenario Outline: sharer should not be able to share a folder to a group which he/she is not member of when share with only member group is enabled
Given using OCS API version "<ocs_api_version>"
And parameter "shareapi_only_share_with_membership_groups" of app "core" has been set to "yes"
Expand Down Expand Up @@ -66,7 +66,7 @@ Feature: cannot share resources outside the group when share with membership gro
| 1 | 100 |
| 2 | 200 |

@issue-ocis-1328 @skipOnOcis
@issue-ocis-1328
Scenario Outline: sharer should not be able to share a file to a group which he/she is not member of when share with only member group is enabled
Given using OCS API version "<ocs_api_version>"
And parameter "shareapi_only_share_with_membership_groups" of app "core" has been set to "yes"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,6 @@ Feature: sharing
And file "/textfile0.txt" should not be included as path in the response
And as "Brian" file "/Shares/textfile0.txt" should not exist
And as "Carol" file "/Shares/textfile0.txt" should not exist
@skipOnOcis
Examples:
| ocs_api_version | ocs_status_code | path |
| 1 | 100 | /Shares/textfile0.txt |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Feature: Exclude groups from receiving shares
And user "Brian" has been added to group "grp1"
And user "David" has been added to group "grp2"

@skipOnOcis

Scenario Outline: user cannot share with a group that is excluded from receiving shares but can share with other groups
Given using OCS API version "<ocs_api_version>"
And user "Alice" has created folder "PARENT"
Expand All @@ -45,7 +45,7 @@ Feature: Exclude groups from receiving shares
| 1 | 200 |
| 2 | 403 |

@skipOnOcis

Scenario Outline: exclude multiple groups from receiving shares stops the user to share with any of them
Given using OCS API version "<ocs_api_version>"
And group "grp3" has been created
Expand Down Expand Up @@ -77,7 +77,7 @@ Feature: Exclude groups from receiving shares
| 1 | 200 |
| 2 | 403 |

@skipOnOcis

Scenario Outline: user cannot reshare a received share with a group that is excluded from receiving shares but can share with other groups
Given using OCS API version "<ocs_api_version>"
And user "Carol" has created folder "PARENT"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ Feature: sharing
And as user "Brian" folder "/merge-test-inside-twogroups-perms" should contain a property "oc:permissions" with value "<expected_permission_1>" or with value "<expected_permission_2>"
And as "Brian" folder "/Shares/merge-test-inside-twogroups-perms" should not exist
And as "Brian" folder "/Shares/merge-test-inside-twogroups-perms (2)" should not exist
@skipOnOcis
Examples:
| expected_permission_1 | expected_permission_2 |
| RDNVCK | RMDNVCK |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ Feature: create a public link share
| 1 | 403 |
| 2 | 403 |

@issue-ocis-reva-41 @skipOnOcis
@issue-ocis-reva-41
Scenario Outline: Creating a link share with update permissions defaults to read permissions when public upload disabled globally
Given using OCS API version "<ocs_api_version>"
And parameter "shareapi_allow_public_upload" of app "core" has been set to "no"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Feature: resharing can be disabled
| Brian |
And user "Alice" has uploaded file "filesForUpload/textfile.txt" to "/textfile0.txt"

@smokeTest @skipOnOcis
@smokeTest
Scenario Outline: resharing a file is not allowed when allow resharing has been disabled
Given using OCS API version "<ocs_api_version>"
And user "Carol" has been created with default attributes and without skeleton files
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@api @files_sharing-app-required @issue-ocis-1289 @issue-ocis-reva-194 @issue-ocis-1328 @skipOnOcis
@api @files_sharing-app-required @issue-ocis-1289 @issue-ocis-reva-194 @issue-ocis-1328
Feature: resharing a resource with an expiration date

Background:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ Feature: sharing
| mimetype | httpd/unix-directory |
And as "Alice" folder "/Alice-folder/folder2" should not exist
And as "Carol" folder "/Carol-folder/folder2" should exist
@skipOnOcis
Examples:
| path |
| /Shares/Carol-folder |
Expand Down Expand Up @@ -299,7 +298,7 @@ Feature: sharing
| 1 | 100 |
| 2 | 200 |

@issue-ocis-1328 @skipOnOcis
@issue-ocis-1328
Scenario Outline: Forbid sharing with groups
Given using OCS API version "<ocs_api_version>"
And group "grp1" has been created
Expand All @@ -313,7 +312,7 @@ Feature: sharing
| 1 | 200 |
| 2 | 404 |

@issue-ocis-1328 @skipOnOcis
@issue-ocis-1328
Scenario Outline: Editing share permission of existing share is forbidden when sharing with groups is forbidden
Given using OCS API version "<ocs_api_version>"
And group "grp1" has been created
Expand All @@ -338,7 +337,7 @@ Feature: sharing
| 1 | 200 |
| 2 | 400 |

@issue-ocis-1328 @skipOnOcis
@issue-ocis-1328
Scenario Outline: Deleting group share is allowed when sharing with groups is forbidden
Given using OCS API version "<ocs_api_version>"
And group "grp1" has been created
Expand All @@ -357,7 +356,7 @@ Feature: sharing
| 1 | 100 | 200 |
| 2 | 200 | 404 |

@issue-ocis-1328 @skipOnOcis
@issue-ocis-1328
Scenario Outline: user can update the role in an existing share after the system maximum expiry date has been reduced
Given using OCS API version "<ocs_api_version>"
And parameter "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
Expand All @@ -384,7 +383,7 @@ Feature: sharing
| 1 | 100 |
| 2 | 200 |

@issue-ocis-1328 @skipOnOcis
@issue-ocis-1328
Scenario Outline: user cannot concurrently update the role and date in an existing share after the system maximum expiry date has been reduced
Given using OCS API version "<ocs_api_version>"
And parameter "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@api @skipOnLDAP @skipOnOcis
@api @skipOnLDAP
Feature: translate messages in api response to preferred language
As a user
I want response messages to be translated in preferred language
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ Feature: files and folders can be deleted from the trashbin
And as "Alice" the file with original path "/textfile0.txt" should exist in the trashbin
And as "Alice" the file with original path "/PARENT/parent.txt" should exist in the trashbin
And as "Alice" the file with original path "/PARENT/CHILD/child.txt" should exist in the trashbin
@skipOnOcis
Examples:
| dav-path | status-code |
| new | 401 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ Feature: files and folders exist in the trashbin after being deleted
And the last webdav response should not contain the following elements
| path | user |
| textfile1.txt | testtrashbin100 |
@skipOnOcis
Examples:
| dav-path | status-code |
| new | 401 |
Expand All @@ -168,7 +167,6 @@ Feature: files and folders exist in the trashbin after being deleted
| path | user |
| textfile0.txt | testtrashbin101 |
| textfile2.txt | testtrashbin101 |
@skipOnOcis
Examples:
| dav-path | status-code |
| new | 401 |
Expand All @@ -193,7 +191,6 @@ Feature: files and folders exist in the trashbin after being deleted
| textfile0.txt | testtrashbin102 |
| textfile2.txt | testtrashbin102 |
| textfile3.txt | testtrashbin102 |
@skipOnOcis
Examples:
| dav-path | status-code |
| new | 401 |
Expand All @@ -205,7 +202,6 @@ Feature: files and folders exist in the trashbin after being deleted
And user "testtrashbinempty" has uploaded file "filesForUpload/textfile.txt" to "/textfile1.txt"
When user "Alice" tries to list the trashbin content for user "testtrashbinempty"
Then the HTTP status code should be "<status-code>"
@skipOnOcis
Examples:
| dav-path | status-code |
| new | 401 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ Feature: Restore deleted files/folders
And as "Alice" the folder with original path "/textfile0.txt" should exist in the trashbin
And user "Alice" should not see the following elements
| /textfile0.txt |
@skipOnOcis
Examples:
| dav-path | status-code |
| old | 401 |
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/features/apiWebdavMove1/moveFolder.feature
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Feature: move (rename) folder
| old |
| new |
@files_sharing-app-required @skipOnOcis
@files_sharing-app-required
Scenario Outline: Moving a folder out of a shared folder as the sharee and as the sharer
Given using <dav_version> DAV path
And user "Brian" has been created with default attributes and without skeleton files
Expand All @@ -137,7 +137,7 @@ Feature: move (rename) folder
| new | Alice |
| new | Brian |
@files_sharing-app-required @skipOnOcis
@files_sharing-app-required
Scenario Outline: Moving a folder into a shared folder as the sharee and as the sharer
Given using <dav_version> DAV path
And user "Brian" has been created with default attributes and without skeleton files
Expand Down
10 changes: 5 additions & 5 deletions tests/acceptance/features/apiWebdavMove2/moveFile.feature
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Feature: move (rename) file
| old |
| new |

@files_sharing-app-required @skipOnOcis
@files_sharing-app-required
Scenario Outline: Moving a file into a shared folder as the sharee and as the sharer
Given using <dav_version> DAV path
And user "Brian" has been created with default attributes and without skeleton files
Expand All @@ -103,7 +103,7 @@ Feature: move (rename) file
| old | Brian |
| new | Brian |

@files_sharing-app-required @skipOnOcis
@files_sharing-app-required
Scenario Outline: Moving a file out of a shared folder as the sharee and as the sharer
Given using <dav_version> DAV path
And user "Brian" has been created with default attributes and without skeleton files
Expand All @@ -126,7 +126,7 @@ Feature: move (rename) file
| old | Brian |
| new | Brian |

@files_sharing-app-required @skipOnOcis
@files_sharing-app-required
Scenario Outline: Moving a file to a shared folder with no permissions
Given using <dav_version> DAV path
And user "Alice" has uploaded file "filesForUpload/textfile.txt" to "textfile0.txt"
Expand All @@ -145,7 +145,7 @@ Feature: move (rename) file
| old |
| new |

@files_sharing-app-required @skipOnOcis
@files_sharing-app-required
Scenario Outline: Moving a file to overwrite a file in a shared folder with no permissions
Given using <dav_version> DAV path
And user "Alice" has uploaded file with content "ownCloud test text file 0" to "textfile0.txt"
Expand Down Expand Up @@ -204,7 +204,7 @@ Feature: move (rename) file
| old |
| new |

@files_sharing-app-required @skipOnOcis
@files_sharing-app-required
Scenario Outline: Checking file id after a move between received shares
Given using <dav_version> DAV path
And user "Brian" has been created with default attributes and without skeleton files
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Feature: sizing of previews of files downloaded through the webdav API
Background:
Given user "Alice" has been created with default attributes and without skeleton files

@skipOnOcis

Scenario Outline: download different sizes of previews of file
Given user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt"
When user "Alice" downloads the preview of "/parent.txt" with width <width> and height <height> using the WebDAV API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,6 @@ Feature: get file properties
Then the HTTP status code should be "404"
And the value of the item "/d:error/s:message" in the response about user "Alice" should be "<message1>" or "<message2>"
And the value of the item "/d:error/s:exception" in the response about user "Alice" should be "Sabre\DAV\Exception\NotFound"

@skipOnOcis
Examples:
| url | message1 | message2 |
| /remote.php/dav/files/does-not-exist | Principal with name does-not-exist not found | |
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/features/cliMain/configKey.feature
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Feature: add and delete app configs using occ command
Then the command should have been successful
And the system config key "installed" from the last command output should match value "true" of type "boolean"

@skipOnOcis

Scenario: Check that search_min_length can be changed
Given using OCS API version "1"
When the administrator updates system config key "user.search_min_length" with value "4" using the occ command
Expand Down

0 comments on commit 86c13e8

Please sign in to comment.