From fed5f2e6a4563e02c9b781b8086ee0b1ab6ff793 Mon Sep 17 00:00:00 2001 From: saw-jan Date: Wed, 11 Aug 2021 14:59:07 +0545 Subject: [PATCH] debug --- .drone.star | 487 +++++++++--------- ...-failures-with-ocis-server-ocis-storage.md | 6 +- .../features/webUIUpload/upload.feature | 309 ++++++----- .../FilesPageElement/versionsDialog.js | 1 + .../stepDefinitions/generalContext.js | 4 +- 5 files changed, 407 insertions(+), 400 deletions(-) diff --git a/.drone.star b/.drone.star index 02241a0edfa..21e3c63e60e 100644 --- a/.drone.star +++ b/.drone.star @@ -26,114 +26,114 @@ config = { "webUI": { "type": FULL, "suites": { - "oC10Basic": [ - "webUIAccount", - "webUILogin", - "webUIPreview", - "webUIPrivateLinks", - # The following suites may have all scenarios currently skipped. - # The suites are listed here so that scenarios will run when - # they are enabled. - ], - "oC10Locks": [ - "webUIWebdavLockProtection", - "webUIWebdavLocks", - ], - "oC10CreateDelete": [ - "webUICreateFilesFolders", - "webUIDeleteFilesFolders", - ], - "oC10Rename": [ - "webUIRenameFiles", - "webUIRenameFolders", - ], - "oC10SharingAccept": [ - "webUISharingAcceptShares", - "webUISharingAcceptSharesToRoot", - ], - "oC10Files1": [ - "webUIFiles", - "webUIFilesActionMenu", - "webUIFilesCopy", - "webUIMarkdownEditor", - "webUIFavorites", - ], - "oC10Files2": [ - "webUIFilesDetails", - "webUIFilesList", - "webUIFilesSearch", - ], + # "oC10Basic": [ + # "webUIAccount", + # "webUILogin", + # "webUIPreview", + # "webUIPrivateLinks", + # # The following suites may have all scenarios currently skipped. + # # The suites are listed here so that scenarios will run when + # # they are enabled. + # ], + # "oC10Locks": [ + # "webUIWebdavLockProtection", + # "webUIWebdavLocks", + # ], + # "oC10CreateDelete": [ + # "webUICreateFilesFolders", + # "webUIDeleteFilesFolders", + # ], + # "oC10Rename": [ + # "webUIRenameFiles", + # "webUIRenameFolders", + # ], + # "oC10SharingAccept": [ + # "webUISharingAcceptShares", + # "webUISharingAcceptSharesToRoot", + # ], + # "oC10Files1": [ + # "webUIFiles", + # "webUIFilesActionMenu", + # "webUIFilesCopy", + # "webUIMarkdownEditor", + # "webUIFavorites", + # ], + # "oC10Files2": [ + # "webUIFilesDetails", + # "webUIFilesList", + # "webUIFilesSearch", + # ], "oC10MoveUpload": [ - "webUIMoveFilesFolders", + # "webUIMoveFilesFolders", "webUIUpload", ], - "oC10Resharing": [ - "webUIResharing1", - "webUIResharing2", - ], - "oC10Sharing1": [ - "webUIRestrictSharing", - "webUISharingAutocompletion", - ], - "webUIResharingToRoot": "oC10ResharingToRoot", - "oC10SharingFilePermission": [ - "webUISharingFilePermissionMultipleUsers", - "webUISharingFilePermissionsGroups", - ], - "webUISharingFolderAdvancedPermissionMultipleUsers": "oC10SharingFolderAdvancedPermissionMU", - "webUISharingFolderAdvancedPermissionsGroups": "oC10SharingFolderAdvPermissionsGrp", - "oC10SharingFolderPermissions": [ - "webUISharingFolderPermissionMultipleUsers", - "webUISharingFolderPermissionsGroups", - ], - "oC10SharingInternalGroups": [ - "webUISharingInternalGroups", - "webUISharingInternalGroupsEdgeCases", - ], - "oC10SharingInternalGroupsToRoot": [ - "webUISharingInternalGroupsToRoot", - "webUISharingInternalGroupsToRootEdgeCases", - ], - "oC10SharingInternalGroupsSharingIndicator": [ - "webUISharingInternalGroupsSharingIndicator", - "webUISharingInternalGroupsToRootSharingIndicator", - ], - "oC10SharingInternalUsers": [ - "webUISharingInternalUsers", - "webUISharingInternalUsersCollaborator", - "webUISharingInternalUsersShareWithPage", - ], - "webUISharingInternalUsersBlacklisted": "oC10SharingInternalUsersBlacklisted", - "oC10SharingInternalUsersExpire": [ - "webUISharingInternalUsersExpire", - "webUISharingInternalUsersExpireToRoot", - ], - "oC10SharingInternalUsersSharingIndicator": [ - "webUISharingInternalUsersSharingIndicator", - "webUISharingInternalUsersToRootSharingIndicator", - ], - "oC10SharingInternalUsersRoot1": [ - "webUISharingInternalUsersToRoot", - "webUISharingInternalUsersToRootBlacklisted", - ], - "oC10SharingInternalUsersRoot2": [ - "webUISharingInternalUsersToRootCollaborator", - "webUISharingInternalUsersToRootPreviews", - "webUISharingInternalUsersToRootShareWithPage", - ], - "webUISharingPermissionsUsers": "oC10SharingPermissionsUsers", - "webUISharingPermissionToRoot": "oC10SharingPermissionToRoot", - "webUISharingPublicBasic": "oC10SharingPublicBasic", - "webUISharingPublicManagement": "oC10SharingPublicManagement", - "oC10SharingPublicExpireAndRoles": [ - "webUISharingPublicDifferentRoles", - "webUISharingPublicExpire", - ], - "oC10Trashbin": [ - "webUITrashbinDelete", - "webUITrashbinFilesFolders", - "webUITrashbinRestore", - ], + # "oC10Resharing": [ + # "webUIResharing1", + # "webUIResharing2", + # ], + # "oC10Sharing1": [ + # "webUIRestrictSharing", + # "webUISharingAutocompletion", + # ], + # "webUIResharingToRoot": "oC10ResharingToRoot", + # "oC10SharingFilePermission": [ + # "webUISharingFilePermissionMultipleUsers", + # "webUISharingFilePermissionsGroups", + # ], + # "webUISharingFolderAdvancedPermissionMultipleUsers": "oC10SharingFolderAdvancedPermissionMU", + # "webUISharingFolderAdvancedPermissionsGroups": "oC10SharingFolderAdvPermissionsGrp", + # "oC10SharingFolderPermissions": [ + # "webUISharingFolderPermissionMultipleUsers", + # "webUISharingFolderPermissionsGroups", + # ], + # "oC10SharingInternalGroups": [ + # "webUISharingInternalGroups", + # "webUISharingInternalGroupsEdgeCases", + # ], + # "oC10SharingInternalGroupsToRoot": [ + # "webUISharingInternalGroupsToRoot", + # "webUISharingInternalGroupsToRootEdgeCases", + # ], + # "oC10SharingInternalGroupsSharingIndicator": [ + # "webUISharingInternalGroupsSharingIndicator", + # "webUISharingInternalGroupsToRootSharingIndicator", + # ], + # "oC10SharingInternalUsers": [ + # "webUISharingInternalUsers", + # "webUISharingInternalUsersCollaborator", + # "webUISharingInternalUsersShareWithPage", + # ], + # "webUISharingInternalUsersBlacklisted": "oC10SharingInternalUsersBlacklisted", + # "oC10SharingInternalUsersExpire": [ + # "webUISharingInternalUsersExpire", + # "webUISharingInternalUsersExpireToRoot", + # ], + # "oC10SharingInternalUsersSharingIndicator": [ + # "webUISharingInternalUsersSharingIndicator", + # "webUISharingInternalUsersToRootSharingIndicator", + # ], + # "oC10SharingInternalUsersRoot1": [ + # "webUISharingInternalUsersToRoot", + # "webUISharingInternalUsersToRootBlacklisted", + # ], + # "oC10SharingInternalUsersRoot2": [ + # "webUISharingInternalUsersToRootCollaborator", + # "webUISharingInternalUsersToRootPreviews", + # "webUISharingInternalUsersToRootShareWithPage", + # ], + # "webUISharingPermissionsUsers": "oC10SharingPermissionsUsers", + # "webUISharingPermissionToRoot": "oC10SharingPermissionToRoot", + # "webUISharingPublicBasic": "oC10SharingPublicBasic", + # "webUISharingPublicManagement": "oC10SharingPublicManagement", + # "oC10SharingPublicExpireAndRoles": [ + # "webUISharingPublicDifferentRoles", + # "webUISharingPublicExpire", + # ], + # "oC10Trashbin": [ + # "webUITrashbinDelete", + # "webUITrashbinFilesFolders", + # "webUITrashbinRestore", + # ], }, "extraEnvironment": { "EXPECTED_FAILURES_FILE": "%s/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md" % dir["web"], @@ -160,6 +160,7 @@ config = { "visualTesting": False, "screenShots": False, "notificationsAppNeeded": True, + "skip": True, }, "webUIFederation": { "type": FEDERATED, @@ -174,6 +175,7 @@ config = { "notificationsAppNeeded": True, "federatedServerNeeded": True, "federatedServerVersion": "daily-master-qa", + "skip": True, }, "webUI-XGA-Notifications": { "type": NOTIFICATIONS, @@ -190,76 +192,77 @@ config = { }, "notificationsAppNeeded": True, "filterTags": "@smokeTest and not @skipOnXGAPortraitResolution and not @skip and not @skipOnOC10", + "skip": True, }, "webUI-XGA": { "type": FULL, "suites": { - "oC10XGAPortrait1": [ - "webUIAccount", - "webUICreateFilesFolders", - "webUIDeleteFilesFolders", - "webUIFavorites", - "webUIFiles", - "webUIFilesActionMenu", - "webUIFilesCopy", - "webUIFilesDetails", - "webUIFilesList", - "webUIFilesSearch", - "webUILogin", - "webUIPreview", - "webUIPrivateLinks", - "webUIRenameFiles", - "webUIRenameFolders", - "webUIRestrictSharing", - "webUISharingAcceptShares", - "webUISharingAcceptSharesToRoot", - "webUIMarkdownEditor", - # The following suites may have all scenarios currently skipped. - # The suites are listed here so that scenarios will run when - # they are enabled. - "webUIWebdavLockProtection", - "webUIWebdavLocks", - ], + # "oC10XGAPortrait1": [ + # "webUIAccount", + # "webUICreateFilesFolders", + # "webUIDeleteFilesFolders", + # "webUIFavorites", + # "webUIFiles", + # "webUIFilesActionMenu", + # "webUIFilesCopy", + # "webUIFilesDetails", + # "webUIFilesList", + # "webUIFilesSearch", + # "webUILogin", + # "webUIPreview", + # "webUIPrivateLinks", + # "webUIRenameFiles", + # "webUIRenameFolders", + # "webUIRestrictSharing", + # "webUISharingAcceptShares", + # "webUISharingAcceptSharesToRoot", + # "webUIMarkdownEditor", + # # The following suites may have all scenarios currently skipped. + # # The suites are listed here so that scenarios will run when + # # they are enabled. + # "webUIWebdavLockProtection", + # "webUIWebdavLocks", + # ], "oC10XGAPortrait2": [ - "webUIMoveFilesFolders", - "webUIResharing1", - "webUIResharing2", - "webUIResharingToRoot", - "webUISharingAutocompletion", - "webUISharingFilePermissionMultipleUsers", - "webUISharingFilePermissionsGroups", - "webUISharingFolderAdvancedPermissionMultipleUsers", - "webUISharingFolderAdvancedPermissionsGroups", - "webUISharingFolderPermissionMultipleUsers", - "webUISharingFolderPermissionsGroups", - "webUISharingInternalGroups", - "webUISharingInternalGroupsEdgeCases", - "webUISharingInternalGroupsSharingIndicator", - "webUISharingInternalGroupsToRoot", - "webUISharingInternalGroupsToRootEdgeCases", - "webUISharingInternalGroupsToRootSharingIndicator", - "webUISharingInternalUsers", - "webUISharingInternalUsersCollaborator", - "webUISharingInternalUsersShareWithPage", - "webUISharingInternalUsersBlacklisted", - "webUISharingInternalUsersExpire", - "webUISharingInternalUsersExpireToRoot", - "webUISharingInternalUsersSharingIndicator", - "webUISharingInternalUsersToRoot", - "webUISharingInternalUsersToRootCollaborator", - "webUISharingInternalUsersToRootPreviews", - "webUISharingInternalUsersToRootShareWithPage", - "webUISharingInternalUsersToRootBlacklisted", - "webUISharingInternalUsersToRootSharingIndicator", - "webUISharingPermissionsUsers", - "webUISharingPermissionToRoot", - "webUISharingPublicBasic", - "webUISharingPublicManagement", - "webUISharingPublicDifferentRoles", - "webUISharingPublicExpire", - "webUITrashbinDelete", - "webUITrashbinFilesFolders", - "webUITrashbinRestore", + # "webUIMoveFilesFolders", + # "webUIResharing1", + # "webUIResharing2", + # "webUIResharingToRoot", + # "webUISharingAutocompletion", + # "webUISharingFilePermissionMultipleUsers", + # "webUISharingFilePermissionsGroups", + # "webUISharingFolderAdvancedPermissionMultipleUsers", + # "webUISharingFolderAdvancedPermissionsGroups", + # "webUISharingFolderPermissionMultipleUsers", + # "webUISharingFolderPermissionsGroups", + # "webUISharingInternalGroups", + # "webUISharingInternalGroupsEdgeCases", + # "webUISharingInternalGroupsSharingIndicator", + # "webUISharingInternalGroupsToRoot", + # "webUISharingInternalGroupsToRootEdgeCases", + # "webUISharingInternalGroupsToRootSharingIndicator", + # "webUISharingInternalUsers", + # "webUISharingInternalUsersCollaborator", + # "webUISharingInternalUsersShareWithPage", + # "webUISharingInternalUsersBlacklisted", + # "webUISharingInternalUsersExpire", + # "webUISharingInternalUsersExpireToRoot", + # "webUISharingInternalUsersSharingIndicator", + # "webUISharingInternalUsersToRoot", + # "webUISharingInternalUsersToRootCollaborator", + # "webUISharingInternalUsersToRootPreviews", + # "webUISharingInternalUsersToRootShareWithPage", + # "webUISharingInternalUsersToRootBlacklisted", + # "webUISharingInternalUsersToRootSharingIndicator", + # "webUISharingPermissionsUsers", + # "webUISharingPermissionToRoot", + # "webUISharingPublicBasic", + # "webUISharingPublicManagement", + # "webUISharingPublicDifferentRoles", + # "webUISharingPublicExpire", + # "webUITrashbinDelete", + # "webUITrashbinFilesFolders", + # "webUITrashbinRestore", "webUIUpload", ], }, @@ -284,76 +287,77 @@ config = { }, "notificationsAppNeeded": True, "filterTags": "@smokeTest and not @skipOnIphoneResolution and not @skip and not @skipOnOC10", + "skip": True, }, "webUI-iPhone": { "type": FULL, "suites": { - "oC10iPhone1": [ - "webUIAccount", - "webUICreateFilesFolders", - "webUIDeleteFilesFolders", - "webUIFavorites", - "webUIFiles", - "webUIFilesActionMenu", - "webUIFilesCopy", - "webUIFilesDetails", - "webUIFilesList", - "webUIFilesSearch", - "webUILogin", - "webUIPreview", - "webUIPrivateLinks", - "webUIRenameFiles", - "webUIRenameFolders", - "webUIRestrictSharing", - "webUISharingAcceptShares", - "webUISharingAcceptSharesToRoot", - "webUIMarkdownEditor", - "webUISharingInternalUsersBlacklisted", - # The following suites may have all scenarios currently skipped. - # The suites are listed here so that scenarios will run when - # they are enabled. - "webUIWebdavLockProtection", - "webUIWebdavLocks", - ], + # "oC10iPhone1": [ + # "webUIAccount", + # "webUICreateFilesFolders", + # "webUIDeleteFilesFolders", + # "webUIFavorites", + # "webUIFiles", + # "webUIFilesActionMenu", + # "webUIFilesCopy", + # "webUIFilesDetails", + # "webUIFilesList", + # "webUIFilesSearch", + # "webUILogin", + # "webUIPreview", + # "webUIPrivateLinks", + # "webUIRenameFiles", + # "webUIRenameFolders", + # "webUIRestrictSharing", + # "webUISharingAcceptShares", + # "webUISharingAcceptSharesToRoot", + # "webUIMarkdownEditor", + # "webUISharingInternalUsersBlacklisted", + # # The following suites may have all scenarios currently skipped. + # # The suites are listed here so that scenarios will run when + # # they are enabled. + # "webUIWebdavLockProtection", + # "webUIWebdavLocks", + # ], "oC10iPhone2": [ - "webUIMoveFilesFolders", - "webUIResharing1", - "webUIResharing2", - "webUIResharingToRoot", - "webUISharingAutocompletion", - "webUISharingFilePermissionMultipleUsers", - "webUISharingFilePermissionsGroups", - "webUISharingFolderAdvancedPermissionMultipleUsers", - "webUISharingFolderAdvancedPermissionsGroups", - "webUISharingFolderPermissionMultipleUsers", - "webUISharingFolderPermissionsGroups", - "webUISharingInternalGroups", - "webUISharingInternalGroupsEdgeCases", - "webUISharingInternalGroupsSharingIndicator", - "webUISharingInternalGroupsToRoot", - "webUISharingInternalGroupsToRootEdgeCases", - "webUISharingInternalGroupsToRootSharingIndicator", - "webUISharingInternalUsers", - "webUISharingInternalUsersExpire", - "webUISharingInternalUsersCollaborator", - "webUISharingInternalUsersShareWithPage", - "webUISharingInternalUsersSharingIndicator", - "webUISharingInternalUsersToRootCollaborator", - "webUISharingInternalUsersToRootPreviews", - "webUISharingInternalUsersToRootShareWithPage", - "webUISharingInternalUsersToRootSharingIndicator", - "webUISharingInternalUsersExpireToRoot", - "webUISharingInternalUsersToRoot", - "webUISharingInternalUsersToRootBlacklisted", - "webUISharingPermissionsUsers", - "webUISharingPermissionToRoot", - "webUISharingPublicBasic", - "webUISharingPublicManagement", - "webUISharingPublicDifferentRoles", - "webUISharingPublicExpire", - "webUITrashbinDelete", - "webUITrashbinFilesFolders", - "webUITrashbinRestore", + # "webUIMoveFilesFolders", + # "webUIResharing1", + # "webUIResharing2", + # "webUIResharingToRoot", + # "webUISharingAutocompletion", + # "webUISharingFilePermissionMultipleUsers", + # "webUISharingFilePermissionsGroups", + # "webUISharingFolderAdvancedPermissionMultipleUsers", + # "webUISharingFolderAdvancedPermissionsGroups", + # "webUISharingFolderPermissionMultipleUsers", + # "webUISharingFolderPermissionsGroups", + # "webUISharingInternalGroups", + # "webUISharingInternalGroupsEdgeCases", + # "webUISharingInternalGroupsSharingIndicator", + # "webUISharingInternalGroupsToRoot", + # "webUISharingInternalGroupsToRootEdgeCases", + # "webUISharingInternalGroupsToRootSharingIndicator", + # "webUISharingInternalUsers", + # "webUISharingInternalUsersExpire", + # "webUISharingInternalUsersCollaborator", + # "webUISharingInternalUsersShareWithPage", + # "webUISharingInternalUsersSharingIndicator", + # "webUISharingInternalUsersToRootCollaborator", + # "webUISharingInternalUsersToRootPreviews", + # "webUISharingInternalUsersToRootShareWithPage", + # "webUISharingInternalUsersToRootSharingIndicator", + # "webUISharingInternalUsersExpireToRoot", + # "webUISharingInternalUsersToRoot", + # "webUISharingInternalUsersToRootBlacklisted", + # "webUISharingPermissionsUsers", + # "webUISharingPermissionToRoot", + # "webUISharingPublicBasic", + # "webUISharingPublicManagement", + # "webUISharingPublicDifferentRoles", + # "webUISharingPublicExpire", + # "webUITrashbinDelete", + # "webUITrashbinFilesFolders", + # "webUITrashbinRestore", "webUIUpload", ], }, @@ -466,6 +470,7 @@ config = { "runningOnOCIS": True, "visualTesting": False, "filterTags": "not @skip and not @skipOnOCIS and not @notToImplementOnOCIS", + "skip": True, }, "webUI-notifications-oc10-integration": { "type": NOTIFICATIONS, @@ -485,6 +490,7 @@ config = { "oc10IntegrationAppIncluded": True, "notificationsAppNeeded": True, "screenShots": False, + "skip": True, }, "webUI-oc10-integration": { "type": FULL, @@ -566,6 +572,7 @@ config = { "filterTags": "not @skip and not @skipOnOC10 and not @openIdLogin and @smokeTest", "oc10IntegrationAppIncluded": True, "screenShots": False, + "skip": True, }, }, "build": True, @@ -733,7 +740,8 @@ def beforePipelines(ctx): elif "unit-tests-only" in title: return yarnlint() + checkForRecentBuilds(ctx) else: - return yarnlint() + checkForRecentBuilds(ctx) + changelog(ctx) + website(ctx) + cacheOcisPipeline(ctx) + # return yarnlint() + checkForRecentBuilds(ctx) + changelog(ctx) + website(ctx) + cacheOcisPipeline(ctx) + return checkForRecentBuilds(ctx) def stagePipelines(ctx): title = ctx.build.title.lower() @@ -748,10 +756,11 @@ def stagePipelines(ctx): if acceptancePipelines == False: return unitTestPipelines - if ("acceptance-tests-only" not in title): - dependsOn(unitTestPipelines, acceptancePipelines) + # if ("acceptance-tests-only" not in title): + # dependsOn(unitTestPipelines, acceptancePipelines) - return unitTestPipelines + acceptancePipelines + # return unitTestPipelines + acceptancePipelines + return acceptancePipelines def afterPipelines(ctx): return build(ctx) + notify() diff --git a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md index 2080b1d328a..993b279867b 100644 --- a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md +++ b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md @@ -519,9 +519,9 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingExternal/federationSharing.feature:166](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternal/federationSharing.feature#L166) ### [Uploading a file with a name that already exists is confusing](https://github.com/owncloud/web/issues/5106) -- [webUIUpload/upload.feature:109](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L109) -- [webUIUpload/upload.feature:122](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L122) -- [webUIUpload/upload.feature:139](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L139) +- [webUIUpload/upload.feature:108](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L108) +- [webUIUpload/upload.feature:121](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L121) +- [webUIUpload/upload.feature:138](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L138) - [webUIUpload/uploadEdgecases.feature:67](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/uploadEdgecases.feature#L67) ### [browsing directly to a details 'tab' is not possible](https://github.com/owncloud/web/issues/5464) diff --git a/tests/acceptance/features/webUIUpload/upload.feature b/tests/acceptance/features/webUIUpload/upload.feature index f8476806a36..0a0f8358ec9 100644 --- a/tests/acceptance/features/webUIUpload/upload.feature +++ b/tests/acceptance/features/webUIUpload/upload.feature @@ -11,80 +11,80 @@ Feature: File Upload And user "Alice" has uploaded file with content "initial content" to "simple-folder/lorem.txt" And user "Alice" has logged in using the webUI - @smokeTest @ocisSmokeTest - Scenario: simple upload of a file that does not exist before - When the user uploads file "new-lorem.txt" using the webUI - Then no message should be displayed on the webUI - And file "new-lorem.txt" should be listed on the webUI - And as "Alice" the content of "new-lorem.txt" should be the same as the content of local file "new-lorem.txt" - - @smokeTest @ocisSmokeTest - Scenario: simple upload of a folder that does not exist before - When the user uploads a folder containing the following files in separate sub-folders using the webUI: - | lorem.txt | - | new-lorem.txt | - Then no message should be displayed on the webUI - And the last uploaded folder should be listed on the webUI - And as "Alice" the last uploaded folder should exist - And as "Alice" the last uploaded folder should contain the following files inside the sub-folders: - | new-lorem.txt | - | lorem.txt | - - @smokeTest @ocisSmokeTest - Scenario: simple upload of a folder with subfolders that does not exist before - When the user uploads folder "PARENT" using the webUI - Then no message should be displayed on the webUI - And folder "PARENT" should be listed on the webUI - When the user browses to the folder "PARENT" on the files page - Then the following resources should be listed on the webUI - | entry_name | - | parent.txt | - | CHILD | - And as "Alice" folder "PARENT" should exist - And as "Alice" file "PARENT/parent.txt" should exist - And as "Alice" folder "PARENT/CHILD" should exist - - @smokeTest @ocisSmokeTest - Scenario: Upload of a folder inside a subdirectory - Given user "Alice" has created folder "simple-empty-folder" - And the user has browsed to the files page - When the user browses to the folder "simple-empty-folder" on the files page - And the user uploads folder "PARENT" using the webUI - Then no message should be displayed on the webUI - And folder "PARENT" should be listed on the webUI - When the user opens folder "PARENT" using the webUI - Then the following resources should be listed on the webUI - | entry_name | - | parent.txt | - | CHILD | - And as "Alice" folder "simple-empty-folder/PARENT" should exist - And as "Alice" file "simple-empty-folder/PARENT/parent.txt" should exist - And as "Alice" folder "simple-empty-folder/PARENT/CHILD" should exist - - @smokeTest @ocisSmokeTest - Scenario: uploading a big file (when chunking is implemented this upload should be chunked) - Given a file with the size of "30000000" bytes and the name "big-video.mp4" has been created locally - When the user uploads a created file "big-video.mp4" using the webUI - Then no message should be displayed on the webUI - And file "big-video.mp4" should be listed on the webUI - And as "Alice" the content of "big-video.mp4" should be the same as the content of local file "big-video.mp4" - - @skipOnFIREFOX - Scenario: conflict with a big file (when chunking is implemented this upload should be chunked) - Given a file with the size of "30000000" bytes and the name "big-video.mp4" has been created locally - When the user renames file "lorem.txt" to "big-video.mp4" using the webUI - And the user reloads the current page of the webUI - And the user uploads a created file "big-video.mp4" with overwrite using the webUI - Then file "big-video.mp4" should be listed on the webUI - And as "Alice" the content of "big-video.mp4" should be the same as the content of local file "big-video.mp4" - - - Scenario: upload a new file into a sub folder - When the user opens folder "simple-folder" using the webUI - And the user uploads file "new-lorem.txt" using the webUI - Then no message should be displayed on the webUI - And file "new-lorem.txt" should be listed on the webUI - And as "Alice" the content of "simple-folder/new-lorem.txt" should be the same as the content of local file "new-lorem.txt" + # @smokeTest @ocisSmokeTest + # Scenario: simple upload of a file that does not exist before + # When the user uploads file "new-lorem.txt" using the webUI + # Then no message should be displayed on the webUI + # And file "new-lorem.txt" should be listed on the webUI + # And as "Alice" the content of "new-lorem.txt" should be the same as the content of local file "new-lorem.txt" + + # @smokeTest @ocisSmokeTest + # Scenario: simple upload of a folder that does not exist before + # When the user uploads a folder containing the following files in separate sub-folders using the webUI: + # | lorem.txt | + # | new-lorem.txt | + # Then no message should be displayed on the webUI + # And the last uploaded folder should be listed on the webUI + # And as "Alice" the last uploaded folder should exist + # And as "Alice" the last uploaded folder should contain the following files inside the sub-folders: + # | new-lorem.txt | + # | lorem.txt | + + # @smokeTest @ocisSmokeTest + # Scenario: simple upload of a folder with subfolders that does not exist before + # When the user uploads folder "PARENT" using the webUI + # Then no message should be displayed on the webUI + # And folder "PARENT" should be listed on the webUI + # When the user browses to the folder "PARENT" on the files page + # Then the following resources should be listed on the webUI + # | entry_name | + # | parent.txt | + # | CHILD | + # And as "Alice" folder "PARENT" should exist + # And as "Alice" file "PARENT/parent.txt" should exist + # And as "Alice" folder "PARENT/CHILD" should exist + + # @smokeTest @ocisSmokeTest + # Scenario: Upload of a folder inside a subdirectory + # Given user "Alice" has created folder "simple-empty-folder" + # And the user has browsed to the files page + # When the user browses to the folder "simple-empty-folder" on the files page + # And the user uploads folder "PARENT" using the webUI + # Then no message should be displayed on the webUI + # And folder "PARENT" should be listed on the webUI + # When the user opens folder "PARENT" using the webUI + # Then the following resources should be listed on the webUI + # | entry_name | + # | parent.txt | + # | CHILD | + # And as "Alice" folder "simple-empty-folder/PARENT" should exist + # And as "Alice" file "simple-empty-folder/PARENT/parent.txt" should exist + # And as "Alice" folder "simple-empty-folder/PARENT/CHILD" should exist + + # @smokeTest @ocisSmokeTest + # Scenario: uploading a big file (when chunking is implemented this upload should be chunked) + # Given a file with the size of "30000000" bytes and the name "big-video.mp4" has been created locally + # When the user uploads a created file "big-video.mp4" using the webUI + # Then no message should be displayed on the webUI + # And file "big-video.mp4" should be listed on the webUI + # And as "Alice" the content of "big-video.mp4" should be the same as the content of local file "big-video.mp4" + + # @skipOnFIREFOX + # Scenario: conflict with a big file (when chunking is implemented this upload should be chunked) + # Given a file with the size of "30000000" bytes and the name "big-video.mp4" has been created locally + # When the user renames file "lorem.txt" to "big-video.mp4" using the webUI + # And the user reloads the current page of the webUI + # And the user uploads a created file "big-video.mp4" with overwrite using the webUI + # Then file "big-video.mp4" should be listed on the webUI + # And as "Alice" the content of "big-video.mp4" should be the same as the content of local file "big-video.mp4" + + + # Scenario: upload a new file into a sub folder + # When the user opens folder "simple-folder" using the webUI + # And the user uploads file "new-lorem.txt" using the webUI + # Then no message should be displayed on the webUI + # And file "new-lorem.txt" should be listed on the webUI + # And as "Alice" the content of "simple-folder/new-lorem.txt" should be the same as the content of local file "new-lorem.txt" @smokeTest Scenario: overwrite an existing file @@ -92,86 +92,85 @@ Feature: File Upload Then no message should be displayed on the webUI And file "lorem.txt" should be listed on the webUI And as "Alice" the content of "lorem.txt" should be the same as the content of local file "lorem.txt" - When the user reloads the current page of the webUI - Then the versions list for resource "lorem.txt" should contain 1 entry - But file "lorem (2).txt" should not be listed on the webUI - - @smokeTest @issue-ocis-reva-54 - Scenario: overwrite an existing file when versioning is disabled - Given the app "files_versions" has been disabled - When the user uploads overwriting file "lorem.txt" using the webUI - Then no message should be displayed on the webUI - And file "lorem.txt" should be listed on the webUI - And as "Alice" the content of "lorem.txt" should be the same as the content of local file "lorem.txt" + And the versions list for resource "lorem.txt" should contain 1 entry But file "lorem (2).txt" should not be listed on the webUI - @issue-5106 - Scenario: keep new and existing file - When the user uploads file "lorem.txt" using the webUI - And the user chooses to keep the new files in the upload dialog - And the user chooses to keep the existing files in the upload dialog - And the user chooses "Continue" in the upload dialog - Then no dialog should be displayed on the webUI - And no message should be displayed on the webUI - And file "lorem.txt" should be listed on the webUI - And the content of "lorem.txt" should not have changed - And file "lorem (2).txt" should be listed on the webUI - And as "Alice" the content of "lorem (2).txt" should be the same as the content of local file "lorem.txt" - - @issue-5106 - Scenario: cancel conflict dialog - When the user uploads file "lorem.txt" using the webUI - And the user chooses "Cancel" in the upload dialog - Then no dialog should be displayed on the webUI - And no message should be displayed on the webUI - And file "lorem.txt" should be listed on the webUI - And the content of "lorem.txt" should not have changed - And file "lorem (2).txt" should not be listed on the webUI - - @disablePreviews - Scenario: overwrite an existing file in a sub-folder - When the user opens folder "simple-folder" using the webUI - And the user uploads overwriting file "lorem.txt" using the webUI - Then file "lorem.txt" should be listed on the webUI - And as "Alice" the content of "simple-folder/lorem.txt" should be the same as the content of local file "lorem.txt" - - @issue-5106 - Scenario: keep new and existing file in a sub-folder - When the user opens folder "simple-folder" using the webUI - And the user uploads file "lorem.txt" using the webUI - And the user chooses to keep the new files in the upload dialog - And the user chooses to keep the existing files in the upload dialog - And the user chooses "Continue" in the upload dialog - Then no dialog should be displayed on the webUI - And no message should be displayed on the webUI - And file "lorem.txt" should be listed on the webUI - And the content of "lorem.txt" should not have changed - And file "lorem (2).txt" should be listed on the webUI - And as "Alice" the content of "lorem (2).txt" should be the same as the content of local file "lorem.txt" - - @issue-ocis-2258 - Scenario: upload overwriting a file into a public share - Given user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions and password "pass123" - When the public uses the webUI to access the last public link created by user "Alice" with password "pass123" - And the user uploads overwriting file "lorem.txt" using the webUI - Then file "lorem.txt" should be listed on the webUI - And as "Alice" the content of "simple-folder/lorem.txt" should be the same as the content of local file "lorem.txt" - - - Scenario: upload a file with comma in the filename - When the user uploads file "file,with,comma,.txt" using the webUI - Then no message should be displayed on the webUI - And file "file,with,comma,.txt" should be listed on the webUI - And as "Alice" the content of "file,with,comma,.txt" should be the same as the content of local file "file,with,comma,.txt" - - - Scenario: simple upload of a folder, with comma in its name, that does not exist before - When the user uploads folder "Folder,With,Comma" using the webUI - Then no message should be displayed on the webUI - And folder "Folder,With,Comma" should be listed on the webUI - When the user browses to the folder "Folder,With,Comma" on the files page - Then the following resources should be listed on the webUI - | entry_name | - | sunday,monday.txt | - And as "Alice" folder "Folder,With,Comma" should exist - And as "Alice" file "Folder,With,Comma/sunday,monday.txt" should exist + # @smokeTest @issue-ocis-reva-54 + # Scenario: overwrite an existing file when versioning is disabled + # Given the app "files_versions" has been disabled + # When the user uploads overwriting file "lorem.txt" using the webUI + # Then no message should be displayed on the webUI + # And file "lorem.txt" should be listed on the webUI + # And as "Alice" the content of "lorem.txt" should be the same as the content of local file "lorem.txt" + # But file "lorem (2).txt" should not be listed on the webUI + + # @issue-5106 + # Scenario: keep new and existing file + # When the user uploads file "lorem.txt" using the webUI + # And the user chooses to keep the new files in the upload dialog + # And the user chooses to keep the existing files in the upload dialog + # And the user chooses "Continue" in the upload dialog + # Then no dialog should be displayed on the webUI + # And no message should be displayed on the webUI + # And file "lorem.txt" should be listed on the webUI + # And the content of "lorem.txt" should not have changed + # And file "lorem (2).txt" should be listed on the webUI + # And as "Alice" the content of "lorem (2).txt" should be the same as the content of local file "lorem.txt" + + # @issue-5106 + # Scenario: cancel conflict dialog + # When the user uploads file "lorem.txt" using the webUI + # And the user chooses "Cancel" in the upload dialog + # Then no dialog should be displayed on the webUI + # And no message should be displayed on the webUI + # And file "lorem.txt" should be listed on the webUI + # And the content of "lorem.txt" should not have changed + # And file "lorem (2).txt" should not be listed on the webUI + + # @disablePreviews + # Scenario: overwrite an existing file in a sub-folder + # When the user opens folder "simple-folder" using the webUI + # And the user uploads overwriting file "lorem.txt" using the webUI + # Then file "lorem.txt" should be listed on the webUI + # And as "Alice" the content of "simple-folder/lorem.txt" should be the same as the content of local file "lorem.txt" + + # @issue-5106 + # Scenario: keep new and existing file in a sub-folder + # When the user opens folder "simple-folder" using the webUI + # And the user uploads file "lorem.txt" using the webUI + # And the user chooses to keep the new files in the upload dialog + # And the user chooses to keep the existing files in the upload dialog + # And the user chooses "Continue" in the upload dialog + # Then no dialog should be displayed on the webUI + # And no message should be displayed on the webUI + # And file "lorem.txt" should be listed on the webUI + # And the content of "lorem.txt" should not have changed + # And file "lorem (2).txt" should be listed on the webUI + # And as "Alice" the content of "lorem (2).txt" should be the same as the content of local file "lorem.txt" + + # @issue-ocis-2258 + # Scenario: upload overwriting a file into a public share + # Given user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions and password "pass123" + # When the public uses the webUI to access the last public link created by user "Alice" with password "pass123" + # And the user uploads overwriting file "lorem.txt" using the webUI + # Then file "lorem.txt" should be listed on the webUI + # And as "Alice" the content of "simple-folder/lorem.txt" should be the same as the content of local file "lorem.txt" + + + # Scenario: upload a file with comma in the filename + # When the user uploads file "file,with,comma,.txt" using the webUI + # Then no message should be displayed on the webUI + # And file "file,with,comma,.txt" should be listed on the webUI + # And as "Alice" the content of "file,with,comma,.txt" should be the same as the content of local file "file,with,comma,.txt" + + + # Scenario: simple upload of a folder, with comma in its name, that does not exist before + # When the user uploads folder "Folder,With,Comma" using the webUI + # Then no message should be displayed on the webUI + # And folder "Folder,With,Comma" should be listed on the webUI + # When the user browses to the folder "Folder,With,Comma" on the files page + # Then the following resources should be listed on the webUI + # | entry_name | + # | sunday,monday.txt | + # And as "Alice" folder "Folder,With,Comma" should exist + # And as "Alice" file "Folder,With,Comma/sunday,monday.txt" should exist diff --git a/tests/acceptance/pageObjects/FilesPageElement/versionsDialog.js b/tests/acceptance/pageObjects/FilesPageElement/versionsDialog.js index 09154da5d94..18bd61772b3 100644 --- a/tests/acceptance/pageObjects/FilesPageElement/versionsDialog.js +++ b/tests/acceptance/pageObjects/FilesPageElement/versionsDialog.js @@ -6,6 +6,7 @@ module.exports = { getVersionsCount: async function() { let count = 0 await this.api.elements('@versionsList', function(result) { + console.log(result.value) count = result.value.length }) return count diff --git a/tests/acceptance/stepDefinitions/generalContext.js b/tests/acceptance/stepDefinitions/generalContext.js index 99433fe7014..1026dbbe2c8 100644 --- a/tests/acceptance/stepDefinitions/generalContext.js +++ b/tests/acceptance/stepDefinitions/generalContext.js @@ -135,9 +135,7 @@ Then( const fullPathOfLocalFile = client.globals.filesForUpload + localFile const body = await webdavHelper.download(userId, remoteFile) - assertContentOfLocalFileIs(fullPathOfLocalFile, body) - - return this + await assertContentOfLocalFileIs(fullPathOfLocalFile, body) } )