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.

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

Bringing fork up to date #1

Merged
merged 21 commits into from
Mar 25, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d78337c
Added join/list public/private teams permissions (#2393)
jespino Mar 19, 2019
764c126
MM-12488: Adds groups search and filters. (#2461)
mkraft Mar 19, 2019
b0ad1fb
Remove period from OAuth apps description in Main Menu > Integrations…
jasonblais Mar 19, 2019
abf1cdd
[MM-14253] Modify Elasticsearch admin console messages to reference u…
mgdelacroix Mar 19, 2019
2ddd75a
MM-13634 Fix error message when drag and dropping folders (#2449)
jwilander Mar 19, 2019
be23c33
[MM-14356] Some strings in Channel Settings aren't localizable (#2484)
bradjcoughlin Mar 20, 2019
1796712
[MM-14571] Add e2e to test @mentions notifications (#2507)
thekiiingbob Mar 20, 2019
b696197
MM-14533 - Removing width for channel title (#2497)
asaadmahmood Mar 20, 2019
c55a82e
[MM-13482] Adds e2e tests to check timestamp on edited post (#10041) …
letsila Mar 20, 2019
3ed1e03
UI Automation: Write an automated test for Mobile using cypress. Dele…
d28park Mar 20, 2019
c071663
MM-14350: Fixes relative link under custom subpath. (#2511)
mkraft Mar 20, 2019
543c0cd
translations PR 20190318 (#2517)
enahum Mar 20, 2019
ee41ff2
MM-14500 Fix for pop caused by size_aware_image (#2469)
sudheerDev Mar 20, 2019
320995d
[MM-14491] avoid hiding the popover when the cursor is moved away fro…
kosgrz Mar 20, 2019
38b9bd9
add hide prop to profile popover from the at_mention component (#2506)
mickmister Mar 20, 2019
c426e3a
added marked commit that fixes formatted embedded link to italicize w…
saturninoabril Mar 21, 2019
3380271
MM-14358 - E2E Test for "Message Draft Pencil Icon visible in channel…
kelvintyb Mar 21, 2019
a242f14
Add (SAML|LDAP|Email) Login Button Color Configurations (#2502)
lieut-data Mar 21, 2019
4b3ada3
[MM-14375] Fix flaky test on collapsed specs and separated markdown s…
saturninoabril Mar 22, 2019
89e0e82
fix flaky tests on some account settings specs (#2530)
saturninoabril Mar 23, 2019
ff2190a
custom URL scheme upper case letters not working (#2309)
Hobby-Student Mar 23, 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
Prev Previous commit
Next Next commit
UI Automation: Write an automated test for Mobile using cypress. Dele…
…te a parent message that has a reply: Reply RHS (mattermost#2421)
  • Loading branch information
d28park authored and saturninoabril committed Mar 20, 2019
commit 3ed1e035e9fc87f3c04dd9cb605c253b5403340a
1 change: 1 addition & 0 deletions components/search_bar/search_bar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ export default class SearchBar extends React.Component {
<div className='sidebar-right__table'>
<div className='sidebar-collapse__container'>
<div
id='sidebarCollapse'
className='sidebar-collapse'
onClick={this.handleClose}
>
Expand Down
64 changes: 64 additions & 0 deletions cypress/integration/channel/mobile_message_deletion_spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.

import {getRandomInt} from '../../utils';

// ***************************************************************
// - [number] indicates a test step (e.g. 1. Go to a page)
// - [*] indicates an assertion (e.g. * Check the title)
// - Use element ID when selecting an element. Create one if none.
// ***************************************************************

/* eslint max-nested-callbacks: ["error", 4] */

describe('Delete Parent Message', () => {
before(() => {
// 1. Go to Main Channel View with "user-1"
cy.viewport('iphone-6');
cy.toMainChannelView('user-1');
});

it('M14270 Deleting parent message should also delete replies from center and RHS', () => {
// 2. Close Hamburger menu, post a message, and add replies
cy.get('#post_textbox').click({force: true});
cy.postMessage('Parent Message');

cy.getLastPostId().then((postId) => {
cy.clickPostCommentIcon(postId);

// * Check that the RHS is open
cy.get('#rhsContainer').should('be.visible');

// * Add replies (randomly between 1 to 3)
const replyCount = getRandomInt(2) + 1;
for (var i = 0; i < replyCount; i++) {
cy.get('#reply_textbox').type('Reply').type('{enter}');

// add wait time to ensure that a post gets posted and not on pending state
cy.wait(500); // eslint-disable-line
}

cy.getLastPostId().then((replyPostId) => {
// * No delete modal should be visible yet
cy.get('#deletePostModal').should('not.be.visible');

// 3.Close RHS view, open delete confirmation modal for the parent message from the center screen
cy.get('#sidebarCollapse').click();
cy.clickPostDotMenu(postId);
cy.get(`#delete_post_${postId}`).click();

// * Modal should now be visible and warning message should match the number of replies
cy.get('#deletePostModal').should('be.visible');
cy.get('#deletePostModal').contains(`${replyCount}`).should('be.visible');

// 4. Delete the parent message
cy.get('#deletePostModalButton').click({force: true});

// * Post is deleted from both center and RHS is not visible to the user who deleted it
cy.get('#rhsContainer').should('not.be.visible');
cy.get(`#post_${postId}`).should('not.be.visible');
cy.get(`#post_${replyPostId}`).should('not.be.visible');
});
});
});
});