Fix transport mode and submode modules

5 files changed, 9 insertions, 14 deletions

diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index 6f87a5d08..0139bb6a4 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -2,8 +2,8 @@ class Chouette::Line < Chouette::ActiveRecord
   include StifCodifligneAttributesSupport
   include LineRestrictions
   include LineReferentialSupport
-  include StifTransportModeEnumerations
-  include StifTransportSubmodeEnumerations
+  extend StifTransportModeEnumerations
+  extend StifTransportSubmodeEnumerations
 
   extend ActiveModel::Naming
 
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index f574afc93..e534d2bde 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -2,7 +2,7 @@ module Chouette
   class VehicleJourney < TridentActiveRecord
     include ChecksumSupport
     include VehicleJourneyRestrictions
-    include StifTransportModeEnumerations
+    extend StifTransportModeEnumerations
     # FIXME http://jira.codehaus.org/browse/JRUBY-6358
     self.primary_key = "id"
 
diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb
index 05952e9e2..1cb98b7de 100644
--- a/app/models/compliance_control_block.rb
+++ b/app/models/compliance_control_block.rb
@@ -1,4 +1,7 @@
 class ComplianceControlBlock < ActiveRecord::Base
+  extend StifTransportModeEnumerations
+  extend StifTransportSubmodeEnumerations
+
   belongs_to :compliance_control_set
   has_many :compliance_controls, dependent: :destroy
 
@@ -6,13 +9,5 @@ class ComplianceControlBlock < ActiveRecord::Base
     transport_mode: :string, 
     transport_submode: :string
 
-    validates_presence_of :transport_mode
-
-  def self.transport_modes
-    StifTransportModeEnumerations.transport_modes
-  end
-
-  def self.transport_submodes
-    StifTransportSubmodeEnumerations.transport_submodes
-  end
+  validates_presence_of :transport_mode
 end
diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb
index 7ab892b53..8bc6adec3 100644
--- a/app/models/line_referential.rb
+++ b/app/models/line_referential.rb
@@ -1,5 +1,5 @@
 class LineReferential < ActiveRecord::Base
-  include StifTransportModeEnumerations
+  extend StifTransportModeEnumerations
   
   has_many :line_referential_memberships
   has_many :organisations, through: :line_referential_memberships
diff --git a/spec/models/line_referential_spec.rb b/spec/models/line_referential_spec.rb
index 07725d9e6..c156a3d5c 100644
--- a/spec/models/line_referential_spec.rb
+++ b/spec/models/line_referential_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe LineReferential, :type => :model do
 
   describe "#transport_modes" do
     it 'returns a list of all transport modes' do
-      expect(FactoryGirl.create(:line_referential).transport_modes).to match_array(StifTransportModeEnumerations.transport_mode.options.map(&:first) )
+      expect(FactoryGirl.create(:line_referential).class.transport_modes).to match_array(StifTransportModeEnumerations.transport_mode.options.map(&:first) )
     end
   end
 end