Merge model from ninoxe gem

2 files changed, 7 insertions, 8 deletions

diff --git a/spec/models/chouette/vehicle_journey_at_stop_spec.rb b/spec/models/chouette/vehicle_journey_at_stop_spec.rb
index f771e8286..fbd544a28 100644
--- a/spec/models/chouette/vehicle_journey_at_stop_spec.rb
+++ b/spec/models/chouette/vehicle_journey_at_stop_spec.rb
@@ -7,14 +7,14 @@ describe Chouette::VehicleJourneyAtStop, :type => :model do
 
   describe "#exceeds_gap?" do
     it "should return false if gap < 1.hour" do
-      t1 = 1.minutes.ago
-      t2 = 1.minutes.ago + 4.hour
-      expect(subject.exceeds_gap?(t1, t2)).to be_truthy
+        t1 = Time.now
+        t2 = Time.now + 3.minutes
+        expect(subject.exceeds_gap?(t1, t2)).to be_falsey
     end
-    it "should return false if gap > 2.hour" do
-      t1 = 1.minutes.ago
-      t2 = 1.minutes.ago + 3.minutes
-      expect(subject.exceeds_gap?(t1, t2)).to be_falsey
+    it "should return true if gap > 4.hour" do
+      t1 = Time.now
+      t2 = Time.now + (4.hours + 1.minutes)
+      expect(subject.exceeds_gap?(t1, t2)).to be_truthy
     end
   end
 
diff --git a/spec/presenters/chouette/geometry/general_presenter.rb b/spec/presenters/chouette/geometry/general_presenter.rb
index 8b1378917..e69de29bb 100644
--- a/spec/presenters/chouette/geometry/general_presenter.rb
+++ b/spec/presenters/chouette/geometry/general_presenter.rb
@@ -1 +0,0 @@
-