Refs #5407; Fix CI

4 files changed, 10 insertions, 8 deletions

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 f595dcf8d..5460878aa 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.integer :purchase_window_id
-      t.integer :vehicle_journey_id
+      t.integer :purchase_window_id, limit: 8
+      t.integer :vehicle_journey_id, limit: 8
     end
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 3b0e4772c..67c42f568 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -587,8 +587,8 @@ ActiveRecord::Schema.define(version: 20171227113809) do
   add_index "purchase_windows", ["referential_id"], name: "index_purchase_windows_on_referential_id", using: :btree
 
   create_table "purchase_windows_vehicle_journeys", id: false, force: :cascade do |t|
-    t.integer "purchase_window_id"
-    t.integer "vehicle_journey_id"
+    t.integer "purchase_window_id", limit: 8
+    t.integer "vehicle_journey_id", limit: 8
   end
 
   create_table "referential_clonings", id: :bigserial, force: :cascade do |t|
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index 585636124..a7fe0a162 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -44,6 +44,6 @@ Diff: #{diff}
   def diff
     RSpec::Support::Differ.new(
       color: RSpec::Matchers.configuration.color?
-    ).diff_as_string(@expected, @original)
+    ).diff_as_string(@original, @expected)
   end
 end
diff --git a/spec/javascript/vehicle_journeys/actions_spec.js b/spec/javascript/vehicle_journeys/actions_spec.js
index 683b64505..3af19ebc3 100644
--- a/spec/javascript/vehicle_journeys/actions_spec.js
+++ b/spec/javascript/vehicle_journeys/actions_spec.js
@@ -341,7 +341,7 @@ describe('when clicking on validate button inside purchase windows modal', () =>
       vehicleJourneys,
       purchase_windows
     }
-    expect(actions.editVehicleJourneyPurchaseWindows(vehicleJourneys, timetables)).toEqual(expectedAction)
+    expect(actions.editVehicleJourneyPurchaseWindows(vehicleJourneys, purchase_windows)).toEqual(expectedAction)
   })
 })
 describe('when clicking on add button inside purchase windows modal', () => {
@@ -357,14 +357,16 @@ describe('when using select2 to pick a purchase window', () => {
     let selectedTT = {
       id: 1,
       objectid: 2,
-      comment: 'test',
+      name: 'test',
+      color: 'color',
     }
     const expectedAction = {
       type: 'SELECT_PURCHASE_WINDOW_MODAL',
       selectedItem:{
         id: selectedTT.id,
         objectid: selectedTT.objectid,
-        comment: selectedTT.comment,
+        name: selectedTT.name,
+        color: "color"
       }
     }
     expect(actions.selectPurchaseWindowsModal(selectedTT)).toEqual(expectedAction)