From 4a5163a239e296a725edbf4d9e26cdaa9dd9e812 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Fri, 7 Jun 2019 09:47:20 +0545 Subject: [PATCH] Adjust create user steps --- .../features/apiActivity/list.feature | 38 +++++++++---------- .../webUIActivityComments/comments.feature | 2 +- .../updateFilesFolder.feature | 2 +- .../webUIActivityDeleteRestore/delete.feature | 2 +- .../restore.feature | 2 +- .../publicLinkShare.feature | 2 +- .../sharingFederation.feature | 4 +- .../sharingInternal.feature | 26 ++++++------- .../features/webUIActivityTags/tags.feature | 18 ++++----- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/tests/acceptance/features/apiActivity/list.feature b/tests/acceptance/features/apiActivity/list.feature index d5dc4da4..cd377cf4 100644 --- a/tests/acceptance/features/apiActivity/list.feature +++ b/tests/acceptance/features/apiActivity/list.feature @@ -4,7 +4,7 @@ Feature: List activity So that I know what is happening with my files/folders Scenario: file deletion should be listed in the activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files When user "user0" deletes file "textfile0.txt" using the WebDAV API Then the activity number 1 of user "user0" should match these properties: | type | /^file_deleted$/ | @@ -18,7 +18,7 @@ Feature: List activity | subject_prepared | /^You deleted textfile0\.txt<\/file>$/ | Scenario: file restore should be listed in the activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has deleted file "textfile0.txt" And user "user0" has logged in to a web-style session When user "user0" restores the file with original path "textfile0.txt" using the trashbin API @@ -33,7 +33,7 @@ Feature: List activity | subject_prepared | /^You restored textfile0\.txt<\/file>$/ | Scenario: folder deletion should be listed in the activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files When user "user0" deletes folder "FOLDER" using the WebDAV API Then the activity number 1 of user "user0" should match these properties: | type | /^file_deleted$/ | @@ -47,7 +47,7 @@ Feature: List activity | subject_prepared | /^You deleted FOLDER<\/file>$/ | Scenario: folder restore should be listed in the activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has deleted folder "FOLDER" And user "user0" has logged in to a web-style session When user "user0" restores the folder with original path "FOLDER" using the trashbin API @@ -62,7 +62,7 @@ Feature: List activity | subject_prepared | /^You restored FOLDER<\/file>$/ | Scenario: file inside folder deletion should be listed in the activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files When user "user0" deletes file "PARENT/parent.txt" using the WebDAV API Then the activity number 1 of user "user0" should match these properties: | type | /^file_deleted$/ | @@ -76,7 +76,7 @@ Feature: List activity | subject_prepared | /^You deleted PARENT\/parent.txt<\/file>$/ | Scenario: file inside folder restore should be listed in the activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has deleted file "PARENT/parent.txt" And user "user0" has logged in to a web-style session When user "user0" restores the file with original path "PARENT/parent.txt" using the trashbin API @@ -91,7 +91,7 @@ Feature: List activity | subject_prepared | /^You restored PARENT\/parent\.txt<\/file>$/ | Scenario: sub folder deletion should be listed in the activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files When user "user0" deletes folder "PARENT/CHILD" using the WebDAV API Then the activity number 1 of user "user0" should match these properties: | type | /^file_deleted$/ | @@ -105,7 +105,7 @@ Feature: List activity | subject_prepared | /^You deleted PARENT\/CHILD<\/file>$/ | Scenario: sub folder restore should be listed in the activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has deleted folder "PARENT/CHILD" And user "user0" has logged in to a web-style session When user "user0" restores the folder with original path "PARENT/CHILD" using the trashbin API @@ -120,7 +120,7 @@ Feature: List activity | subject_prepared | /^You restored PARENT\/CHILD<\/file>$/ | Scenario: multiple file deletion should be listed in activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files When user "user0" deletes file "textfile0.txt" using the WebDAV API And user "user0" deletes file "textfile1.txt" using the WebDAV API Then the activity number 1 of user "user0" should match these properties: @@ -135,7 +135,7 @@ Feature: List activity | subject_prepared | /^You deleted textfile1\.txt<\/file>textfile0\.txt<\/file><\/collection>$/ | Scenario: multiple folder deletion should be listed in activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files When user "user0" deletes folder "PARENT" using the WebDAV API And user "user0" deletes folder "FOLDER" using the WebDAV API Then the activity number 1 of user "user0" should match these properties: @@ -150,7 +150,7 @@ Feature: List activity | subject_prepared | /^You deleted FOLDER<\/file>PARENT<\/file><\/collection>$/ | Scenario: multiple file restore should be listed in activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has deleted file "textfile0.txt" And user "user0" has deleted file "textfile1.txt" And user "user0" has logged in to a web-style session @@ -167,7 +167,7 @@ Feature: List activity | subject_prepared | /^You restored textfile1\.txt<\/file>textfile0\.txt<\/file><\/collection>$/ | Scenario: multiple folder restore should be listed in activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has deleted folder "FOLDER" And user "user0" has deleted folder "PARENT" And user "user0" has logged in to a web-style session @@ -184,7 +184,7 @@ Feature: List activity | subject_prepared | /^You restored PARENT<\/file>FOLDER<\/file><\/collection>$/ | Scenario: mix of folder and file deletion should be listed in activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files When user "user0" deletes file "textfile0.txt" using the WebDAV API And user "user0" deletes folder "FOLDER" using the WebDAV API Then the activity number 1 of user "user0" should match these properties: @@ -199,7 +199,7 @@ Feature: List activity | subject_prepared | /^You deleted FOLDER<\/file>textfile0\.txt<\/file><\/collection>$/ | Scenario: mix of folder and file restore should be listed in activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has deleted file "textfile0.txt" And user "user0" has deleted folder "FOLDER" And user "user0" has logged in to a web-style session @@ -216,7 +216,7 @@ Feature: List activity | subject_prepared | /^You restored FOLDER<\/file>textfile0\.txt<\/file><\/collection>$/ | Scenario: folder share should be listed in the activity list - Given these users have been created with default attributes but not initialized: + Given these users have been created with default attributes and skeleton files but not initialized: | username | | user0 | | user1 | @@ -277,7 +277,7 @@ Feature: List activity | subject_prepared | /^You created text.txt<\/file>/| Scenario: different files share with different user should be listed in activity list of sharer - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user1" has been created with default attributes and without skeleton files And user "user2" has been created with default attributes and without skeleton files When user "user0" shares file "PARENT/parent.txt" with user "user2" using the sharing API @@ -306,7 +306,7 @@ Feature: List activity | subject_prepared | /^You shared PARENT\/parent.txt<\/file> with user2<\/user>$/| Scenario: different files shared with same user should be listed in activity list of sharer - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user1" has been created with default attributes and without skeleton files When user "user0" shares file "PARENT/parent.txt" with user "user1" using the sharing API And user "user0" shares file "textfile0.txt" with user "user1" using the sharing API @@ -334,7 +334,7 @@ Feature: List activity | subject_prepared | /^You shared PARENT\/parent.txt<\/file> with user1<\/user>$/| Scenario: different files shared with different user should be listed in activity list of sharee - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user1" has been created with default attributes and without skeleton files And user "user2" has been created with default attributes and without skeleton files When user "user0" shares file "PARENT/parent.txt" with user "user1" using the sharing API @@ -363,7 +363,7 @@ Feature: List activity | subject_prepared | /^user0<\/user> shared parent.txt<\/file> with you$/| Scenario: different files shared with same user should be listed in activity list of sharee - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user1" has been created with default attributes and without skeleton files When user "user0" shares file "PARENT/parent.txt" with user "user1" using the sharing API And user "user0" shares file "textfile0.txt" with user "user1" using the sharing API diff --git a/tests/acceptance/features/webUIActivityComments/comments.feature b/tests/acceptance/features/webUIActivityComments/comments.feature index 7fdd6dd9..b17ca215 100644 --- a/tests/acceptance/features/webUIActivityComments/comments.feature +++ b/tests/acceptance/features/webUIActivityComments/comments.feature @@ -6,7 +6,7 @@ Feature: Comment files/folders activities Background: Given using new DAV path - And user "user0" has been created with default attributes + And user "user0" has been created with default attributes and skeleton files And user "user0" has logged in using the webUI Scenario Outline: Commenting on a file/folder should be listed in the activity page diff --git a/tests/acceptance/features/webUIActivityCreateUpdate/updateFilesFolder.feature b/tests/acceptance/features/webUIActivityCreateUpdate/updateFilesFolder.feature index d8f4d597..3183913f 100644 --- a/tests/acceptance/features/webUIActivityCreateUpdate/updateFilesFolder.feature +++ b/tests/acceptance/features/webUIActivityCreateUpdate/updateFilesFolder.feature @@ -5,7 +5,7 @@ Feature: Updated files/folders activities So that I know what happened in my cloud storage Background: - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has logged in using the webUI Scenario: Changing file contents should be shown in activity list diff --git a/tests/acceptance/features/webUIActivityDeleteRestore/delete.feature b/tests/acceptance/features/webUIActivityDeleteRestore/delete.feature index d95eb68b..5c945de2 100644 --- a/tests/acceptance/features/webUIActivityDeleteRestore/delete.feature +++ b/tests/acceptance/features/webUIActivityDeleteRestore/delete.feature @@ -5,7 +5,7 @@ Feature: Deleted files/folders activities So that I know what happened in my cloud storage Background: - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has logged in using the webUI @issue-622 diff --git a/tests/acceptance/features/webUIActivityDeleteRestore/restore.feature b/tests/acceptance/features/webUIActivityDeleteRestore/restore.feature index 47aeeea7..6e5e719d 100644 --- a/tests/acceptance/features/webUIActivityDeleteRestore/restore.feature +++ b/tests/acceptance/features/webUIActivityDeleteRestore/restore.feature @@ -5,7 +5,7 @@ Feature: Restored files/folders activities So that I know what happened in my cloud storage Background: - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has logged in using the webUI @issue-622 diff --git a/tests/acceptance/features/webUIActivitySharingExternal/publicLinkShare.feature b/tests/acceptance/features/webUIActivitySharingExternal/publicLinkShare.feature index 9cf73594..688ee78e 100644 --- a/tests/acceptance/features/webUIActivitySharingExternal/publicLinkShare.feature +++ b/tests/acceptance/features/webUIActivitySharingExternal/publicLinkShare.feature @@ -5,7 +5,7 @@ Feature: public link sharing file/folders activities So that I know what happened in my cloud storage Background: - Given user "user1" has been created with default attributes + Given user "user1" has been created with default attributes and skeleton files And user "user1" has logged in using the webUI Scenario: Creating a public link of a folder and file should be listed in the activity list diff --git a/tests/acceptance/features/webUIActivitySharingExternal/sharingFederation.feature b/tests/acceptance/features/webUIActivitySharingExternal/sharingFederation.feature index b407018e..052ff409 100644 --- a/tests/acceptance/features/webUIActivitySharingExternal/sharingFederation.feature +++ b/tests/acceptance/features/webUIActivitySharingExternal/sharingFederation.feature @@ -6,9 +6,9 @@ Feature: federation sharing file/folder activities Background: Given using server "REMOTE" - And user "user2" has been created with default attributes + And user "user2" has been created with default attributes and skeleton files And using server "LOCAL" - And user "user1" has been created with default attributes + And user "user1" has been created with default attributes and skeleton files And user "user1" has logged in using the webUI Scenario: Sharing a folder with a remote server should not be listed in the activity list of a sharer if the sharee has not accepted the share diff --git a/tests/acceptance/features/webUIActivitySharingInternal/sharingInternal.feature b/tests/acceptance/features/webUIActivitySharingInternal/sharingInternal.feature index fbfe5bf8..391a28ad 100644 --- a/tests/acceptance/features/webUIActivitySharingInternal/sharingInternal.feature +++ b/tests/acceptance/features/webUIActivitySharingInternal/sharingInternal.feature @@ -5,10 +5,10 @@ Feature: Sharing file/folders activities So that I know what happened in my cloud storage Background: - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files Scenario: Sharing a file/folder with a user should be listed in the activity list of a sharer - Given these users have been created with default attributes but not initialized: + Given these users have been created with default attributes and skeleton files but not initialized: | username | | user1 | | user2 | @@ -58,7 +58,7 @@ Feature: Sharing file/folders activities And the activity number 4 should contain message "You shared textfile0.txt with group grp1" in the activity page Scenario: Sharing a file/folder with a user should be listed in the activity list of a sharee - Given user "user1" has been created with default attributes + Given user "user1" has been created with default attributes and skeleton files And user "user0" has shared file "textfile0.txt" with user "user1" And user "user0" has shared folder "folder with space" with user "user1" And user "user0" has shared file "simple-folder/lorem.txt" with user "user1" @@ -72,7 +72,7 @@ Feature: Sharing file/folders activities Then the activity number 1 should have a message saying that user "User Zero" has shared "simple-empty-folder, lorem.txt, folder with space and textfile0.txt" with you Scenario: Sharing a file/folder with a group should be listed in the activity list of a sharee - Given user "user1" has been created with default attributes + Given user "user1" has been created with default attributes and skeleton files And group "grp1" has been created And user "user1" has been added to group "grp1" And user "user0" has shared file "textfile0.txt" with group "grp1" @@ -88,7 +88,7 @@ Feature: Sharing file/folders activities Then the activity number 1 should have a message saying that user "User Zero" has shared "simple-empty-folder, lorem.txt, folder with space and textfile0.txt" with you Scenario: Sharing a file/folder with a user should not be listed in the activity list stream when shared activity has been disabled - Given these users have been created with default attributes but not initialized: + Given these users have been created with default attributes and skeleton files but not initialized: | username | | user1 | | user2 | @@ -116,7 +116,7 @@ Feature: Sharing file/folders activities Then the activity should not have any message with keyword "shared" Scenario: Receiving a file/folder from a sharer should not be listed in the activity list stream when shared activity has been disabled - Given user "user1" has been created with default attributes + Given user "user1" has been created with default attributes and skeleton files And user "user0" has shared file "textfile0.txt" with user "user1" And user "user0" has shared folder "folder with space" with user "user1" And user "user0" has shared file "simple-folder/lorem.txt" with user "user1" @@ -128,7 +128,7 @@ Feature: Sharing file/folders activities Then the activity should not have any message with keyword "shared" Scenario: Receiving a file/folder in a group as a share should not be listed in the activity list stream when shared activity has been disabled - Given user "user1" has been created with default attributes + Given user "user1" has been created with default attributes and skeleton files And group "grp1" has been created And user "user1" has been added to group "grp1" And user "user0" has shared file "textfile0.txt" with group "grp1" @@ -158,7 +158,7 @@ Feature: Sharing file/folders activities Then the activity number 1 should have a message saying that user "User One" created "newFolder" Scenario: Uploading a file inside a shared folder by a sharer should be listed in the activity list of a sharee - Given user "user1" has been created with default attributes + Given user "user1" has been created with default attributes and skeleton files And user "user0" has shared folder "simple-folder" with user "user1" And user "user1" has logged in using the webUI And user "user0" has uploaded file "filesForUpload/textfile.txt" to "simple-folder/textfilemoved.txt" @@ -166,7 +166,7 @@ Feature: Sharing file/folders activities Then the activity number 1 should have a message saying that user "User Zero" created "textfilemoved.txt" Scenario: Creating a folder inside a shared folder by a sharer should be listed in the activity list of a sharee - Given user "user1" has been created with default attributes + Given user "user1" has been created with default attributes and skeleton files And user "user0" has shared folder "simple-folder" with user "user1" And user "user1" has logged in using the webUI And user "user0" has created folder "simple-folder/newFolder" @@ -190,7 +190,7 @@ Feature: Sharing file/folders activities Then the activity number 1 should have a message saying that user "User One" deleted "simple-empty-folder" Scenario: Deleting a file inside a shared folder by a sharer should be listed in the activity list of a sharee - Given user "user1" has been created with default attributes + Given user "user1" has been created with default attributes and skeleton files And user "user0" has shared folder "simple-folder" with user "user1" And user "user1" has logged in using the webUI And user "user0" has deleted file "simple-folder/lorem.txt" @@ -198,7 +198,7 @@ Feature: Sharing file/folders activities Then the activity number 1 should have a message saying that user "User Zero" deleted "lorem.txt" Scenario: Deleting a folder inside a shared folder by a sharer should be listed in the activity list of a sharee - Given user "user1" has been created with default attributes + Given user "user1" has been created with default attributes and skeleton files And user "user0" has shared folder "simple-folder" with user "user1" And user "user1" has logged in using the webUI And user "user0" has deleted folder "simple-folder/simple-empty-folder" @@ -230,7 +230,7 @@ Feature: Sharing file/folders activities Then the activity number 1 should have a message saying that user "User Zero" changed "lorem.txt" Scenario: Changing a file inside a shared folder by a sharer should be listed in the activity list of a sharee - Given user "user1" has been created with default attributes + Given user "user1" has been created with default attributes and skeleton files And user "user0" has shared folder "simple-folder" with user "user1" And user "user1" has logged in using the webUI And user "user0" has uploaded file "filesForUpload/new-lorem-big.txt" to "simple-folder/lorem.txt" @@ -287,7 +287,7 @@ Feature: Sharing file/folders activities And the user browses to the activity page Then the activity number 1 should have a message saying that "User One" removed the share of "User One" for "simple-folder" Scenario: Sharing a file/folder with a user should be listed in the activity tab of the sharer for the file - Given these users have been created with default attributes but not initialized: + Given these users have been created with default attributes and skeleton files but not initialized: | username | | user1 | | user2 | diff --git a/tests/acceptance/features/webUIActivityTags/tags.feature b/tests/acceptance/features/webUIActivityTags/tags.feature index b7a4be5c..a27d34b9 100644 --- a/tests/acceptance/features/webUIActivityTags/tags.feature +++ b/tests/acceptance/features/webUIActivityTags/tags.feature @@ -5,7 +5,7 @@ Feature: Tag files/folders activities So that I know what happened in my cloud storage Scenario Outline: Adding a tag on a file/folder should be listed on the activity list - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has logged in using the webUI And user "user0" has created a "normal" tag with name "lorem" # already has an ending slash('/') @@ -22,7 +22,7 @@ Feature: Tag files/folders activities | 'single'quotes/simple-empty-folder/ | for-git-commit | Scenario Outline: Adding a tag on the shared file/folder should be listed on the activity list - Given these users have been created with default attributes: + Given these users have been created with default attributes and skeleton files: | username | | user0 | | user1 | @@ -46,7 +46,7 @@ Feature: Tag files/folders activities | simple-folder | Scenario Outline: tagging activity before sharing should not be listed for the share receiver. - Given these users have been created with default attributes: + Given these users have been created with default attributes and skeleton files: | username | | user0 | | user1 | @@ -70,7 +70,7 @@ Feature: Tag files/folders activities | simple-folder | Scenario Outline: Activity for tagging a shared file/folder by sharee should be listed for sharer as well - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user1" has been created with default attributes and without skeleton files And group "group1" has been created And user "user0" has been added to group "group1" @@ -92,7 +92,7 @@ Feature: Tag files/folders activities | simple-folder | Scenario: Activity for tagging a reshared folder by sharee should be listed for original sharer as well - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user1" has been created with default attributes and without skeleton files And user "user2" has been created with default attributes and without skeleton files And group "group1" has been created @@ -119,14 +119,14 @@ Feature: Tag files/folders activities And the activity should not have any message with keyword "User Zero" Scenario: Activity for creating a normal system tag by a user should be listed in activity list of an admin - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has created a "normal" tag with name "lorem" And the administrator has logged in using the webUI When the user browses to the activity page Then the activity number 1 should have a message saying that user "User Zero" created system tag "lorem" Scenario: Activity for deleting a normal system tag by a user should be listed in activity list of an admin - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has created a "normal" tag with name "lorem" And user "user0" has deleted the tag with name "lorem" And the administrator has logged in using the webUI @@ -147,7 +147,7 @@ Feature: Tag files/folders activities Then the activity number 1 should have message "You deleted system tag StaticTagName (static)" in the activity page Scenario Outline: Adding a tag on a file/folder should not be listed in the activity list stream when system tags activity has been disabled - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has logged in using the webUI And user "user0" has created a "normal" tag with name "lorem" # already has an ending slash('/') @@ -166,7 +166,7 @@ Feature: Tag files/folders activities | 'single'quotes/simple-empty-folder/ | for-git-commit | Scenario: Adding a tag on a file/folder should be listed on the activity tab - Given user "user0" has been created with default attributes + Given user "user0" has been created with default attributes and skeleton files And user "user0" has logged in using the webUI And user "user0" has created a "normal" tag with name "lorem" And user "user0" has added tag "lorem" to file "lorem.txt"