mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2024-11-27 09:35:56 -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';
|
import {mountWithIntl} from '../../helpers/intl-helpers.jsx';
|
||||||
const ComposeComment = require('../../../src/views/preview/comment/compose-comment.jsx');
|
const ComposeComment = require('../../../src/views/preview/comment/compose-comment.jsx');
|
||||||
import configureStore from 'redux-mock-store';
|
import configureStore from 'redux-mock-store';
|
||||||
|
const PropTypes = require('prop-types');
|
||||||
|
|
||||||
describe('Compose Comment test', () => {
|
describe('Compose Comment test', () => {
|
||||||
const mockStore = configureStore();
|
const mockStore = configureStore();
|
||||||
|
@ -170,11 +171,21 @@ describe('Compose Comment test', () => {
|
||||||
test('Mute Modal shows when muteOpen is true ', () => {
|
test('Mute Modal shows when muteOpen is true ', () => {
|
||||||
const realDateNow = Date.now.bind(global.Date);
|
const realDateNow = Date.now.bind(global.Date);
|
||||||
global.Date.now = () => 0;
|
global.Date.now = () => 0;
|
||||||
|
const store = mockStore({
|
||||||
|
session: {
|
||||||
|
session: {
|
||||||
|
user: {},
|
||||||
|
permissions: {
|
||||||
|
mute_status: {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
const component = mountWithIntl(
|
const component = mountWithIntl(
|
||||||
<ComposeComment
|
<ComposeComment
|
||||||
{...defaultProps()}
|
{...defaultProps()}
|
||||||
/>
|
/>
|
||||||
, {context: {store}}
|
, {context: {store}}
|
||||||
);
|
);
|
||||||
// set state on the ComposeComment component, not the wrapper
|
// set state on the ComposeComment component, not the wrapper
|
||||||
const commentInstance = component.find('ComposeComment').instance();
|
const commentInstance = component.find('ComposeComment').instance();
|
||||||
|
|
Loading…
Reference in a new issue