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.

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

[FIX] Closing sidebar when room menu is clicked. #13842

Merged
merged 9 commits into from
Apr 6, 2019
Merged

[FIX] Closing sidebar when room menu is clicked. #13842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c7aba89
Don't close sidebar when room menu is clicked.
Kailash0311 Mar 21, 2019
4f00732
Merge branch 'develop' into sidebar-close
sampaiodiego Mar 26, 2019
d5577a0
Add tests to check if sidebar closes after clicking sidebar item menu
Kailash0311 Mar 26, 2019
9929f77
Update side-nav.page.js
Kailash0311 Mar 27, 2019
5a921e1
Fix typo in class name
Kailash0311 Mar 27, 2019
58fdabf
Merge branch 'develop' into sidebar-close
engelgabriel Apr 6, 2019
a0667dd
Merge branch 'develop' into sidebar-close
engelgabriel Apr 6, 2019
c774ae3
Update side-nav.page.js
rodrigok Apr 6, 2019
e18dd58
Update 08-resolutions.js
rodrigok Apr 6, 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
1 change: 1 addition & 0 deletions app/ui-sidenav/client/sidebarItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ Template.sidebarItem.events({
return menu.close();
},
'click .sidebar-item__menu'(e) {
e.stopPropagation(); // to not close the menu
e.preventDefault();

const canLeave = () => {
Expand Down
9 changes: 9 additions & 0 deletions tests/end-to-end/ui/08-resolutions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ describe('[Resolution]', () => {
mainContent.mainContent.getLocation().should.not.deep.equal({ x:0 });
});

it('it should not close sidebar on pressing the sidebar item menu', () => {
sideNav.firstSidebarItem.moveToObject();
sideNav.firstSidebarItemMenu.waitForVisible(10000);
sideNav.firstSidebarItemMenu.click();
browser.pause(100);
mainContent.mainContent.getLocation().should.not.deep.equal({ x:0 });
sideNav.popoverOverlay.click();
});

it('it should open general channel', () => {
sideNav.openChannel('general');
});
Expand Down
4 changes: 4 additions & 0 deletions tests/pageobjects/side-nav.page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ class SideNav extends Page {

get sidebarWrap() { return browser.element('.sidebar-wrap'); }

get firstSidebarItem() { return browser.element('.sidebar-item'); }
get firstSidebarItemMenu() { return browser.element('.sidebar-item__menu'); }
get popoverOverlay() { return browser.element('.rc-popover.rc-popover--sidebar-item'); }

// Opens a channel via rooms list
openChannel(channelName) {
browser.waitForVisible(`.sidebar-item__ellipsis=${ channelName }`, 10000);
Expand Down