diff --git a/test/unit/reducers/alerts-reducer.test.js b/test/unit/reducers/alerts-reducer.test.js index 21c1de0158cfee1ff54bb36398a7954daf4aba0f..98e431be8a7b93910862c174f38c1448e25aee24 100644 --- a/test/unit/reducers/alerts-reducer.test.js +++ b/test/unit/reducers/alerts-reducer.test.js @@ -43,13 +43,10 @@ test('add several standard alerts', () => { let resultState = alertsReducer(initialState, action); resultState = alertsReducer(resultState, action); resultState = alertsReducer(resultState, action); - expect(resultState.alertsList.length).toBe(4); - expect(resultState.alertsList[0].alertType).toBe(AlertTypes.INLINE); - expect(resultState.alertsList[0].iconURL).toBe('/no_image_here.jpg'); - expect(resultState.alertsList[1].alertType).toBe(AlertTypes.STANDARD); - expect(resultState.alertsList[1].alertId).toBe('creating'); - expect(resultState.alertsList[2].alertId).toBe('creating'); - expect(resultState.alertsList[3].alertId).toBe('creating'); + expect(resultState.alertsList.length).toBe(1); + expect(resultState.alertsList[0].alertType).toBe(AlertTypes.STANDARD); + expect(resultState.alertsList[0].iconURL).not.toBe('/no_image_here.jpg'); + expect(resultState.alertsList[0].alertId).toBe('creating'); }); test('create one inline alert message', () => { @@ -75,16 +72,15 @@ test('can close alerts by index', () => { } ] }; + const closeAction = closeAlert(0); + let resultState = alertsReducer(initialState, closeAction); + expect(resultState.alertsList.length).toBe(0); const createAction = showStandardAlert('creating'); - let resultState = alertsReducer(initialState, createAction); resultState = alertsReducer(resultState, createAction); + expect(resultState.alertsList.length).toBe(1); + resultState = alertsReducer(initialState, closeAction); + expect(resultState.alertsList.length).toBe(0); resultState = alertsReducer(resultState, createAction); - const closeAction = closeAlert(1); - resultState = alertsReducer(resultState, closeAction); - resultState = alertsReducer(resultState, closeAction); - expect(resultState.alertsList.length).toBe(2); - expect(resultState.alertsList[0].alertId).toBe('saving'); - expect(resultState.alertsList[1].alertId).toBe('creating'); }); test('related alerts can clear each other', () => { @@ -109,9 +105,8 @@ test('related alerts can clear each other', () => { }; const action = showStandardAlert('saveSuccess'); const resultState = alertsReducer(initialState, action); - expect(resultState.alertsList.length).toBe(2); - expect(resultState.alertsList[0].alertId).toBe('creating'); - expect(resultState.alertsList[1].alertId).toBe('saveSuccess'); + expect(resultState.alertsList.length).toBe(1); + expect(resultState.alertsList[0].alertId).toBe('saveSuccess'); }); test('several related alerts can be cleared at once', () => { diff --git a/test/unit/util/project-saver-hoc.test.jsx b/test/unit/util/project-saver-hoc.test.jsx index 40bf5efed9277de5fc828c8782524c3fb3290b37..4af09047c3bebdd8ae61374fec4dfdcd7d1154a6 100644 --- a/test/unit/util/project-saver-hoc.test.jsx +++ b/test/unit/util/project-saver-hoc.test.jsx @@ -288,7 +288,7 @@ describe('projectSaverHOC', () => { expect(mockedShowCreatingAlert).not.toHaveBeenCalled(); }); - test('if user manually saves, saving alert should show', () => { + test('if user saves, inline saving alert should show', () => { const mockedShowSavingAlert = jest.fn(); const Component = () => <div />; const WrappedComponent = projectSaverHOC(Component); @@ -313,29 +313,4 @@ describe('projectSaverHOC', () => { }); expect(mockedShowSavingAlert).toHaveBeenCalled(); }); - - test('if autosaving, saving alert should NOT show', () => { - const mockedShowSavingAlert = jest.fn(); - const Component = () => <div />; - const WrappedComponent = projectSaverHOC(Component); - const mounted = mount( - <WrappedComponent - canSave - isShowingWithoutId - canCreateNew={false} - isCreatingNew={false} - isManualUpdating={false} - isShowingWithId={false} - isUpdating={false} - loadingState={LoadingState.SHOWING_WITH_ID} - store={store} - vm={vm} - onShowSavingAlert={mockedShowSavingAlert} - /> - ); - mounted.setProps({ - isUpdating: true - }); - expect(mockedShowSavingAlert).not.toHaveBeenCalled(); - }); });