Replace netex objectid support by codifligne objectid support for groupOfLine

5 files changed, 5 insertions, 9 deletions

diff --git a/app/models/chouette/group_of_line.rb b/app/models/chouette/group_of_line.rb
index 40758c390..a987d6311 100644
--- a/app/models/chouette/group_of_line.rb
+++ b/app/models/chouette/group_of_line.rb
@@ -1,5 +1,5 @@
 class Chouette::GroupOfLine < Chouette::ActiveRecord
-  include StifNetexAttributesSupport
+  include StifCodifligneAttributesSupport
   include GroupOfLineRestrictions
   include LineReferentialSupport
 
diff --git a/spec/factories/chouette_companies.rb b/spec/factories/chouette_companies.rb
index ecd3dcfc2..9272736cf 100644
--- a/spec/factories/chouette_companies.rb
+++ b/spec/factories/chouette_companies.rb
@@ -2,7 +2,7 @@ FactoryGirl.define do
 
   factory :company, :class => Chouette::Company do
     sequence(:name) { |n| "Company #{n}" }
-    sequence(:objectid) { |n| "chouette:Company:#{n}:loc" }
+    sequence(:objectid) { |n| "STIF:CODIFLIGNE:Company:#{n}" }
     sequence(:registration_number) { |n| "test-#{n}" }
 
     association :line_referential, :factory => :line_referential
diff --git a/spec/factories/chouette_group_of_lines.rb b/spec/factories/chouette_group_of_lines.rb
index 681898c6d..8b359fea5 100644
--- a/spec/factories/chouette_group_of_lines.rb
+++ b/spec/factories/chouette_group_of_lines.rb
@@ -2,7 +2,7 @@ FactoryGirl.define do
 
   factory  :group_of_line, :class => Chouette::GroupOfLine do
     sequence(:name) { |n| "Group Of Line #{n}" }
-    sequence(:objectid) { |n| "test:GroupOfLine:#{n}:loc" }
+    sequence(:objectid) { |n| "STIF:CODIFLIGNE:GroupOfLine:#{n}" }
     sequence(:registration_number) { |n| "#{n}" }
 
     association :line_referential
diff --git a/spec/factories/chouette_networks.rb b/spec/factories/chouette_networks.rb
index d127b1125..afeac9e28 100644
--- a/spec/factories/chouette_networks.rb
+++ b/spec/factories/chouette_networks.rb
@@ -2,7 +2,7 @@ FactoryGirl.define do
 
   factory :network, :class => Chouette::Network do
     sequence(:name) { |n| "Network #{n}" }
-    sequence(:objectid) { |n| "chouette:GroupOfLine:#{n}:loc" }
+    sequence(:objectid) { |n| "STIF:CODIFLIGNE:Network:#{n}" }
     sequence(:registration_number) { |n| "test-#{n}" }
 
     association :line_referential
diff --git a/spec/models/chouette/group_of_line_spec.rb b/spec/models/chouette/group_of_line_spec.rb
index d49329118..29b4433c5 100644
--- a/spec/models/chouette/group_of_line_spec.rb
+++ b/spec/models/chouette/group_of_line_spec.rb
@@ -3,11 +3,7 @@ require 'spec_helper'
 describe Chouette::GroupOfLine, :type => :model do
 
   subject { create(:group_of_line) }
-
-  it { is_expected.to validate_presence_of :name }
-
-  # it { should validate_presence_of :objectid }
-  it { is_expected.to validate_uniqueness_of :objectid }
+  it { should validate_presence_of :name }
 
   describe "#stop_areas" do
     let!(:line){create(:line, :group_of_lines => [subject])}