From 584bc2b59ecf95ee1021596e8f3583d9af97a5a7 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Sat, 14 Oct 2017 18:22:45 +0200
Subject: Fix translations for compliance_control type translation,
 compliance_control validation, compliance_control module

---
 spec/factories/compliance_controls/route_control_factories.rb     | 8 --------
 .../compliance_controls/vehicle_journey_control_factories.rb      | 8 ++++++++
 .../generic_attribute_control/pattern_cccld_spec.rb               | 4 ++--
 .../route_control/time_table_cccld_spec.rb                        | 7 -------
 .../route_control/vehicle_journey_at_stops_cccld_spec.rb          | 7 -------
 .../vehicle_journey_control/speed_cccld_spec.rb                   | 7 +++++++
 .../vehicle_journey_control/time_table_cccld_spec.rb              | 7 +++++++
 .../vehicle_journey_at_stops_cccld_spec.rb                        | 7 +++++++
 8 files changed, 31 insertions(+), 24 deletions(-)
 delete mode 100644 spec/models/compliance_control_class_level_defaults/route_control/time_table_cccld_spec.rb
 delete mode 100644 spec/models/compliance_control_class_level_defaults/route_control/vehicle_journey_at_stops_cccld_spec.rb
 create mode 100644 spec/models/compliance_control_class_level_defaults/vehicle_journey_control/speed_cccld_spec.rb
 create mode 100644 spec/models/compliance_control_class_level_defaults/vehicle_journey_control/time_table_cccld_spec.rb
 create mode 100644 spec/models/compliance_control_class_level_defaults/vehicle_journey_control/vehicle_journey_at_stops_cccld_spec.rb

(limited to 'spec')

diff --git a/spec/factories/compliance_controls/route_control_factories.rb b/spec/factories/compliance_controls/route_control_factories.rb
index 763a197ee..1462ca635 100644
--- a/spec/factories/compliance_controls/route_control_factories.rb
+++ b/spec/factories/compliance_controls/route_control_factories.rb
@@ -35,12 +35,4 @@ FactoryGirl.define do
   factory :route_control_zdl_stop_area, class: 'RouteControl::ZDLStopArea' do
     association :compliance_control_set
   end
-
-  factory :route_control_time_table, class: 'RouteControl::TimeTable' do
-    association :compliance_control_set
-  end
-
-  factory :route_control_control_vehicle_journey_at_stops, class: 'RouteControl::VehicleJourneyAtStops' do
-    association :compliance_control_set
-  end
 end
diff --git a/spec/factories/compliance_controls/vehicle_journey_control_factories.rb b/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
index 3775624db..b9da530fb 100644
--- a/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
+++ b/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
@@ -11,4 +11,12 @@ FactoryGirl.define do
   factory :vehicle_journey_control_speed, class: 'VehicleJourneyControl::Speed' do
     association :compliance_control_set
   end
+
+  factory :vehicle_journey_control_time_table, class: 'VehicleJourneyControl::TimeTable' do
+    association :compliance_control_set
+  end
+
+  factory :vehicle_journey_control_vehicle_journey_at_stops, class: 'VehicleJourneyControl::VehicleJourneyAtStops' do
+    association :compliance_control_set
+  end
 end
diff --git a/spec/models/compliance_control_class_level_defaults/generic_attribute_control/pattern_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/pattern_cccld_spec.rb
index 850cd1d76..9610cc796 100644
--- a/spec/models/compliance_control_class_level_defaults/generic_attribute_control/pattern_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/pattern_cccld_spec.rb
@@ -1,7 +1,7 @@
 
 RSpec.describe GenericAttributeControl::Pattern, type: :model do
-  let( :default_code ){ "3-Generic-3" }
+  let( :default_code ){ "3-Generic-1" }
   let( :factory ){ :generic_attribute_control_pattern }
 
-  it_behaves_like 'ComplianceControl Class Level Defaults' 
+  it_behaves_like 'ComplianceControl Class Level Defaults'
 end
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/time_table_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/time_table_cccld_spec.rb
deleted file mode 100644
index cbe14e4a7..000000000
--- a/spec/models/compliance_control_class_level_defaults/route_control/time_table_cccld_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-
-RSpec.describe RouteControl::TimeTable, type: :model do
-  let( :default_code ){ "3-VehicleJourney-4" }
-  let( :factory ){ :route_control_time_table }
-
-  it_behaves_like 'ComplianceControl Class Level Defaults' 
-end
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/vehicle_journey_at_stops_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/vehicle_journey_at_stops_cccld_spec.rb
deleted file mode 100644
index 1268dbc98..000000000
--- a/spec/models/compliance_control_class_level_defaults/route_control/vehicle_journey_at_stops_cccld_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-
-RSpec.describe RouteControl::VehicleJourneyAtStops, type: :model do
-  let( :default_code ){ "3-VehicleJourney-5" }
-  let( :factory ){ :route_control_control_vehicle_journey_at_stops }
-
-  it_behaves_like 'ComplianceControl Class Level Defaults' 
-end
diff --git a/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/speed_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/speed_cccld_spec.rb
new file mode 100644
index 000000000..2a3cae9ff
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/speed_cccld_spec.rb
@@ -0,0 +1,7 @@
+
+RSpec.describe VehicleJourneyControl::Speed, type: :model do
+  let( :default_code ){ "3-VehicleJourney-2" }
+  let( :factory ){ :vehicle_journey_control_speed }
+
+  it_behaves_like 'ComplianceControl Class Level Defaults'
+end
diff --git a/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/time_table_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/time_table_cccld_spec.rb
new file mode 100644
index 000000000..19dfe871d
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/time_table_cccld_spec.rb
@@ -0,0 +1,7 @@
+
+RSpec.describe VehicleJourneyControl::TimeTable, type: :model do
+  let( :default_code ){ "3-VehicleJourney-4" }
+  let( :factory ){ :vehicle_journey_control_time_table }
+
+  it_behaves_like 'ComplianceControl Class Level Defaults'
+end
diff --git a/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/vehicle_journey_at_stops_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/vehicle_journey_at_stops_cccld_spec.rb
new file mode 100644
index 000000000..30b5893d5
--- /dev/null
+++ b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/vehicle_journey_at_stops_cccld_spec.rb
@@ -0,0 +1,7 @@
+
+RSpec.describe VehicleJourneyControl::VehicleJourneyAtStops, type: :model do
+  let( :default_code ){ "3-VehicleJourney-5" }
+  let( :factory ){ :vehicle_journey_control_vehicle_journey_at_stops }
+
+  it_behaves_like 'ComplianceControl Class Level Defaults'
+end
-- 
cgit v1.2.3