Merge branch 'master' of github.com:coralproject/talk into bugfix-e2e-permalink

This commit is contained in:
David Jay
2017-03-02 13:04:32 -05:00
44 changed files with 529 additions and 387 deletions
@@ -20,6 +20,10 @@ describe('coral-plugin-history/CommentHistory', () => {
'closedAt':null
};
comments.forEach((comment) => {
comment.asset = asset;
});
beforeEach(() => {
render = shallow(<CommentHistory comments={comments} asset={asset} link={()=>{}}/>);
});