[web] fix stopEdit

This commit is contained in:
Maximilian Hils 2017-06-12 12:57:37 +02:00
parent 49a04e37c3
commit c1ba6b6c21
3 changed files with 12 additions and 8 deletions

View File

@ -6,6 +6,7 @@ import { Provider } from 'react-redux'
import { startEdit, stopEdit } from '../../../ducks/ui/flow'
import { TFlow, TStore } from '../../ducks/tutils'
global.fetch = jest.fn()
let tflow = new TFlow()
describe('ToggleEdit Component', () => {
@ -24,7 +25,7 @@ describe('ToggleEdit Component', () => {
it('should handle click on stopEdit', () => {
tree.children[0].props.onClick()
expect(store.getActions()).toEqual([stopEdit(tflow, true)])
expect(fetch).toBeCalled()
})
it('should handle click on startEdit', () => {

View File

@ -11,7 +11,7 @@ import reducer, {
displayLarge
} from '../../../ducks/ui/flow'
import { select, updateFlow } from '../../../ducks/flows'
import * as flowActions from '../../../ducks/flows'
describe('flow reducer', () => {
it('should return initial state', () => {
@ -61,11 +61,11 @@ describe('flow reducer', () => {
})
it('should not change the contentview mode', () => {
expect(reducer({contentView: 'foo'}, select(1)).contentView).toEqual('foo')
expect(reducer({contentView: 'foo'}, flowActions.select(1)).contentView).toEqual('foo')
})
it('should change the contentview mode to auto after editing when a new flow will be selected', () => {
expect(reducer({contentView: 'foo', modifiedFlow : 'test_flow'}, select(1)).contentView).toEqual('Auto')
expect(reducer({contentView: 'foo', modifiedFlow : 'test_flow'}, flowActions.select(1)).contentView).toEqual('Auto')
})
it('should set update and merge the modifiedflow with the update values', () => {
@ -84,7 +84,11 @@ describe('flow reducer', () => {
it('should stop editing when the selected flow is updated', () => {
let modifiedFlow = {id: 1}
let updatedFlow = {id: 1}
expect(reducer({modifiedFlow}, stopEdit(updatedFlow, modifiedFlow)).modifiedFlow).toBeFalsy()
expect(reducer(
{ modifiedFlow },
{type: flowActions.UPDATE, data: modifiedFlow}
).modifiedFlow
).toBeFalsy()
})
it('should set content view', () => {

View File

@ -148,7 +148,6 @@ export function setContent(content){
return { type: SET_CONTENT, content }
}
export function stopEdit(data, modifiedFlow) {
let diff = getDiff(data, modifiedFlow)
return {type: flowsActions.UPDATE, data, diff }
export function stopEdit(flow, modifiedFlow) {
return flowsActions.update(flow, getDiff(flow, modifiedFlow))
}