mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2024-11-23 15:47:53 -05:00
Fix merge conflict.
This commit is contained in:
parent
a39244ea6c
commit
2f2e95f3e2
1 changed files with 12 additions and 1 deletions
|
@ -3,6 +3,7 @@ const {shallowWithIntl} = require('../../helpers/intl-helpers.jsx');
|
|||
import {mountWithIntl} from '../../helpers/intl-helpers.jsx';
|
||||
const ComposeComment = require('../../../src/views/preview/comment/compose-comment.jsx');
|
||||
import configureStore from 'redux-mock-store';
|
||||
const PropTypes = require('prop-types');
|
||||
|
||||
describe('Compose Comment test', () => {
|
||||
const mockStore = configureStore();
|
||||
|
@ -170,6 +171,16 @@ describe('Compose Comment test', () => {
|
|||
test('Mute Modal shows when muteOpen is true ', () => {
|
||||
const realDateNow = Date.now.bind(global.Date);
|
||||
global.Date.now = () => 0;
|
||||
const store = mockStore({
|
||||
session: {
|
||||
session: {
|
||||
user: {},
|
||||
permissions: {
|
||||
mute_status: {}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
const component = mountWithIntl(
|
||||
<ComposeComment
|
||||
{...defaultProps()}
|
||||
|
|
Loading…
Reference in a new issue