conflict resolved

2 files changed, 4 insertions, 1 deletions

diff --git a/spec/features/routes_spec.rb b/spec/features/routes_spec.rb
index 7be506b57..28015f011 100644
--- a/spec/features/routes_spec.rb
+++ b/spec/features/routes_spec.rb
@@ -37,6 +37,7 @@ describe "Routes", :type => :feature do
       click_link "Ajouter un itinéraire"
       fill_in "route_name", :with => "A to B"
       fill_in "route_published_name", :with => "Published A to B"
+      # select 'Aller', :from => "route_direction"
       check('route[wayback]')
       click_button("Valider")
       expect(page).to have_content("A to B")
diff --git a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
index 662c3d82f..23ebc3d9f 100644
--- a/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
+++ b/spec/javascripts/vehicle_journeys/reducers/vehicle_journeys_spec.js
@@ -111,7 +111,9 @@ describe('vehicleJourneys reducer', () => {
       time_tables: [],
       vehicle_journey_at_stops: pristineVjasList,
       selected: false,
-      deletable: false
+      deletable: false,
+      transport_mode: 'undefined',
+      transport_submode: 'undefined'
     }, ...state])
   })