Refs: #4267@1.5h; ComplianceControlClassLevelDefaults

        All implemented as class methods

7 files changed, 17 insertions, 12 deletions

diff --git a/spec/factories/compliance_controls/route_control_factories.rb b/spec/factories/compliance_controls/route_control_factories.rb
index cca36f22f..786565bac 100644
--- a/spec/factories/compliance_controls/route_control_factories.rb
+++ b/spec/factories/compliance_controls/route_control_factories.rb
@@ -1,5 +1,10 @@
 FactoryGirl.define do
 
+  factory :route_control_duplicates, class: 'RouteControl::Duplicates' do
+    association :compliance_control_set
+    association :compliance_control_block
+  end
+
   factory :route_control_journey_pattern, class: 'RouteControl::JourneyPattern' do
     association :compliance_control_set
     association :compliance_control_block
@@ -25,7 +30,7 @@ FactoryGirl.define do
     association :compliance_control_block
   end
 
-  factory :route_control_stop_point_in_journey_pattern, class: 'RouteControl::StopPointInJourneyPattern' do
+  factory :route_control_stop_points_in_journey_pattern, class: 'RouteControl::StopPointsInJourneyPattern' do
     association :compliance_control_set
     association :compliance_control_block
   end
@@ -35,22 +40,22 @@ FactoryGirl.define do
     association :compliance_control_block
   end
 
-  factory :route_control_zdl_stop_area, class: 'RouteControl::ZdlStopArea' do
+  factory :route_control_zdl_stop_area, class: 'RouteControl::ZDLStopArea' do
     association :compliance_control_set
     association :compliance_control_block
   end
 
-  factory :route_control_control_speed, class: 'RouteControl::ControlSpeed' do
+  factory :route_control_speed, class: 'RouteControl::Speed' do
     association :compliance_control_set
     association :compliance_control_block
   end
 
-  factory :route_control_control_time_table, class: 'RouteControl::ControlTimeTable' do
+  factory :route_control_time_table, class: 'RouteControl::TimeTable' do
     association :compliance_control_set
     association :compliance_control_block
   end
 
-  factory :route_control_control_vehicle_journey_at_stops, class: 'RouteControl::ControlVehicleJourneyAtStops' do
+  factory :route_control_control_vehicle_journey_at_stops, class: 'RouteControl::VehicleJourneyAtStops' do
     association :compliance_control_set
     association :compliance_control_block
   end
diff --git a/spec/factories/compliance_controls/vehicle_journey_control_factories.rb b/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
index dce4f25cc..72233d9a0 100644
--- a/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
+++ b/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
@@ -1,11 +1,11 @@
 FactoryGirl.define do
 
-  factory :vehicle_journey_control_wating_time, class: 'vehicleJourneyControl::WatingTime' do
+  factory :vehicle_journey_control_wating_time, class: 'VehicleJourneyControl::WaitingTime' do
     association :compliance_control_set
     association :compliance_control_block
   end
 
-  factory :vehicle_journey_control_delta, class: 'vehicleJourneyControl::Delta' do
+  factory :vehicle_journey_control_delta, class: 'VehicleJourneyControl::Delta' do
     association :compliance_control_set
     association :compliance_control_block
   end
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/speed_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/speed_cccld_spec.rb
index 7e6a21209..ad2b67960 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/speed_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/speed_cccld_spec.rb
@@ -1,7 +1,7 @@
 
 RSpec.describe RouteControl::Speed, type: :model do
   let( :default_code ){ "3-VehicleJourney-2" }
-  let( :factory ){ route_control_control_speed }
+  let( :factory ){ :route_control_speed }
 
   it_behaves_like 'ComplianceControl Class Level Defaults' 
 end
diff --git a/spec/models/compliance_control_class_level_defaults/route_control/stop_points_in_journey_pattern_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/stop_points_in_journey_pattern_cccld_spec.rb
index 17af1c8e5..62249243d 100644
--- a/spec/models/compliance_control_class_level_defaults/route_control/stop_points_in_journey_pattern_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/route_control/stop_points_in_journey_pattern_cccld_spec.rb
@@ -1,7 +1,7 @@
 
 RSpec.describe RouteControl::StopPointsInJourneyPattern, type: :model do
   let( :default_code ){ "3-Route-6" }
-  let( :factory ){ :route_control_stop_point_in_journey_pattern }
+  let( :factory ){ :route_control_stop_points_in_journey_pattern }
 
   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
index 63b45c04a..cbe14e4a7 100644
--- 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
@@ -1,7 +1,7 @@
 
 RSpec.describe RouteControl::TimeTable, type: :model do
   let( :default_code ){ "3-VehicleJourney-4" }
-  let( :factory ){ route_control_control_time_table }
+  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
index c563446a6..1268dbc98 100644
--- 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
@@ -1,7 +1,7 @@
 
 RSpec.describe RouteControl::VehicleJourneyAtStops, type: :model do
   let( :default_code ){ "3-VehicleJourney-5" }
-  let( :factory ){ route_control_control_vehicle_journey_at_stops }
+  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/waiting_time_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/waiting_time_cccld_spec.rb
index 584a8fb1b..34058ef33 100644
--- a/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/waiting_time_cccld_spec.rb
+++ b/spec/models/compliance_control_class_level_defaults/vehicle_journey_control/waiting_time_cccld_spec.rb
@@ -1,5 +1,5 @@
 
-RSpec.describe VehicleJourneyControl::WatingTime, type: :model do
+RSpec.describe VehicleJourneyControl::WaitingTime, type: :model do
   let( :default_code ){ "3-VehicleJourney-1" }
   let( :factory ){ :vehicle_journey_control_wating_time }