OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

unbreak tests

pull/21833/head
Matthew Hodgson 2016-09-07 21:10:31 +01:00
parent 8f75bce29e
commit 334564c814
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/structures/TimelinePanel.js
View File

@ -92,7 +92,7 @@ var TimelinePanel = React.createClass({
timelineCap: React.PropTypes.number,
// classname to use for the messagepanel
className: React.PropTypes.string.isRequired,
className: React.PropTypes.string,
},
statics: {
@ -106,6 +106,7 @@ var TimelinePanel = React.createClass({
getDefaultProps: function() {
return {
timelineCap: 250,
className: 'mx_RoomView_messagePanel',
};
},

2
test/components/structures/TimelinePanel-test.js
View File

@ -61,10 +61,10 @@ describe('TimelinePanel', function() {
timeline = new jssdk.EventTimeline(ROOM_ID);
room = sinon.createStubInstance(jssdk.Room);
room.getPendingEvents.returns([]);
timelineSet = sinon.createStubInstance(jssdk.EventTimelineSet);
timelineSet.getLiveTimeline.returns(timeline);
timelineSet.getPendingEvents.returns([]);
timelineSet.room = room;
client = peg.get();