PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Clean up some redundancy in the MessagePanel test

Browse source
This commit is contained in:
Richard van der Hoff 2016-03-31 17:01:11 +01:00
parent 73f7528d0f
commit 25b35a09b9
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
test/components/structures/MessagePanel-test.js
View file

@ -91,11 +91,13 @@ describe('MessagePanel', function () {
var tiles = TestUtils.scryRenderedComponentsWithType( var tiles = TestUtils.scryRenderedComponentsWithType(
mp, sdk.getComponent('rooms.EventTile')); mp, sdk.getComponent('rooms.EventTile'));
var tileContainers = tiles.map(function (t) {
return ReactDOM.findDOMNode(t).parentNode;
});
// find the <li> which wraps the read marker // find the <li> which wraps the read marker
var rm = TestUtils.findRenderedDOMComponentWithClass(mp, 'mx_RoomView_myReadMarker_container'); var rm = TestUtils.findRenderedDOMComponentWithClass(mp, 'mx_RoomView_myReadMarker_container');
var eventContainer = ReactDOM.findDOMNode(tiles[4]).parentNode; expect(rm.previousSibling).toEqual(tileContainers[4]);
expect(rm.previousSibling).toEqual(eventContainer);
// now move the RM // now move the RM
mp = ReactDOM.render( mp = ReactDOM.render(
@ -108,18 +110,11 @@ describe('MessagePanel', function () {
expect(found.length).toEqual(2); expect(found.length).toEqual(2);
// the first should be the ghost // the first should be the ghost
var ghost = found[0]; expect(found[0].previousSibling).toEqual(tileContainers[4]);
eventContainer = ReactDOM.findDOMNode(tiles[4]).parentNode; var hr = found[0].children[0];
expect(ghost.previousSibling).toEqual(eventContainer);
var hr = ghost.children[0];
// the first should be the ghost
eventContainer = ReactDOM.findDOMNode(tiles[4]).parentNode;
expect(found[0].previousSibling).toEqual(eventContainer);
// the second should be the real thing // the second should be the real thing
eventContainer = ReactDOM.findDOMNode(tiles[4]).parentNode; expect(found[1].previousSibling).toEqual(tileContainers[6]);
expect(ghost.previousSibling).toEqual(eventContainer);
// advance the clock, and then let the browser run an animation frame, // advance the clock, and then let the browser run an animation frame,
// to let the animation start // to let the animation start