Refs #5407; Fix CI

3 files changed, 4 insertions, 3 deletions

diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index 7d16d1c75..5d8153b0e 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -159,12 +159,12 @@ class VehicleJourneysController < ChouetteController
   end
 
   def user_permissions
+    @features = Hash[*current_organisation.features.map{|f| [f, true]}.flatten].to_json
     policy = policy(:vehicle_journey)
     @perms =
       %w{create destroy update}.inject({}) do | permissions, action |
         permissions.merge( "vehicle_journeys.#{action}" => policy.authorizes_action?(action) )
       end.to_json
-    @features = Hash[*current_organisation.features.map{|f| [f, true]}.flatten].to_json
   end
 
   private
diff --git a/db/migrate/20171227113809_create_join_table_purchase_windows_vehicle_journeys.rb b/db/migrate/20171227113809_create_join_table_purchase_windows_vehicle_journeys.rb
index 822fcc33a..1a87f7886 100644
--- a/db/migrate/20171227113809_create_join_table_purchase_windows_vehicle_journeys.rb
+++ b/db/migrate/20171227113809_create_join_table_purchase_windows_vehicle_journeys.rb
@@ -1,8 +1,8 @@
 class CreateJoinTablePurchaseWindowsVehicleJourneys < ActiveRecord::Migration
   def change
     create_join_table :purchase_windows, :vehicle_journeys do |t|
-      t.belongs_to :purchase_window
-      t.belongs_to :vehicle_journey
+      t.integer :purchase_window_id
+      t.integer :vehicle_journey_id
       # t.index [:purchase_window_id, :vehicle_journey_id]
       # t.index [:vehicle_journey_id, :purchase_window_id]
     end
diff --git a/spec/controllers/vehicle_journeys_controller_spec.rb b/spec/controllers/vehicle_journeys_controller_spec.rb
index c9356fffa..416450c21 100644
--- a/spec/controllers/vehicle_journeys_controller_spec.rb
+++ b/spec/controllers/vehicle_journeys_controller_spec.rb
@@ -10,6 +10,7 @@ RSpec.describe VehicleJourneysController, :type => :controller do
 
     before do
       allow(controller).to receive(:pundit_user).and_return(user_context)
+      allow(controller).to receive(:current_organisation).and_return(@user.organisation)
     end
 
     it 'computes them correctly if not authorized' do