Resolve merge conflicts

3 files changed, 27 insertions, 8 deletions

diff --git a/spec/javascripts/time_table/actions_spec.js b/spec/javascripts/time_table/actions_spec.js
index bd6f3b1aa..a7344586d 100644
--- a/spec/javascripts/time_table/actions_spec.js
+++ b/spec/javascripts/time_table/actions_spec.js
@@ -159,14 +159,16 @@ describe('actions', () => {
     let timeTablePeriods = []
     let metas = {}
     let timetableInDates = []
+    let error = ''
     const expectedAction = {
       type: 'VALIDATE_PERIOD_FORM',
       modalProps,
       timeTablePeriods,
       metas,
-      timetableInDates
+      timetableInDates,
+      error
     }
-    expect(actions.validatePeriodForm(modalProps, timeTablePeriods, metas, timetableInDates)).toEqual(expectedAction)
+    expect(actions.validatePeriodForm(modalProps, timeTablePeriods, metas, timetableInDates, error)).toEqual(expectedAction)
   })
 
   it('should create an action to add an included date', () => {
diff --git a/spec/javascripts/time_table/reducers/modal_spec.js b/spec/javascripts/time_table/reducers/modal_spec.js
index 9e8220a51..05d58a138 100644
--- a/spec/javascripts/time_table/reducers/modal_spec.js
+++ b/spec/javascripts/time_table/reducers/modal_spec.js
@@ -154,7 +154,7 @@ describe('modal reducer', () => {
       error: ''
     }
     let newModalProps = {
-      active: false,
+      active: true,
       begin: {
         day: '01',
         month: '01',
@@ -179,7 +179,8 @@ describe('modal reducer', () => {
         modalProps : modProps,
         timeTablePeriods: ttperiods,
         metas: metas,
-        timetableInDates: ttdates
+        timetableInDates: ttdates,
+        error: 'La date de départ doit être antérieure à la date de fin'
       })
     ).toEqual(Object.assign({}, state, {modalProps: newModalProps}))
   })
@@ -249,7 +250,8 @@ describe('modal reducer', () => {
         type: 'VALIDATE_PERIOD_FORM',
         modalProps : modProps2,
         timeTablePeriods: ttperiods2,
-        timetableInDates: ttdates2
+        timetableInDates: ttdates2,
+        error: "Les périodes ne peuvent pas se chevaucher"
       })
     ).toEqual(Object.assign({}, state2, {modalProps: newModalProps2}))
   })
@@ -275,7 +277,7 @@ describe('modal reducer', () => {
       type: ''
     }
     let modProps3 = {
-      active: false,
+      active: true,
       begin: {
         day: '01',
         month: '08',
@@ -318,7 +320,8 @@ describe('modal reducer', () => {
         modalProps : modProps3,
         timeTablePeriods: ttperiods3,
         timetableInDates: ttdates3,
-        metas: metas
+        metas: metas,
+        error: "Une période ne peut chevaucher une date dans un calendrier"
       })
     ).toEqual(Object.assign({}, state3, {modalProps: newModalProps3}))
   })
diff --git a/spec/javascripts/time_table/reducers/timetable_spec.js b/spec/javascripts/time_table/reducers/timetable_spec.js
index 515efa4c8..99dfa9c0d 100644
--- a/spec/javascripts/time_table/reducers/timetable_spec.js
+++ b/spec/javascripts/time_table/reducers/timetable_spec.js
@@ -225,6 +225,19 @@ describe('timetable reducer with filled state', () => {
     ).toEqual(newState)
   })
 
+  it('should handle UPDATE_DAY_TYPES and remove out_day that are out of day types', () => {
+    state.time_table_dates = [{date: "2017-05-01", in_out: false}]
+    let newArrDayTypes = arrDayTypes.slice(0)
+    newArrDayTypes[1] = false
+    let newState = Object.assign({}, state, {time_table_dates: []})
+    expect(
+      timetableReducer(state, {
+        type: 'UPDATE_DAY_TYPES',
+        dayTypes: newArrDayTypes
+      }).time_table_dates
+    ).toEqual([])
+  })
+
   it('should handle VALIDATE_PERIOD_FORM and add period if modalProps index = false', () => {
     let newPeriods = state.time_table_periods.concat({"period_start": "2018-05-15", "period_end": "2018-05-24"})
     let newState = Object.assign({}, state, {time_table_periods: newPeriods})
@@ -251,7 +264,8 @@ describe('timetable reducer with filled state', () => {
         metas: {
           day_types: arrDayTypes
         },
-        timetableInDates: state.time_table_dates.filter(d => d.in_out == true)
+        timetableInDates: state.time_table_dates.filter(d => d.in_out == true),
+        error: modalProps.error
       })
     ).toEqual(newState)
   })