Remove time gap over validation for vehiclejourneys

5 files changed, 33 insertions, 34 deletions

diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
index 56244e9a6..0183aac43 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
@@ -38,7 +38,6 @@ class BSelect4 extends React.Component{
               };
             },
             processResults: function(data, params) {
-              // console.log(data)
               return {
                 results: data.map(
                   item => _.assign(
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index bc2713973..64efa0761 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -27,7 +27,7 @@ module Chouette
       # Validation temporarily removed for day offsets
       # :vjas_departure_time_must_be_before_next_stop_arrival_time,
 
-      vehicle_journey_at_stops_are_in_increasing_time_order: true
+      vehicle_journey_at_stops_are_in_increasing_time_order: false
     validates_presence_of :number
 
     has_many :vehicle_journey_at_stops, -> { includes(:stop_point).order("stop_points.position") }, :dependent => :destroy
diff --git a/spec/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator_spec.rb b/spec/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator_spec.rb
index c30e0dbd8..d0a15788d 100644
--- a/spec/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator_spec.rb
+++ b/spec/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator_spec.rb
@@ -13,7 +13,7 @@ describe Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator do
         subject.vehicle_journey_at_stops[1].departure_time
     end
 
-    it "should make instance invalid if departure time exceeds gap" do
+    it "should make instance invalid if departure time exceeds gap", :skip => "Time gap validation is in pending status" do
       subject.validate
 
       expect(
@@ -31,7 +31,7 @@ describe Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator do
     let(:vjas2) { vehicle_journey.vehicle_journey_at_stops[1] }
 
     context "when vjas#arrival_time exceeds gap" do
-      it "should add errors on arrival_time" do
+      it "should add errors on arrival_time", :skip => "Time gap validation is in pending status" do
         vjas1.arrival_time = vjas2.arrival_time - 5.hour
         expect(
           Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator
@@ -43,7 +43,7 @@ describe Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator do
     end
 
     context "when vjas#departure_time exceeds gap" do
-      it "should add errors on departure_time" do
+      it "should add errors on departure_time", :skip => "Time gap validation is in pending status" do
         vjas1.departure_time = vjas2.departure_time - 5.hour
         expect(
           Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator
@@ -55,7 +55,7 @@ describe Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator do
     end
 
     context "when vjas doesn't exceed gap" do
-      it "should not add errors" do
+      it "should not add errors", :skip => "Time gap validation is in pending status" do
         expect(
           Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator
             .validate_at_stop_times_must_increase(vjas2, vjas1)
diff --git a/spec/models/chouette/vehicle_journey_spec.rb b/spec/models/chouette/vehicle_journey_spec.rb
index 645513735..3c04a77cc 100644
--- a/spec/models/chouette/vehicle_journey_spec.rb
+++ b/spec/models/chouette/vehicle_journey_spec.rb
@@ -558,18 +558,18 @@ describe Chouette::VehicleJourney, :type => :model do
             "0"=>{"id" => subject.vehicle_journey_at_stops[0].id ,"arrival_time" => 1.minutes.ago,"departure_time" => 1.minutes.ago},
             "1"=>{"id" => subject.vehicle_journey_at_stops[1].id, "arrival_time" => (1.minutes.ago + 4.hour),"departure_time" => (1.minutes.ago + 4.hour)}
          }}}
-      it "should return false" do
+      it "should return false", :skip => "Time gap validation is in pending status" do
         expect(subject.update_attributes(params)).to be_falsey
       end
-      it "should make instance invalid" do
+      it "should make instance invalid", :skip => "Time gap validation is in pending status" do
         subject.update_attributes(params)
         expect(subject).not_to be_valid
       end
-      it "should let first vjas without any errors" do
+      it "should let first vjas without any errors", :skip => "Time gap validation is in pending status" do
         subject.update_attributes(params)
         expect(subject.vehicle_journey_at_stops[0].errors).to be_empty
       end
-      it "should add an error on second vjas" do
+      it "should add an error on second vjas", :skip => "Time gap validation is in pending status" do
         subject.update_attributes(params)
         expect(subject.vehicle_journey_at_stops[1].errors[:departure_time]).not_to be_blank
       end
diff --git a/spec/models/vehicle_journey_import_spec.rb b/spec/models/vehicle_journey_import_spec.rb
index a743bdecb..b01523dd9 100644
--- a/spec/models/vehicle_journey_import_spec.rb
+++ b/spec/models/vehicle_journey_import_spec.rb
@@ -11,16 +11,16 @@ describe VehicleJourneyImport, :type => :model do
         if counter == 0
           row2 = []
           row.each do |cell|
-            cell = vehicle_journey1.id.to_s if cell == "import:VehicleJourney:1" 
-            cell = vehicle_journey2.id.to_s if cell == "import:VehicleJourney:2" 
-            cell = vehicle_journey3.id.to_s if cell == "import:VehicleJourney:3" 
+            cell = vehicle_journey1.id.to_s if cell == "import:VehicleJourney:1"
+            cell = vehicle_journey2.id.to_s if cell == "import:VehicleJourney:2"
+            cell = vehicle_journey3.id.to_s if cell == "import:VehicleJourney:3"
             row2 << cell
           end
           csv << row2
         elsif  counter < 8
           csv << row
         else
-          csv << ( row[0] = route.stop_points[counter - 8].id; row)          
+          csv << ( row[0] = route.stop_points[counter - 8].id; row)
         end
         counter += 1
       end
@@ -29,7 +29,7 @@ describe VehicleJourneyImport, :type => :model do
 
     File.open("/tmp/#{filename}")
   end
-  
+
   let!(:route) { create(:route) }
   let!(:other_route) { create(:route) }
 
@@ -39,14 +39,14 @@ describe VehicleJourneyImport, :type => :model do
   let!(:vehicle_journey1) { create(:vehicle_journey_common, :objectid => "import:VehicleJourney:1", :route_id => route.id, :journey_pattern_id => journey_pattern.id) }
   let!(:vehicle_journey2) { create(:vehicle_journey_common, :objectid => "import:VehicleJourney:2", :route_id => route.id, :journey_pattern_id => other_journey_pattern.id) }
   let!(:vehicle_journey3) { create(:vehicle_journey_common, :objectid => "import:VehicleJourney:3", :route_id => route.id, :journey_pattern_id => journey_pattern.id) }
-  
+
   let!(:stop_point0) { route.stop_points[0] }
   let!(:stop_point1) { route.stop_points[1] }
   let!(:stop_point2) { route.stop_points[2] }
   let!(:stop_point3) { route.stop_points[3] }
   let!(:stop_point4) { route.stop_points[4] }
 
-  
+
   # Must use uploaded file and not classical ruby File!
   let(:valid_file) {
     csv_file = update_csv_file_with_factory_data("vehicle_journey_imports_valid.csv")
@@ -67,8 +67,8 @@ describe VehicleJourneyImport, :type => :model do
     csv_file = update_csv_file_with_factory_data("vehicle_journey_imports_with_vjas_bad_order.csv")
     double("CSV", :tempfile => csv_file, :original_filename => File.basename(csv_file), :path => File.path(csv_file) )
   }
-  
-  subject { VehicleJourneyImport.new(:route => route, :file => valid_file) } 
+
+  subject { VehicleJourneyImport.new(:route => route, :file => valid_file) }
 
   describe ".save" do
 
@@ -86,33 +86,33 @@ describe VehicleJourneyImport, :type => :model do
       expect(Chouette::VehicleJourneyAtStop.all.size).to eq(17)
     end
 
-    it "should not import vehicle_journeys and not create objects when vehicle journey at stops are not in ascendant order" do      
+    it "should not import vehicle_journeys and not create objects when vehicle journey at stops are not in ascendant order", :skip => "Time gap validation is in pending status" do      
       expect(VehicleJourneyImport.new(:route => route, :file => invalid_file_on_vjas_object).save).to be_falsey
       expect(Chouette::VehicleJourney.all.size).to eq(3)
       expect(Chouette::VehicleJourneyAtStop.all.size).to eq(0)
     end
-    
+
     # it "should not import vehicle_journeys and not create objects with invalid file" do
     #   expect(VehicleJourneyImport.new(:file => invalid_file_on_vj, :route => route).save).to be_false
     #   expect(Chouette::VehicleJourney.all.size).to eq(3)
     #   expect(Chouette::VehicleJourneyAtStop.all.size).to eq(0)
     # end
-    
+
   end
 
-  describe ".find_journey_pattern_schedule" do   
+  describe ".find_journey_pattern_schedule" do
 
-    it "should return journey pattern with same stop points" do          
+    it "should return journey pattern with same stop points" do
       expect(subject.find_journey_pattern_schedule( 1, { stop_point0.id => "9:00", stop_point1.id => "9:05", stop_point2.id => "9:10", stop_point3.id => "9:15", stop_point4.id => "9:20"} )).to eq(journey_pattern)
       expect(subject.find_journey_pattern_schedule( 1, { stop_point1.id => "9:00", stop_point3.id => "9:10" } )).to eq(other_journey_pattern)
     end
 
-    it "should return new journey_pattern if no journey pattern with same stop points is founded" do      
+    it "should return new journey_pattern if no journey pattern with same stop points is founded" do
       expect(subject.find_journey_pattern_schedule( 1, { stop_point0.id => "9:00", stop_point1.id => "9:05", stop_point2.id => nil, stop_point3.id => "9:15", stop_point4.id => "9:20"} )).to be_truthy
       expect(subject.find_journey_pattern_schedule( 1, { stop_point0.id => "9:00", stop_point1.id => "9:05", stop_point2.id => nil, stop_point3.id => "9:15", stop_point4.id => "9:20"} ).id).not_to eq(journey_pattern.id)
       expect(subject.find_journey_pattern_schedule( 1, { stop_point0.id => "9:00", stop_point1.id => "9:05", stop_point2.id => nil, stop_point3.id => "9:15", stop_point4.id => "9:20"} ).id).not_to eq(other_journey_pattern.id)
     end
-    
+
   end
 
   describe ".load_imported_vehicle_journeys" do
@@ -122,30 +122,30 @@ describe VehicleJourneyImport, :type => :model do
       expect { vehicle_journey_import.load_imported_vehicle_journeys }.to raise_error(RuntimeError)
     end
 
-    # it "should return errors when vehicle journeys in file are invalid" do            
+    # it "should return errors when vehicle journeys in file are invalid" do
     #   vehicle_journey_import = VehicleJourneyImport.new(:route => route, :file => invalid_file_on_vj)
-      
+
     #   expect { vehicle_journey_import.load_imported_vehicle_journeys }.to raise_error
     # end
 
-    it "should return errors when vehicle journey at stops in file are invalid" do           
+    it "should return errors when vehicle journey at stops in file are invalid" do
       vehicle_journey_import = VehicleJourneyImport.new(:route => route, :file => invalid_file_on_vjas)
       expect { vehicle_journey_import.load_imported_vehicle_journeys }.to raise_error(ArgumentError)
     end
 
-    it "should return errors when vehicle journey at stops are not in ascendant order" do    
+    it "should return errors when vehicle journey at stops are not in ascendant order" do
       vehicle_journey_import = VehicleJourneyImport.new(:route => route, :file => invalid_file_on_vjas_object)
       expect(vehicle_journey_import.load_imported_vehicle_journeys.size).to eq(3)
       expect(vehicle_journey_import.errors.messages).to be_empty
     end
-    
+
     it "should load vehicle journeys" do
       expect(subject.load_imported_vehicle_journeys.size).to eq(4)
       expect(subject.errors.messages).to eq({})
     end
-    
+
   end
 
-  
-  
+
+
 end