From e65fd1141909608862f95c582ac98ab2b07f632b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Wed, 12 Jun 2019 15:32:40 +0200 Subject: [PATCH 1/2] Add messages to assertFalse/True to clarify the failed assertion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise the output would just read "Failed asserting that true is false." or "Failed asserting that false is true.", which is not very informative when there are several assertFalse/True in a row. Signed-off-by: Daniel Calviño Sánchez --- .../acceptance/features/bootstrap/PublicShareContext.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/acceptance/features/bootstrap/PublicShareContext.php b/tests/acceptance/features/bootstrap/PublicShareContext.php index 02508330391..891c231b164 100644 --- a/tests/acceptance/features/bootstrap/PublicShareContext.php +++ b/tests/acceptance/features/bootstrap/PublicShareContext.php @@ -202,11 +202,14 @@ class PublicShareContext implements Context, ActorAwareInterface { // download item should not be shown in the menu (although it will be in // the DOM). PHPUnit_Framework_Assert::assertFalse( - $this->actor->find(self::downloadItemInShareMenu())->isVisible()); + $this->actor->find(self::downloadItemInShareMenu())->isVisible(), + "Download item in share menu is visible"); PHPUnit_Framework_Assert::assertTrue( - $this->actor->find(self::directLinkItemInShareMenu())->isVisible()); + $this->actor->find(self::directLinkItemInShareMenu())->isVisible(), + "Direct link item in share menu is not visible"); PHPUnit_Framework_Assert::assertTrue( - $this->actor->find(self::saveItemInShareMenu())->isVisible()); + $this->actor->find(self::saveItemInShareMenu())->isVisible(), + "Save item in share menu is not visible"); } /** From c887564e4f97d3b7b82ead6644031e5c408f7085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Wed, 12 Jun 2019 15:36:13 +0200 Subject: [PATCH 2/2] Fix download entry shown on public share menu when not in mobile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to a typo in the variable name the rule was not properly parsed and applied. Signed-off-by: Daniel Calviño Sánchez --- apps/files_sharing/css/public.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss index 13a3ee291fa..f0f367d5596 100644 --- a/apps/files_sharing/css/public.scss +++ b/apps/files_sharing/css/public.scss @@ -195,7 +195,7 @@ thead { // hide the download entry on the menu // on public share when NOT on mobile -@media only screen and (min-width: $mobile_breakpoint + 1) { +@media only screen and (min-width: $breakpoint-mobile + 1) { #body-public { .header-right { #header-actions-menu {