Refs #6367; Add metadata to other versioned models

20 files changed, 25 insertions, 20 deletions

diff --git a/spec/controllers/routes_controller_spec.rb b/spec/controllers/routes_controller_spec.rb
index a001a942d..b7cb66b46 100644
--- a/spec/controllers/routes_controller_spec.rb
+++ b/spec/controllers/routes_controller_spec.rb
@@ -42,11 +42,14 @@ RSpec.describe RoutesController, type: :controller do
     before(:each) do
       post :create, line_id: route.line_id,
           referential_id: referential.id,
-          route: { name: "changed"}
+          route: { name: "changed", published_name: "published_name"}
 
     end
     it_behaves_like "line and referential linked"
     it_behaves_like "redirected to referential_line_path(referential,line)"
+    it "sets metadata" do
+      expect(Chouette::Route.last.metadata.creator_username).to eq @user.username
+    end
   end
 
   describe "PUT /update" do
@@ -58,6 +61,9 @@ RSpec.describe RoutesController, type: :controller do
 
     it_behaves_like "route, line and referential linked"
     it_behaves_like "redirected to referential_line_path(referential,line)"
+    it "sets metadata" do
+      expect(Chouette::Route.last.metadata.modifier_username).to eq @user.username
+    end
   end
 
   describe "GET /show" do
diff --git a/spec/models/api/v1/api_key_spec.rb b/spec/models/api/v1/api_key_spec.rb
index cc483a118..5c5a6bde1 100644
--- a/spec/models/api/v1/api_key_spec.rb
+++ b/spec/models/api/v1/api_key_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Api::V1::ApiKey, type: :model do
   subject { create(:api_key) }
 
   it { should validate_presence_of :organisation }
-  it { is_expected.to be_versioned }
+
 
   it 'should have a valid factory' do
     expect(build(:api_key)).to be_valid
diff --git a/spec/models/calendar_spec.rb b/spec/models/calendar_spec.rb
index 09ac0e416..e57eee3b2 100644
--- a/spec/models/calendar_spec.rb
+++ b/spec/models/calendar_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Calendar, :type => :model do
 
   it { is_expected.to validate_presence_of(:organisation) }
   it { is_expected.to validate_presence_of(:name) }
-  it { is_expected.to be_versioned }
+  
 
   describe '#to_time_table' do
     let(:calendar) { create(:calendar, int_day_types: Calendar::MONDAY | Calendar::SUNDAY, date_ranges: [Date.today...(Date.today + 1.month)]) }
diff --git a/spec/models/chouette/access_link_spec.rb b/spec/models/chouette/access_link_spec.rb
index ced99eb1d..448c22d33 100644
--- a/spec/models/chouette/access_link_spec.rb
+++ b/spec/models/chouette/access_link_spec.rb
@@ -4,7 +4,7 @@ describe Chouette::AccessLink, :type => :model do
   subject { create(:access_link) }
 
   it { is_expected.to validate_uniqueness_of :objectid }
-  it { is_expected.to be_versioned }
+  
 
    describe '#get_objectid' do
     subject { super().get_objectid }
diff --git a/spec/models/chouette/access_point_spec.rb b/spec/models/chouette/access_point_spec.rb
index 2184c6ec2..9c637cf41 100644
--- a/spec/models/chouette/access_point_spec.rb
+++ b/spec/models/chouette/access_point_spec.rb
@@ -12,7 +12,7 @@ describe Chouette::AccessPoint, :type => :model do
   it { is_expected.to validate_presence_of :name }
   it { is_expected.to validate_numericality_of :latitude }
   it { is_expected.to validate_numericality_of :longitude }
-  it { is_expected.to be_versioned }
+  
 
   describe ".latitude" do
     it "should accept -90 value" do
diff --git a/spec/models/chouette/company_spec.rb b/spec/models/chouette/company_spec.rb
index 34b19eeda..677c60dd9 100644
--- a/spec/models/chouette/company_spec.rb
+++ b/spec/models/chouette/company_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Chouette::Company, :type => :model do
   subject { create(:company) }
   it { should validate_presence_of :name }
-  it { is_expected.to be_versioned }
+  
 
   describe "#nullables empty" do
     it "should set null empty nullable attributes" do
diff --git a/spec/models/chouette/connection_link_spec.rb b/spec/models/chouette/connection_link_spec.rb
index 4ab67d007..4486e348c 100644
--- a/spec/models/chouette/connection_link_spec.rb
+++ b/spec/models/chouette/connection_link_spec.rb
@@ -8,7 +8,7 @@ describe Chouette::ConnectionLink, :type => :model do
   subject { create(:connection_link) }
 
   it { is_expected.to validate_uniqueness_of :objectid }
-  it { is_expected.to be_versioned }
+  
 
   describe '#get_objectid' do
     subject { super().get_objectid }
diff --git a/spec/models/chouette/group_of_line_spec.rb b/spec/models/chouette/group_of_line_spec.rb
index d43d75374..8b2df69e5 100644
--- a/spec/models/chouette/group_of_line_spec.rb
+++ b/spec/models/chouette/group_of_line_spec.rb
@@ -4,7 +4,7 @@ describe Chouette::GroupOfLine, :type => :model do
 
   subject { create(:group_of_line) }
   it { should validate_presence_of :name }
-  it { is_expected.to be_versioned }
+  
 
   describe "#stop_areas" do
     let!(:line){create(:line, :group_of_lines => [subject])}
diff --git a/spec/models/chouette/journey_pattern_spec.rb b/spec/models/chouette/journey_pattern_spec.rb
index dac45d6b5..078e3c1f1 100644
--- a/spec/models/chouette/journey_pattern_spec.rb
+++ b/spec/models/chouette/journey_pattern_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chouette::JourneyPattern, :type => :model do
-  it { is_expected.to be_versioned }
+  
   subject { create(:journey_pattern) }
 
   describe 'checksum' do
diff --git a/spec/models/chouette/line_spec.rb b/spec/models/chouette/line_spec.rb
index 056d5da9e..cd7cdcb09 100644
--- a/spec/models/chouette/line_spec.rb
+++ b/spec/models/chouette/line_spec.rb
@@ -7,7 +7,7 @@ describe Chouette::Line, :type => :model do
   # it { is_expected.to validate_presence_of :network }
   # it { is_expected.to validate_presence_of :company }
   it { should validate_presence_of :name }
-  it { is_expected.to be_versioned }
+  
 
   describe '#display_name' do
     it 'should display local_id, number, name and company name' do
diff --git a/spec/models/chouette/network_spec.rb b/spec/models/chouette/network_spec.rb
index 78a4150df..11ad7cacb 100644
--- a/spec/models/chouette/network_spec.rb
+++ b/spec/models/chouette/network_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Chouette::Network, :type => :model do
   subject { create(:network) }
   it { should validate_presence_of :name }
-  it { is_expected.to be_versioned }
+  
 
   describe "#stop_areas" do
     let!(:line){create(:line, :network => subject)}
diff --git a/spec/models/chouette/routing_constraint_zone_spec.rb b/spec/models/chouette/routing_constraint_zone_spec.rb
index bda6bb04a..321b41b7b 100644
--- a/spec/models/chouette/routing_constraint_zone_spec.rb
+++ b/spec/models/chouette/routing_constraint_zone_spec.rb
@@ -8,7 +8,7 @@ describe Chouette::RoutingConstraintZone, type: :model do
   it { is_expected.to validate_presence_of :route_id }
   # shoulda matcher to validate length of array ?
   xit { is_expected.to validate_length_of(:stop_point_ids).is_at_least(2) }
-  it { is_expected.to be_versioned }
+  
 
   describe 'checksum' do
     it_behaves_like 'checksum support'
diff --git a/spec/models/chouette/stop_area_spec.rb b/spec/models/chouette/stop_area_spec.rb
index e35300caf..185820388 100644
--- a/spec/models/chouette/stop_area_spec.rb
+++ b/spec/models/chouette/stop_area_spec.rb
@@ -13,7 +13,7 @@ describe Chouette::StopArea, :type => :model do
   it { should validate_presence_of :kind }
   it { should validate_numericality_of :latitude }
   it { should validate_numericality_of :longitude }
-  it { is_expected.to be_versioned }
+  
 
   describe "#area_type" do
     it "should validate the value is correct regarding to the kind" do
diff --git a/spec/models/chouette/stop_point_spec.rb b/spec/models/chouette/stop_point_spec.rb
index 6b9e7727f..ba3799619 100644
--- a/spec/models/chouette/stop_point_spec.rb
+++ b/spec/models/chouette/stop_point_spec.rb
@@ -4,7 +4,7 @@ describe Chouette::StopPoint, :type => :model do
 
   it { is_expected.to validate_uniqueness_of :objectid }
   it { is_expected.to validate_presence_of :stop_area }
-  it { is_expected.to be_versioned }
+  
 
   describe '#objectid' do
     subject { super().get_objectid }
diff --git a/spec/models/chouette/time_table_spec.rb b/spec/models/chouette/time_table_spec.rb
index bb88877b9..a3354facb 100644
--- a/spec/models/chouette/time_table_spec.rb
+++ b/spec/models/chouette/time_table_spec.rb
@@ -6,7 +6,7 @@ describe Chouette::TimeTable, :type => :model do
 
   it { is_expected.to validate_presence_of :comment }
   it { is_expected.to validate_uniqueness_of :objectid }
-  it { is_expected.to be_versioned }
+  
 
     def create_time_table_periode time_table, start_date, end_date
       create(:time_table_period, time_table: time_table, :period_start => start_date, :period_end => end_date)
diff --git a/spec/models/chouette/timeband_spec.rb b/spec/models/chouette/timeband_spec.rb
index b960c203f..fa7c8f06e 100644
--- a/spec/models/chouette/timeband_spec.rb
+++ b/spec/models/chouette/timeband_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chouette::Timeband, :type => :model do
-  it { is_expected.to be_versioned }
+  
 
   describe '#create' do
     context 'when valid' do
diff --git a/spec/models/chouette/vehicle_journey_spec.rb b/spec/models/chouette/vehicle_journey_spec.rb
index 41ac5d7d0..6d44eeb2f 100644
--- a/spec/models/chouette/vehicle_journey_spec.rb
+++ b/spec/models/chouette/vehicle_journey_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Chouette::VehicleJourney, :type => :model do
   subject { create(:vehicle_journey) }
 
-  it { is_expected.to be_versioned }
+  
   it { should have_and_belong_to_many(:purchase_windows) }
 
   it "must be valid with an at-stop day offset of 1" do
diff --git a/spec/models/compliance_check_set_spec.rb b/spec/models/compliance_check_set_spec.rb
index 61421287a..b6f854829 100644
--- a/spec/models/compliance_check_set_spec.rb
+++ b/spec/models/compliance_check_set_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe ComplianceCheckSet, type: :model do
 
   it { should have_many :compliance_checks }
   it { should have_many :compliance_check_blocks }
-  it { is_expected.to be_versioned }
+  
 
   describe "#update_status" do
     it "updates :status to successful when all resources are OK" do
diff --git a/spec/models/compliance_control_set_spec.rb b/spec/models/compliance_control_set_spec.rb
index c157dcaf3..a66e7f030 100644
--- a/spec/models/compliance_control_set_spec.rb
+++ b/spec/models/compliance_control_set_spec.rb
@@ -10,5 +10,5 @@ RSpec.describe ComplianceControlSet, type: :model do
   it { should have_many(:compliance_control_blocks).dependent(:destroy) }
 
   it { should validate_presence_of :name }
-  it { is_expected.to be_versioned }
+  
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index cde252236..947efd602 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -34,7 +34,6 @@ require 'webmock/rspec'
 require 'simplecov'
 require 'sidekiq/testing'
 Sidekiq::Testing.fake!
-require 'paper_trail/frameworks/rspec'
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are