From aeb2760d7e3a30d3b4596a16ec51b84bf54b8bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 21 Dec 2018 20:09:18 +0100 Subject: [PATCH] Add acceptance tests for searching comments 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 + .../acceptance/features/app-comments.feature | 51 ++++++++++ .../features/bootstrap/SearchContext.php | 99 +++++++++++++++++++ 3 files changed, 152 insertions(+) create mode 100644 tests/acceptance/features/bootstrap/SearchContext.php diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml index 5149180d9b..acb404aae2 100644 --- a/tests/acceptance/config/behat.yml +++ b/tests/acceptance/config/behat.yml @@ -20,6 +20,7 @@ default: - LoginPageContext - NotificationContext - PublicShareContext + - SearchContext - SettingsContext - SettingsMenuContext - ThemingAppContext @@ -47,6 +48,7 @@ default: - LoginPageContext - NotificationContext - PublicShareContext + - SearchContext - SettingsContext - SettingsMenuContext - ThemingAppContext diff --git a/tests/acceptance/features/app-comments.feature b/tests/acceptance/features/app-comments.feature index 31e902f01c..8d188436f2 100644 --- a/tests/acceptance/features/app-comments.feature +++ b/tests/acceptance/features/app-comments.feature @@ -216,3 +216,54 @@ Feature: app-comments And I open the unread comments for "Child folder" And I see that the details view is open And I see a comment with "Hello world" as message + + + + Scenario: search a comment + Given I am logged in + And I open the details view for "welcome.txt" + And I open the "Comments" tab in the details view + And I create a new comment with "Hello world" as message + And I see a comment with "Hello world" as message + When I search for "hello" + # Search results for comments also include the user that wrote the comment. + Then I see that the search result 1 is "user0Hello world" + And I see that the search result 1 was found in "welcome.txt" + + Scenario: search a comment in a child folder + Given I am logged in + And I create a new folder named "Folder" + And I enter in the folder named "Folder" + And I create a new folder named "Child folder" + And I open the details view for "Child folder" + And I open the "Comments" tab in the details view + And I create a new comment with "Hello world" as message + And I see a comment with "Hello world" as message + # The Files app is open again to reload the file list + And I open the Files app + When I search for "hello" + # Search results for comments also include the user that wrote the comment. + Then I see that the search result 1 is "user0Hello world" + And I see that the search result 1 was found in "Folder/Child folder" + + Scenario: search a comment by a another user + Given I act as John + And I am logged in as the admin + And I act as Jane + And I am logged in + And I act as John + And I rename "welcome.txt" to "shared.txt" + And I share "shared.txt" with "user0" + And I see that the file is shared with "user0" + And I act as Jane + # The Files app is open again to reload the file list + And I open the Files app + And I open the details view for "shared.txt" + And I open the "Comments" tab in the details view + And I create a new comment with "Hello world" as message + And I see a comment with "Hello world" as message + When I act as John + And I search for "hello" + # Search results for comments also include the user that wrote the comment. + Then I see that the search result 1 is "user0Hello world" + And I see that the search result 1 was found in "shared.txt" diff --git a/tests/acceptance/features/bootstrap/SearchContext.php b/tests/acceptance/features/bootstrap/SearchContext.php new file mode 100644 index 0000000000..3633160688 --- /dev/null +++ b/tests/acceptance/features/bootstrap/SearchContext.php @@ -0,0 +1,99 @@ +. + * + */ + +use Behat\Behat\Context\Context; + +class SearchContext implements Context, ActorAwareInterface { + + use ActorAware; + + /** + * @return Locator + */ + public static function searchBoxInput() { + return Locator::forThe()->css("#header .searchbox input")-> + describedAs("Search box input in the header"); + } + + /** + * @return Locator + */ + public static function searchResults() { + return Locator::forThe()->css("#searchresults")-> + describedAs("Search results"); + } + + /** + * @return Locator + */ + public static function searchResult($number) { + return Locator::forThe()->xpath("//*[contains(concat(' ', normalize-space(@class), ' '), ' result ')][$number]")-> + descendantOf(self::searchResults())-> + describedAs("Search result $number"); + } + + /** + * @return Locator + */ + public static function searchResultName($number) { + return Locator::forThe()->css(".name")-> + descendantOf(self::searchResult($number))-> + describedAs("Name for search result $number"); + } + + /** + * @return Locator + */ + public static function searchResultPath($number) { + // Currently search results for comments misuse the ".path" class to + // dim the user name, so "div.path" needs to be used to find the proper + // path element. + return Locator::forThe()->css("div.path")-> + descendantOf(self::searchResult($number))-> + describedAs("Path for search result $number"); + } + + /** + * @When I search for :query + */ + public function iSearchFor($query) { + $this->actor->find(self::searchBoxInput(), 10)->setValue($query . "\r"); + } + + /** + * @Then I see that the search result :number is :name + */ + public function iSeeThatTheSearchResultIs($number, $name) { + PHPUnit_Framework_Assert::assertEquals( + $name, $this->actor->find(self::searchResultName($number), 10)->getText()); + } + + /** + * @Then I see that the search result :number was found in :path + */ + public function iSeeThatTheSearchResultWasFoundIn($number, $path) { + PHPUnit_Framework_Assert::assertEquals( + $path, $this->actor->find(self::searchResultPath($number), 10)->getText()); + } + +}