Replace netex objectid support by codifligne objectid support for network and company

4 files changed, 4 insertions, 14 deletions

diff --git a/app/models/chouette/company.rb b/app/models/chouette/company.rb
index c153a2d6b..a472020e1 100644
--- a/app/models/chouette/company.rb
+++ b/app/models/chouette/company.rb
@@ -1,6 +1,6 @@
 class Chouette::Company < Chouette::ActiveRecord
   include CompanyRestrictions
-  include StifNetexAttributesSupport
+  include StifCodifligneAttributesSupport
   include LineReferentialSupport
 
   has_many :lines
diff --git a/app/models/chouette/network.rb b/app/models/chouette/network.rb
index d710112f9..8df205789 100644
--- a/app/models/chouette/network.rb
+++ b/app/models/chouette/network.rb
@@ -1,5 +1,5 @@
 class Chouette::Network < Chouette::ActiveRecord
-  include StifNetexAttributesSupport
+  include StifCodifligneAttributesSupport
   include NetworkRestrictions
   include LineReferentialSupport
   # FIXME http://jira.codehaus.org/browse/JRUBY-6358
diff --git a/spec/models/chouette/company_spec.rb b/spec/models/chouette/company_spec.rb
index 3da8b4311..a3101d79c 100644
--- a/spec/models/chouette/company_spec.rb
+++ b/spec/models/chouette/company_spec.rb
@@ -1,13 +1,8 @@
 require 'spec_helper'
 
 describe Chouette::Company, :type => :model do
-
   subject { create(:company) }
-
-  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 "#nullables empty" do
     it "should set null empty nullable attributes" do
diff --git a/spec/models/chouette/network_spec.rb b/spec/models/chouette/network_spec.rb
index c9e510e84..32bacc512 100644
--- a/spec/models/chouette/network_spec.rb
+++ b/spec/models/chouette/network_spec.rb
@@ -1,13 +1,8 @@
 require 'spec_helper'
 
 describe Chouette::Network, :type => :model do
-
   subject { create(:network) }
-
-  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, :network => subject)}