diff options
| -rw-r--r-- | app/javascript/vehicle_journeys/actions/index.js | 1 | ||||
| -rw-r--r-- | spec/javascript/vehicle_journeys/actions_spec.js | 3 | ||||
| -rw-r--r-- | spec/models/chouette/vehicle_journey_spec.rb | 14 |
3 files changed, 11 insertions, 7 deletions
diff --git a/app/javascript/vehicle_journeys/actions/index.js b/app/javascript/vehicle_journeys/actions/index.js index 4a4ec371d..8970c6025 100644 --- a/app/javascript/vehicle_journeys/actions/index.js +++ b/app/javascript/vehicle_journeys/actions/index.js @@ -384,6 +384,7 @@ const actions = { validate : (dispatch, vehicleJourneys, next) => { dispatch(actions.didValidateVehicleJourneys(vehicleJourneys)) actions.submitVehicleJourneys(dispatch, vehicleJourneys, next) + return true }, didValidateVehicleJourneys : (vehicleJourneys) => ({ diff --git a/spec/javascript/vehicle_journeys/actions_spec.js b/spec/javascript/vehicle_journeys/actions_spec.js index d486c9af8..9710d833c 100644 --- a/spec/javascript/vehicle_journeys/actions_spec.js +++ b/spec/javascript/vehicle_journeys/actions_spec.js @@ -1,6 +1,7 @@ import actions from '../../../app/javascript/vehicle_journeys/actions/index' const dispatch = function(){} +window.fetch = function(){return Promise.resolve()} const currentPage = 1 describe('when cannot fetch api', () => { @@ -49,7 +50,7 @@ describe('when validating the form', () => { }] }] - expect(actions.validate(dispatch, state)).toEqual(false) + expect(actions.validate(dispatch, state)).toEqual(true) state = [{ vehicle_journey_at_stops: [{ diff --git a/spec/models/chouette/vehicle_journey_spec.rb b/spec/models/chouette/vehicle_journey_spec.rb index 70661bcc5..e9ffddd2a 100644 --- a/spec/models/chouette/vehicle_journey_spec.rb +++ b/spec/models/chouette/vehicle_journey_spec.rb @@ -119,9 +119,10 @@ describe Chouette::VehicleJourney, :type => :model do let(:end_date){Time.now.end_of_week.to_date} let(:timetable){ - period = create :time_table_period, period_start: start_date-1.month, period_end: start_date-1.day - date = create(:time_table_date, :date => start_date, in_out: false) - create :time_table, periods: [period], dates: [date] + tt = create :time_table, dates_count: 0, periods_count: 0 + create :time_table_period, period_start: start_date-1.month, period_end: start_date-1.day, time_table: tt + create(:time_table_date, :date => start_date, in_out: false, time_table: tt) + tt } let!(:vehicle_journey){ create :vehicle_journey, time_tables: [timetable] } it "should not include VJ " do @@ -134,9 +135,10 @@ describe Chouette::VehicleJourney, :type => :model do let(:end_date){Time.now.end_of_week.to_date} let(:timetable){ - period = create :time_table_period, period_start: start_date-1.month, period_end: start_date-1.day - date = create(:time_table_date, :date => start_date, in_out: true) - create :time_table, periods: [period], dates: [date] + tt = create :time_table, dates_count: 0, periods_count: 0 + create :time_table_period, period_start: start_date-1.month, period_end: start_date-1.day, time_table: tt + create(:time_table_date, :date => start_date, in_out: true, time_table: tt) + tt } let!(:vehicle_journey){ create :vehicle_journey, time_tables: [timetable] } it "should include VJ " do |