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.

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

[Tests-Only] Restore files and folder from trashbin with same name #3016

Merged

Conversation

swoichha
Copy link
Contributor

Description

  • Restore files from trashbin with same name as folder
  • Restore folder from trashbin with same name as file

Related Issue

#1723

Motivation and Context

  • To restore file from trashbin with same name as folder
  • To restore folder from trashbin with same name as file

How Has This Been Tested?

  • 🤖

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

@PVince81
Copy link
Contributor

@swoichha please always prefix the subject with "Tests" or something that makes it clear that the PR is about adding tests, not actually implementing the feature. Thanks!

@kiranparajuli589 kiranparajuli589 requested review from kiranparajuli589 and removed request for DeepDiver1975 February 12, 2020 20:56
@swoichha swoichha changed the title Restore files and folder from trashbin with same name [Tests-only] Restore files and folder from trashbin with same name Feb 13, 2020
@kiranparajuli589 kiranparajuli589 changed the title [Tests-only] Restore files and folder from trashbin with same name [Tests-Only] Restore files and folder from trashbin with same name Feb 13, 2020
Copy link
Member

@individual-it individual-it left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need to have the extra folder functions, you can use the same as for files. files/folders are the same

e.g. Then('file/folder {string} should be listed on the webUI', function (folder) { is the same as Then('the folder {string} should be listed on the webUI', function (folder) {

tests/acceptance/pageObjects/FilesPageElement/filesList.js Outdated Show resolved Hide resolved
tests/acceptance/pageObjects/FilesPageElement/filesList.js Outdated Show resolved Hide resolved
tests/acceptance/pageObjects/FilesPageElement/filesList.js Outdated Show resolved Hide resolved
tests/acceptance/pageObjects/FilesPageElement/filesList.js Outdated Show resolved Hide resolved
tests/acceptance/pageObjects/FilesPageElement/filesList.js Outdated Show resolved Hide resolved
tests/acceptance/pageObjects/FilesPageElement/filesList.js Outdated Show resolved Hide resolved
tests/acceptance/stepDefinitions/filesContext.js Outdated Show resolved Hide resolved
tests/acceptance/stepDefinitions/filesContext.js Outdated Show resolved Hide resolved
tests/acceptance/stepDefinitions/filesContext.js Outdated Show resolved Hide resolved
@swoichha swoichha force-pushed the trashBinRestoreForFilesAndFolder branch from a3465e2 to c3f1dd2 Compare February 14, 2020 10:56
@swoichha swoichha force-pushed the trashBinRestoreForFilesAndFolder branch from c3f1dd2 to 3052239 Compare February 14, 2020 11:21
@swoichha swoichha force-pushed the trashBinRestoreForFilesAndFolder branch from 01f0ace to cea007b Compare February 17, 2020 08:36
@swoichha swoichha force-pushed the trashBinRestoreForFilesAndFolder branch from d732f3a to fb6fd97 Compare February 18, 2020 08:35
@kiranparajuli589 kiranparajuli589 self-requested a review February 18, 2020 10:30
@owncloud owncloud deleted a comment from update-docs bot Feb 18, 2020
@phil-davis
Copy link
Contributor

@individual-it @kiranparajuli589 please review again

@kiranparajuli589
Copy link
Contributor

LGTM 👍

@@ -371,6 +378,13 @@ Then('file/folder {string} should not be listed on the webUI', async function (f
)
})

Then('{string} {string} should not be listed on the webUI', async (elementType, folder) => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that will be too confusing to have a very similar step one with quotes around "folder" and one without.
Better to have separate step for file and folder

Copy link
Member

@individual-it individual-it left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, please squash the commits and then we can merge

@swoichha swoichha force-pushed the trashBinRestoreForFilesAndFolder branch from c8c6abc to 2400e36 Compare February 19, 2020 06:02
@individual-it individual-it dismissed kiranparajuli589’s stale review February 19, 2020 07:58

requested changes have been implemented

@individual-it individual-it merged commit d8c1d4f into owncloud:master Feb 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
QA:team Status:Needs-Review Needs review from a maintainer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants