diff options
27 files changed, 38 insertions, 33 deletions
diff --git a/app/models/journey_pattern_control/duplicates.rb b/app/models/journey_pattern_control/duplicates.rb index e988fbcc5..e06e6021b 100644 --- a/app/models/journey_pattern_control/duplicates.rb +++ b/app/models/journey_pattern_control/duplicates.rb @@ -1,6 +1,6 @@ module JourneyPatternControl class Duplicates < ComplianceControl - @@default_code = "3-JourneyPattern-1" + def self.default_code; "3-JourneyPattern-1" end end end diff --git a/app/models/journey_pattern_control/vehicle_journey.rb b/app/models/journey_pattern_control/vehicle_journey.rb index cf8bdf7e8..dfaf42beb 100644 --- a/app/models/journey_pattern_control/vehicle_journey.rb +++ b/app/models/journey_pattern_control/vehicle_journey.rb @@ -1,6 +1,6 @@ module JourneyPatternControl class VehicleJourney < ComplianceControl - @@default_code = "3-JourneyPattern-2" + def self.default_code; "3-JourneyPattern-2" end end end diff --git a/app/models/line_control/route.rb b/app/models/line_control/route.rb index f16cad8d4..aabd2f347 100644 --- a/app/models/line_control/route.rb +++ b/app/models/line_control/route.rb @@ -1,6 +1,6 @@ module LineControl class Route < ComplianceControl - @@default_code = "3-Line-1" + def self.default_code; "3-Line-1" end end end diff --git a/app/models/route_control/duplicates.rb b/app/models/route_control/duplicates.rb index b57b3241b..99e3b3aa8 100644 --- a/app/models/route_control/duplicates.rb +++ b/app/models/route_control/duplicates.rb @@ -1,6 +1,6 @@ module RouteControl class Duplicates < ComplianceControl - @@default_code = "3-Route-4" + def self.default_code; "3-Route-4" end end end diff --git a/app/models/route_control/journey_pattern.rb b/app/models/route_control/journey_pattern.rb index 0a26322e0..63cec2a41 100644 --- a/app/models/route_control/journey_pattern.rb +++ b/app/models/route_control/journey_pattern.rb @@ -1,6 +1,6 @@ module RouteControl class JourneyPattern < ComplianceControl - @@default_code = "3-Route-3" + def self.default_code; "3-Route-3" end end end diff --git a/app/models/route_control/minimum_length.rb b/app/models/route_control/minimum_length.rb index aec8c7a3f..56becfb2b 100644 --- a/app/models/route_control/minimum_length.rb +++ b/app/models/route_control/minimum_length.rb @@ -1,6 +1,6 @@ module RouteControl class MinimumLength < ComplianceControl - @@default_code = "3-Route-6" + def self.default_code; "3-Route-6" end end end diff --git a/app/models/route_control/omnibus_journey_pattern.rb b/app/models/route_control/omnibus_journey_pattern.rb index 8cc91e4e4..af3004ad7 100644 --- a/app/models/route_control/omnibus_journey_pattern.rb +++ b/app/models/route_control/omnibus_journey_pattern.rb @@ -1,6 +1,6 @@ module RouteControl class OmnibusJourneyPattern < ComplianceControl - @@default_code = "3-Route-9" + def self.default_code; "3-Route-9" end end end diff --git a/app/models/route_control/opposite_route.rb b/app/models/route_control/opposite_route.rb index 9a168cfc5..0148087ca 100644 --- a/app/models/route_control/opposite_route.rb +++ b/app/models/route_control/opposite_route.rb @@ -1,6 +1,6 @@ module RouteControl class OppositeRoute < ComplianceControl - @@default_code = "3-Route-2" + def self.default_code; "3-Route-2" end end end diff --git a/app/models/route_control/opposite_route_terminus.rb b/app/models/route_control/opposite_route_terminus.rb index c791ae385..e12690d48 100644 --- a/app/models/route_control/opposite_route_terminus.rb +++ b/app/models/route_control/opposite_route_terminus.rb @@ -1,6 +1,6 @@ module RouteControl class OppositeRouteTerminus < ComplianceControl - @@default_code = "3-Route-5" + def self.default_code; "3-Route-5" end end end diff --git a/app/models/route_control/speed.rb b/app/models/route_control/speed.rb index 593b103cc..d5798d153 100644 --- a/app/models/route_control/speed.rb +++ b/app/models/route_control/speed.rb @@ -3,6 +3,6 @@ module RouteControl hstore_accessor :control_attributes, minimum: :integer, maximum: :integer - @@default_code = "3-VehicleJourney-2" + def self.default_code; "3-VehicleJourney-2" end end end diff --git a/app/models/route_control/stop_points_in_journey_pattern.rb b/app/models/route_control/stop_points_in_journey_pattern.rb index 7b72a9b44..400bef5ef 100644 --- a/app/models/route_control/stop_points_in_journey_pattern.rb +++ b/app/models/route_control/stop_points_in_journey_pattern.rb @@ -1,6 +1,6 @@ module RouteControl class StopPointsInJourneyPattern < ComplianceControl - @@default_code = "3-Route-6" + def self.default_code; "3-Route-6" end end end diff --git a/app/models/route_control/time_table.rb b/app/models/route_control/time_table.rb index 132bd32bb..069cd0a9e 100644 --- a/app/models/route_control/time_table.rb +++ b/app/models/route_control/time_table.rb @@ -1,6 +1,6 @@ module RouteControl class TimeTable < ComplianceControl - @@default_code = "3-VehicleJourney-4" + def self.default_code; "3-VehicleJourney-4" end end end diff --git a/app/models/route_control/unactivated_stop_points.rb b/app/models/route_control/unactivated_stop_points.rb index 821fe03cb..a903fff53 100644 --- a/app/models/route_control/unactivated_stop_points.rb +++ b/app/models/route_control/unactivated_stop_points.rb @@ -1,6 +1,6 @@ module RouteControl class UnactivatedStopPoints < ComplianceControl - @@default_code = "3-Route-10" + def self.default_code; "3-Route-10" end end end diff --git a/app/models/route_control/vehicle_journey_at_stops.rb b/app/models/route_control/vehicle_journey_at_stops.rb index 5dd9d6b6d..7c376a2da 100644 --- a/app/models/route_control/vehicle_journey_at_stops.rb +++ b/app/models/route_control/vehicle_journey_at_stops.rb @@ -1,6 +1,6 @@ module RouteControl class VehicleJourneyAtStops < ComplianceControl - @@default_code = "3-VehicleJourney-5" + def self.default_code; "3-VehicleJourney-5" end end end diff --git a/app/models/route_control/zdl_stop_area.rb b/app/models/route_control/zdl_stop_area.rb index 49a5ad56f..2efd892df 100644 --- a/app/models/route_control/zdl_stop_area.rb +++ b/app/models/route_control/zdl_stop_area.rb @@ -1,6 +1,6 @@ module RouteControl class ZDLStopArea < ComplianceControl - @@default_code = "3-Route-1" + def self.default_code; "3-Route-1" end end end diff --git a/app/models/routing_constraint_zone_control/maximum_length.rb b/app/models/routing_constraint_zone_control/maximum_length.rb index 9822346e0..6b726e38c 100644 --- a/app/models/routing_constraint_zone_control/maximum_length.rb +++ b/app/models/routing_constraint_zone_control/maximum_length.rb @@ -1,6 +1,6 @@ module RoutingConstraintZoneControl class MaximumLength < ComplianceControl - @@default_code = "3-ITL-2" + def self.default_code; "3-ITL-2" end end end diff --git a/app/models/routing_constraint_zone_control/minimum_length.rb b/app/models/routing_constraint_zone_control/minimum_length.rb index 5873eba58..38f583bc5 100644 --- a/app/models/routing_constraint_zone_control/minimum_length.rb +++ b/app/models/routing_constraint_zone_control/minimum_length.rb @@ -1,6 +1,6 @@ module RoutingConstraintZoneControl class MinimumLength < ComplianceControl - @@default_code = "3-ITL-3" + def self.default_code; "3-ITL-3" end end end diff --git a/app/models/routing_constraint_zone_control/unactivated_stop_point.rb b/app/models/routing_constraint_zone_control/unactivated_stop_point.rb index c48690159..c03bb2324 100644 --- a/app/models/routing_constraint_zone_control/unactivated_stop_point.rb +++ b/app/models/routing_constraint_zone_control/unactivated_stop_point.rb @@ -1,6 +1,6 @@ module RoutingConstraintZoneControl class UnactivatedStopPoint < ComplianceControl - @@default_code = "3-ITL-1" + def self.default_code; "3-ITL-1" end end end diff --git a/app/models/vehicle_journey_control/delta.rb b/app/models/vehicle_journey_control/delta.rb index c90e05abd..797072fdd 100644 --- a/app/models/vehicle_journey_control/delta.rb +++ b/app/models/vehicle_journey_control/delta.rb @@ -3,6 +3,6 @@ module VehicleJourneyControl hstore_accessor :control_attributes, delta: :integer - @@default_code = "3-VehicleJourney-3" + def self.default_code; "3-VehicleJourney-3" end end end diff --git a/app/models/vehicle_journey_control/waiting_time.rb b/app/models/vehicle_journey_control/waiting_time.rb index 9f4192520..614f401bb 100644 --- a/app/models/vehicle_journey_control/waiting_time.rb +++ b/app/models/vehicle_journey_control/waiting_time.rb @@ -1,6 +1,6 @@ module VehicleJourneyControl - class WatingTime < ComplianceControl + class WaitingTime < ComplianceControl - @@default_code = "3-VehicleJourney-1" + def self.default_code; "3-VehicleJourney-1" end end end 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 } |