Skip to content

Fix download entry shown on public share menu when not in mobile #15937

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.

Sign up for GitHub

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

Merged
skjnldsv merged 2 commits into from
Jun 12, 2019
Merged

Fix download entry shown on public share menu when not in mobile #15937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e65fd11
Add messages to assertFalse/True to clarify the failed assertion
danxuliu Jun 12, 2019
c887564
Fix download entry shown on public share menu when not in mobile
danxuliu Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/files_sharing/css/public.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Copy link
Member

@skjnldsv skjnldsv Jun 12, 2019

Choose a reason for hiding this comment

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

🙈

Copy link
Member

@nachoparker nachoparker Jun 12, 2019

Choose a reason for hiding this comment

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

🙈

#body-public {
.header-right {
#header-actions-menu {
Expand Down
9 changes: 6 additions & 3 deletions tests/acceptance/features/bootstrap/PublicShareContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,14 @@ public function iSeeThatTheShareMenuIsShown() {
// 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");
}

/**
Expand Down