From 4fcabf167e121497bfae4dcdec0b8eb7e8f9d483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 21 Dec 2018 13:44:41 +0100 Subject: [PATCH] Add acceptance tests for moving and copying files to another folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- tests/acceptance/config/behat.yml | 2 + tests/acceptance/features/app-files.feature | 23 ++++ .../features/bootstrap/FileListContext.php | 28 ++++ .../features/bootstrap/FilePickerContext.php | 125 ++++++++++++++++++ 4 files changed, 178 insertions(+) create mode 100644 tests/acceptance/features/bootstrap/FilePickerContext.php diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml index acb404aae2..182629701e 100644 --- a/tests/acceptance/config/behat.yml +++ b/tests/acceptance/config/behat.yml @@ -15,6 +15,7 @@ default: - DialogContext - FeatureContext - FileListContext + - FilePickerContext - FilesAppContext - FilesAppSharingContext - LoginPageContext @@ -43,6 +44,7 @@ default: - DialogContext - FeatureContext - FileListContext + - FilePickerContext - FilesAppContext - FilesAppSharingContext - LoginPageContext diff --git a/tests/acceptance/features/app-files.feature b/tests/acceptance/features/app-files.feature index 7d216ffc1f..dc2b52f39d 100644 --- a/tests/acceptance/features/app-files.feature +++ b/tests/acceptance/features/app-files.feature @@ -140,6 +140,29 @@ Feature: app-files Then I see that the current section is "Deleted files" Then I see that the file list contains a file named "welcome.txt" + Scenario: move a file to another folder + Given I am logged in + And I create a new folder named "Destination" + When I start the move or copy operation for "welcome.txt" + And I select "Destination" in the file picker + And I move to the last selected folder in the file picker + Then I see that the file list does not contain a file named "welcome.txt" + And I enter in the folder named "Destination" + And I see that the file list contains a file named "welcome.txt" + + Scenario: copy a file to another folder + Given I am logged in + And I create a new folder named "Destination" + When I start the move or copy operation for "welcome.txt" + And I select "Destination" in the file picker + And I copy to the last selected folder in the file picker + Then I enter in the folder named "Destination" + # The file will appear in the destination once the copy operation finishes + And I see that the file list contains a file named "welcome.txt" + # The Files app is open again to reload the file list in the root folder + And I open the Files app + And I see that the file list contains a file named "welcome.txt" + Scenario: rename a file with the details view open Given I am logged in And I open the details view for "welcome.txt" diff --git a/tests/acceptance/features/bootstrap/FileListContext.php b/tests/acceptance/features/bootstrap/FileListContext.php index ee35de40c5..55db746c7c 100644 --- a/tests/acceptance/features/bootstrap/FileListContext.php +++ b/tests/acceptance/features/bootstrap/FileListContext.php @@ -265,6 +265,13 @@ class FileListContext implements Context, ActorAwareInterface { return self::fileActionsMenuItemFor("Rename"); } + /** + * @return Locator + */ + public static function moveOrCopyMenuItem() { + return self::fileActionsMenuItemFor("Move or copy"); + } + /** * @return Locator */ @@ -325,6 +332,15 @@ class FileListContext implements Context, ActorAwareInterface { $this->actor->find(self::renameInputForFile($this->fileListAncestor, $fileName1), 10)->setValue($fileName2 . "\r"); } + /** + * @Given I start the move or copy operation for :fileName + */ + public function iStartTheMoveOrCopyOperationFor($fileName) { + $this->actor->find(self::fileActionsMenuButtonForFile($this->fileListAncestor, $fileName), 10)->click(); + + $this->actor->find(self::moveOrCopyMenuItem(), 2)->click(); + } + /** * @Given I mark :fileName as favorite */ @@ -410,6 +426,18 @@ class FileListContext implements Context, ActorAwareInterface { PHPUnit_Framework_Assert::assertNotNull($this->actor->find(self::rowForFile($this->fileListAncestor, $fileName), 10)); } + /** + * @Then I see that the file list does not contain a file named :fileName + */ + public function iSeeThatTheFileListDoesNotContainAFileNamed($fileName) { + if (!WaitFor::elementToBeEventuallyNotShown( + $this->actor, + self::rowForFile($this->fileListAncestor, $fileName), + $timeout = 10 * $this->actor->getFindTimeoutMultiplier())) { + PHPUnit_Framework_Assert::fail("The file list still contains a file named $fileName after $timeout seconds"); + } + } + /** * @Then I see that :fileName1 precedes :fileName2 in the file list */ diff --git a/tests/acceptance/features/bootstrap/FilePickerContext.php b/tests/acceptance/features/bootstrap/FilePickerContext.php new file mode 100644 index 0000000000..c62a505f70 --- /dev/null +++ b/tests/acceptance/features/bootstrap/FilePickerContext.php @@ -0,0 +1,125 @@ +. + * + */ + +use Behat\Behat\Context\Context; + +class FilePickerContext implements Context, ActorAwareInterface { + + use ActorAware; + + /** + * @return Locator + */ + public static function dialog() { + return Locator::forThe()->css(".oc-dialog")-> + describedAs("File picker dialog"); + } + + /** + * @return Locator + */ + public static function fileListContainer() { + return Locator::forThe()->css("#oc-dialog-filepicker-content")-> + descendantOf(self::dialog())-> + describedAs("File list container in the file picker dialog"); + } + + /** + * @return Locator + */ + public static function rowForFile($fileName) { + return Locator::forThe()->xpath("//*[@id = 'picker-filestable']//*[contains(concat(' ', normalize-space(@class), ' '), ' filename ') and normalize-space() = '$fileName']/ancestor::tr")-> + descendantOf(self::fileListContainer())-> + describedAs("Row for file $fileName in the file picker dialog"); + } + + /** + * @return Locator + */ + public static function buttonRow() { + return Locator::forThe()->css(".oc-dialog-buttonrow")-> + descendantOf(self::dialog())-> + describedAs("Button row in the file picker dialog"); + } + + /** + * @return Locator + */ + private static function buttonFor($buttonText) { + // "Copy" and "Move" buttons text is set to "Copy to XXX" and "Move to + // XXX" when a folder is selected. + return Locator::forThe()->xpath("//button[starts-with(normalize-space(), '$buttonText')]")-> + descendantOf(self::buttonRow())-> + describedAs($buttonText . " button in the file picker dialog"); + } + + /** + * @return Locator + */ + public static function copyButton() { + return self::buttonFor("Copy"); + } + + /** + * @return Locator + */ + public static function moveButton() { + return self::buttonFor("Move"); + } + + /** + * @return Locator + */ + public static function chooseButton() { + return self::buttonFor("Choose"); + } + + /** + * @When I select :fileName in the file picker + */ + public function iSelectInTheFilePicker($fileName) { + $this->actor->find(self::rowForFile($fileName), 10)->click(); + } + + /** + * @When I copy to the last selected folder in the file picker + */ + public function iCopyToTheLastSelectedFolderInTheFilePicker() { + $this->actor->find(self::copyButton(), 10)->click(); + } + + /** + * @When I move to the last selected folder in the file picker + */ + public function iMoveToTheLastSelectedFolderInTheFilePicker() { + $this->actor->find(self::moveButton(), 10)->click(); + } + + /** + * @When I choose the last selected file in the file picker + */ + public function iChooseTheLastSelectedFileInTheFilePicker() { + $this->actor->find(self::chooseButton(), 10)->click(); + } + +}