summaryrefslogtreecommitdiffstats
path: root/build/integration
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-01-06 16:17:09 +0100
committerGitHub <noreply@github.com>2017-01-06 16:17:09 +0100
commit6347d97c7fb052f8c7f51ddbd410002156ba2d6d (patch)
treecb3986daa369d689cd226ee549f3651018034852 /build/integration
parent4a2fbe9a5b6fd17781dd6de78b1247824618d717 (diff)
parent9ea432f88c47a8e387e6f8144ef1d8bd663d03dd (diff)
downloadnextcloud-server-6347d97c7fb052f8c7f51ddbd410002156ba2d6d.tar.gz
nextcloud-server-6347d97c7fb052f8c7f51ddbd410002156ba2d6d.zip
Merge pull request #2512 from nextcloud/cleanup-system-tag-usage
Only allow admins to delete tags
Diffstat (limited to 'build/integration')
-rw-r--r--build/integration/features/tags.feature13
1 files changed, 10 insertions, 3 deletions
diff --git a/build/integration/features/tags.feature b/build/integration/features/tags.feature
index 35784419080..0c6cd06f9f9 100644
--- a/build/integration/features/tags.feature
+++ b/build/integration/features/tags.feature
@@ -70,12 +70,13 @@ Feature: tags
When "user0" edits the tag with name "TagWithGroups" and sets its groups to "group1|group3"
Then The response should have a status code "403"
- Scenario: Deleting a normal tag as regular user should work
+ Scenario: Deleting a normal tag as regular user should fail
Given user "user0" exists
Given "admin" creates a "normal" tag with name "MySuperAwesomeTagName"
When "user0" deletes the tag with name "MySuperAwesomeTagName"
- Then The response should have a status code "204"
- And "0" tags should exist for "admin"
+ Then The response should have a status code "403"
+ And The following tags should exist for "admin"
+ |MySuperAwesomeTagName|true|true|
Scenario: Deleting a not user-assignable tag as regular user should fail
Given user "user0" exists
@@ -93,6 +94,12 @@ Feature: tags
And The following tags should exist for "admin"
|MySuperAwesomeTagName|false|true|
+ Scenario: Deleting a normal tag as admin should work
+ Given "admin" creates a "normal" tag with name "MySuperAwesomeTagName"
+ When "admin" deletes the tag with name "MySuperAwesomeTagName"
+ Then The response should have a status code "204"
+ And "0" tags should exist for "admin"
+
Scenario: Deleting a not user-assignable tag as admin should work
Given "admin" creates a "not user-assignable" tag with name "MySuperAwesomeTagName"
When "admin" deletes the tag with name "MySuperAwesomeTagName"