vehicle_journey_spec.rb: Simplify factory call

Simplify the "orders journeys with nil times at the end" test. Instead
of manually initialising our data, create a special factory for the
empty vehicle journey that we need. This allows us to get rid of the
nonsense in the test setup.

The existing `:vehicle_journey` factory still works the same as before.

Refs #3268

2 files changed, 17 insertions, 21 deletions

diff --git a/spec/factories/chouette_vehicle_journey.rb b/spec/factories/chouette_vehicle_journey.rb
index b7c5e37d5..9ba660800 100644
--- a/spec/factories/chouette_vehicle_journey.rb
+++ b/spec/factories/chouette_vehicle_journey.rb
@@ -3,29 +3,31 @@ FactoryGirl.define do
   factory :vehicle_journey_common, :class => Chouette::VehicleJourney do
     sequence(:objectid) { |n| "test:VehicleJourney:#{n}" }
 
-    factory :vehicle_journey do
+    factory :vehicle_journey_empty do
       association :journey_pattern, :factory => :journey_pattern
 
       after(:build) do |vehicle_journey|
         vehicle_journey.route = vehicle_journey.journey_pattern.route
       end
 
-      after(:create) do |vehicle_journey|
-        vehicle_journey.journey_pattern.stop_points.each_with_index do |stop_point, index|
-          vehicle_journey.vehicle_journey_at_stops << create(:vehicle_journey_at_stop,
-                 :vehicle_journey => vehicle_journey,
-                 :stop_point      => stop_point,
-                 :arrival_time    => '2000-01-01 01:00:00 UTC',
-                 :departure_time  => '2000-01-01 03:00:00 UTC')
+      factory :vehicle_journey do
+        after(:create) do |vehicle_journey|
+          vehicle_journey.journey_pattern.stop_points.each_with_index do |stop_point, index|
+            vehicle_journey.vehicle_journey_at_stops << create(:vehicle_journey_at_stop,
+                   :vehicle_journey => vehicle_journey,
+                   :stop_point      => stop_point,
+                   :arrival_time    => '2000-01-01 01:00:00 UTC',
+                   :departure_time  => '2000-01-01 03:00:00 UTC')
+          end
         end
-      end
 
-      factory :vehicle_journey_odd do
-        association :journey_pattern, :factory => :journey_pattern_odd
-      end
+        factory :vehicle_journey_odd do
+          association :journey_pattern, :factory => :journey_pattern_odd
+        end
 
-      factory :vehicle_journey_even do
-        association :journey_pattern, :factory => :journey_pattern_even
+        factory :vehicle_journey_even do
+          association :journey_pattern, :factory => :journey_pattern_even
+        end
       end
     end
   end
diff --git a/spec/models/chouette/vehicle_journey_spec.rb b/spec/models/chouette/vehicle_journey_spec.rb
index e537721af..9a1a55a02 100644
--- a/spec/models/chouette/vehicle_journey_spec.rb
+++ b/spec/models/chouette/vehicle_journey_spec.rb
@@ -262,13 +262,7 @@ describe Chouette::VehicleJourney, :type => :model do
     end
 
     it "orders journeys with nil times at the end" do
-      pattern = create(:journey_pattern)
-      journey_nil = build(
-        :vehicle_journey_common,
-        journey_pattern: pattern
-      )
-      journey_nil.route = journey_nil.journey_pattern.route
-      journey_nil.save
+      journey_nil = create(:vehicle_journey_empty)
       journey = create(
         :vehicle_journey,
         route: journey_nil.route,