From c4a2730dd1aa493989ceea7c162f39f2da73267b Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 2 Oct 2017 15:41:55 +0200 Subject: Refs: #4267@1.5h; ComplianceControlClassLevelDefaults - Working on factories - Scaffolding out specs - Fixing typos in dir struct and class names for routing_constraint_zone_control --- .../maximum_length.rb | 6 ----- .../minimum_length.rb | 6 ----- .../unactivated_stop_point.rb | 6 ----- .../maximum_length.rb | 6 +++++ .../minimum_length.rb | 6 +++++ .../unactivated_stop_point.rb | 6 +++++ spec/factories/compliance_controls.rb | 30 --------------------- .../compliance_controls/generic_factories.rb | 31 ++++++++++++++++++++++ .../journey_pattern_control_factories.rb | 6 +++++ .../min_max_cccld_spec.rb | 7 +++++ .../min_max_spec_cccld.rb | 7 ----- .../pattern_cccld_spec.rb | 4 +-- .../uniqueness_cccld_spec.rb | 5 ++-- .../duplicates_cccld_spec.rb | 7 +++++ .../vehicle_journey_cccld_spec.rb | 7 +++++ .../line_control/route_cccld_spec.rb | 7 +++++ .../route_control/duplicates_cccld_spec.rb | 7 +++++ .../route_control/journey_pattern_cccld_spec.rb | 7 +++++ .../route_control/minimum_length_cccld_spec.rb | 7 +++++ .../omnibus_journey_pattern_cccld_spec.rb | 7 +++++ .../route_control/opposite_route_cccld_spec.rb | 7 +++++ .../opposite_route_terminus_cccld_spec.rb | 7 +++++ .../route_control/speed_cccld_spec.rb | 7 +++++ .../stop_points_in_journey_pattern_cccld_spec.rb | 7 +++++ .../route_control/time_table_cccld_spec.rb | 7 +++++ .../unactivated_stop_points_cccld_spec.rb | 7 +++++ .../vehicle_journey_at_stops_cccld_spec.rb | 7 +++++ .../route_control/zdl_stop_area_cccld_spec.rb | 7 +++++ 28 files changed, 172 insertions(+), 59 deletions(-) delete mode 100644 app/models/routing_constaint_zone_control/maximum_length.rb delete mode 100644 app/models/routing_constaint_zone_control/minimum_length.rb delete mode 100644 app/models/routing_constaint_zone_control/unactivated_stop_point.rb create mode 100644 app/models/routing_constraint_zone_control/maximum_length.rb create mode 100644 app/models/routing_constraint_zone_control/minimum_length.rb create mode 100644 app/models/routing_constraint_zone_control/unactivated_stop_point.rb create mode 100644 spec/factories/compliance_controls/generic_factories.rb create mode 100644 spec/factories/compliance_controls/journey_pattern_control_factories.rb create mode 100644 spec/models/compliance_control_class_level_defaults/generic_attribute_control/min_max_cccld_spec.rb delete mode 100644 spec/models/compliance_control_class_level_defaults/generic_attribute_control/min_max_spec_cccld.rb diff --git a/app/models/routing_constaint_zone_control/maximum_length.rb b/app/models/routing_constaint_zone_control/maximum_length.rb deleted file mode 100644 index cb04c6806..000000000 --- a/app/models/routing_constaint_zone_control/maximum_length.rb +++ /dev/null @@ -1,6 +0,0 @@ -module RoutingConstaintZoneControl - class MaximumLength < ComplianceControl - - @@default_code = "3-ITL-2" - end -end diff --git a/app/models/routing_constaint_zone_control/minimum_length.rb b/app/models/routing_constaint_zone_control/minimum_length.rb deleted file mode 100644 index 7b510131b..000000000 --- a/app/models/routing_constaint_zone_control/minimum_length.rb +++ /dev/null @@ -1,6 +0,0 @@ -module RoutingConstaintZoneControl - class MinimumLength < ComplianceControl - - @@default_code = "3-ITL-3" - end -end diff --git a/app/models/routing_constaint_zone_control/unactivated_stop_point.rb b/app/models/routing_constaint_zone_control/unactivated_stop_point.rb deleted file mode 100644 index 6efa384a2..000000000 --- a/app/models/routing_constaint_zone_control/unactivated_stop_point.rb +++ /dev/null @@ -1,6 +0,0 @@ -module RoutingConstaintZoneControl - class UnactivatedStopPoint < ComplianceControl - - @@default_code = "3-ITL-1" - end -end diff --git a/app/models/routing_constraint_zone_control/maximum_length.rb b/app/models/routing_constraint_zone_control/maximum_length.rb new file mode 100644 index 000000000..9822346e0 --- /dev/null +++ b/app/models/routing_constraint_zone_control/maximum_length.rb @@ -0,0 +1,6 @@ +module RoutingConstraintZoneControl + class MaximumLength < ComplianceControl + + @@default_code = "3-ITL-2" + end +end diff --git a/app/models/routing_constraint_zone_control/minimum_length.rb b/app/models/routing_constraint_zone_control/minimum_length.rb new file mode 100644 index 000000000..5873eba58 --- /dev/null +++ b/app/models/routing_constraint_zone_control/minimum_length.rb @@ -0,0 +1,6 @@ +module RoutingConstraintZoneControl + class MinimumLength < ComplianceControl + + @@default_code = "3-ITL-3" + 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 new file mode 100644 index 000000000..c48690159 --- /dev/null +++ b/app/models/routing_constraint_zone_control/unactivated_stop_point.rb @@ -0,0 +1,6 @@ +module RoutingConstraintZoneControl + class UnactivatedStopPoint < ComplianceControl + + @@default_code = "3-ITL-1" + end +end diff --git a/spec/factories/compliance_controls.rb b/spec/factories/compliance_controls.rb index b01e49011..e69de29bb 100644 --- a/spec/factories/compliance_controls.rb +++ b/spec/factories/compliance_controls.rb @@ -1,30 +0,0 @@ -FactoryGirl.define do - factory :compliance_control do - sequence(:name) { |n| "Compliance control #{n}" } - type "GenericAttributeControl::MinMax" - criticity :warning - code "code" - origin_code "code" - comment "Text" - association :compliance_control_set - association :compliance_control_block - end - - factory :min_max, class: 'GenericAttributeControl::MinMax' do - sequence(:name) { |n| "MinMax control #{n}" } - association :compliance_control_set - association :compliance_control_block - end - - factory :pattern, class: 'GenericAttributeControl::Pattern' do - sequence(:name) { |n| "Pattern control #{n}" } - association :compliance_control_set - association :compliance_control_block - end - - factory :uniqueness, class: 'GenericAttributeControl::Uniqueness' do - sequence(:name) { |n| "Uniqueness control #{n}" } - association :compliance_control_set - association :compliance_control_block - end -end diff --git a/spec/factories/compliance_controls/generic_factories.rb b/spec/factories/compliance_controls/generic_factories.rb new file mode 100644 index 000000000..175331a3a --- /dev/null +++ b/spec/factories/compliance_controls/generic_factories.rb @@ -0,0 +1,31 @@ + +FactoryGirl.define do + factory :compliance_control do + sequence(:name) { |n| "Compliance control #{n}" } + type "GenericAttributeControl::MinMax" + criticity :warning + code "code" + origin_code "code" + comment "Text" + association :compliance_control_set + association :compliance_control_block + end + + factory :min_max, class: 'GenericAttributeControl::MinMax' do + sequence(:name) { |n| "MinMax control #{n}" } + association :compliance_control_set + association :compliance_control_block + end + + factory :pattern, class: 'GenericAttributeControl::Pattern' do + sequence(:name) { |n| "Pattern control #{n}" } + association :compliance_control_set + association :compliance_control_block + end + + factory :uniqueness, class: 'GenericAttributeControl::Uniqueness' do + sequence(:name) { |n| "Uniqueness control #{n}" } + association :compliance_control_set + association :compliance_control_block + end +end diff --git a/spec/factories/compliance_controls/journey_pattern_control_factories.rb b/spec/factories/compliance_controls/journey_pattern_control_factories.rb new file mode 100644 index 000000000..55f171ae7 --- /dev/null +++ b/spec/factories/compliance_controls/journey_pattern_control_factories.rb @@ -0,0 +1,6 @@ + +FactoryGirl.define do + + factory :journey_pattern_control_duplicates, class: 'JourneyPatternControl::Duplicates' + +end diff --git a/spec/models/compliance_control_class_level_defaults/generic_attribute_control/min_max_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/min_max_cccld_spec.rb new file mode 100644 index 000000000..e39e5e4c0 --- /dev/null +++ b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/min_max_cccld_spec.rb @@ -0,0 +1,7 @@ + +RSpec.describe GenericAttributeControl::MinMax, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :generic_attribute_control_min_max } + + it_behaves_like 'ComplianceControl Class Level Defaults' +end diff --git a/spec/models/compliance_control_class_level_defaults/generic_attribute_control/min_max_spec_cccld.rb b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/min_max_spec_cccld.rb deleted file mode 100644 index 0f020db89..000000000 --- a/spec/models/compliance_control_class_level_defaults/generic_attribute_control/min_max_spec_cccld.rb +++ /dev/null @@ -1,7 +0,0 @@ - -RSpec.describe GenericAttributeControl::MinMax, type: :model do - let( :default_code ){ "3-Generic-2" } - let( :factory ){ :min_max } - - it_behaves_like 'ComplianceControl Class Level Defaults' -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 db2ded2a9..643f65f30 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( :factory ){ :pattern } + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :generic_attribute_control_pattern } it_behaves_like 'ComplianceControl Class Level Defaults' end diff --git a/spec/models/compliance_control_class_level_defaults/generic_attribute_control/uniqueness_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/uniqueness_cccld_spec.rb index e81ad26cd..fac405285 100644 --- a/spec/models/compliance_control_class_level_defaults/generic_attribute_control/uniqueness_cccld_spec.rb +++ b/spec/models/compliance_control_class_level_defaults/generic_attribute_control/uniqueness_cccld_spec.rb @@ -1,6 +1,7 @@ + RSpec.describe GenericAttributeControl::Uniqueness, type: :model do - let( :default_code ){ "3-Generic-3" } - let( :factory ){ :uniqueness } + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :generic_attribute_control_uniqueness } it_behaves_like 'ComplianceControl Class Level Defaults' end diff --git a/spec/models/compliance_control_class_level_defaults/journey_pattern_control/duplicates_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/journey_pattern_control/duplicates_cccld_spec.rb index e69de29bb..46210354e 100644 --- a/spec/models/compliance_control_class_level_defaults/journey_pattern_control/duplicates_cccld_spec.rb +++ b/spec/models/compliance_control_class_level_defaults/journey_pattern_control/duplicates_cccld_spec.rb @@ -0,0 +1,7 @@ + +RSpec.describe JourneyPatternControl::Duplicates, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :journey_pattern_control_duplicates } + + it_behaves_like 'ComplianceControl Class Level Defaults' +end diff --git a/spec/models/compliance_control_class_level_defaults/journey_pattern_control/vehicle_journey_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/journey_pattern_control/vehicle_journey_cccld_spec.rb index e69de29bb..52ac8af8f 100644 --- a/spec/models/compliance_control_class_level_defaults/journey_pattern_control/vehicle_journey_cccld_spec.rb +++ b/spec/models/compliance_control_class_level_defaults/journey_pattern_control/vehicle_journey_cccld_spec.rb @@ -0,0 +1,7 @@ + +RSpec.describe JourneyPatternControl::VehicleJourney, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :journey_pattern_control_vehicle_journey } + + it_behaves_like 'ComplianceControl Class Level Defaults' +end diff --git a/spec/models/compliance_control_class_level_defaults/line_control/route_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/line_control/route_cccld_spec.rb index e69de29bb..61e4ed762 100644 --- a/spec/models/compliance_control_class_level_defaults/line_control/route_cccld_spec.rb +++ b/spec/models/compliance_control_class_level_defaults/line_control/route_cccld_spec.rb @@ -0,0 +1,7 @@ + +RSpec.describe LineControl::Route, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :line_control_route } + + it_behaves_like 'ComplianceControl Class Level Defaults' +end diff --git a/spec/models/compliance_control_class_level_defaults/route_control/duplicates_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/duplicates_cccld_spec.rb index e69de29bb..25607c5d4 100644 --- a/spec/models/compliance_control_class_level_defaults/route_control/duplicates_cccld_spec.rb +++ b/spec/models/compliance_control_class_level_defaults/route_control/duplicates_cccld_spec.rb @@ -0,0 +1,7 @@ + +RSpec.describe RouteControl::Duplicates, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :route_control_duplicates } + + it_behaves_like 'ComplianceControl Class Level Defaults' +end diff --git a/spec/models/compliance_control_class_level_defaults/route_control/journey_pattern_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/journey_pattern_cccld_spec.rb index e69de29bb..4f87c866a 100644 --- a/spec/models/compliance_control_class_level_defaults/route_control/journey_pattern_cccld_spec.rb +++ b/spec/models/compliance_control_class_level_defaults/route_control/journey_pattern_cccld_spec.rb @@ -0,0 +1,7 @@ + +RSpec.describe RouteControl::JourneyPattern, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :route_control_journey_pattern } + + it_behaves_like 'ComplianceControl Class Level Defaults' +end diff --git a/spec/models/compliance_control_class_level_defaults/route_control/minimum_length_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/minimum_length_cccld_spec.rb index e69de29bb..ecf8d9fee 100644 --- a/spec/models/compliance_control_class_level_defaults/route_control/minimum_length_cccld_spec.rb +++ b/spec/models/compliance_control_class_level_defaults/route_control/minimum_length_cccld_spec.rb @@ -0,0 +1,7 @@ + +RSpec.describe RouteControl::MinimumLength, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :route_control_minimum_length } + + it_behaves_like 'ComplianceControl Class Level Defaults' +end diff --git a/spec/models/compliance_control_class_level_defaults/route_control/omnibus_journey_pattern_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/omnibus_journey_pattern_cccld_spec.rb index e69de29bb..3837190fa 100644 --- a/spec/models/compliance_control_class_level_defaults/route_control/omnibus_journey_pattern_cccld_spec.rb +++ b/spec/models/compliance_control_class_level_defaults/route_control/omnibus_journey_pattern_cccld_spec.rb @@ -0,0 +1,7 @@ + +RSpec.describe RouteControl::OmnibusJourneyPattern, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :route_control_omnibus_journey_pattern } + + it_behaves_like 'ComplianceControl Class Level Defaults' +end diff --git a/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_cccld_spec.rb index e69de29bb..c72195fe2 100644 --- a/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_cccld_spec.rb +++ b/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_cccld_spec.rb @@ -0,0 +1,7 @@ + +RSpec.describe RouteControl::OppositeRoute, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :route_control_opposite_route } + + it_behaves_like 'ComplianceControl Class Level Defaults' +end diff --git a/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_terminus_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_terminus_cccld_spec.rb index e69de29bb..6cc96cd60 100644 --- a/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_terminus_cccld_spec.rb +++ b/spec/models/compliance_control_class_level_defaults/route_control/opposite_route_terminus_cccld_spec.rb @@ -0,0 +1,7 @@ + +RSpec.describe RouteControl::OppositeRouteTerminus, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :route_control_opposite_route_terminus } + + it_behaves_like 'ComplianceControl Class Level Defaults' +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 e69de29bb..d8be035a2 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 @@ -0,0 +1,7 @@ + +RSpec.describe VehicleJourneyControl::Speed, type: :model do + let( :default_code ){ "3-Generic-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/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 e69de29bb..ce54b27ac 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 @@ -0,0 +1,7 @@ + +RSpec.describe RouteControl::StopPointInJourneyPattern, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :route_control_stop_point_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 e69de29bb..7f37d15b1 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 @@ -0,0 +1,7 @@ + +RSpec.describe VehicleJourneyControl::TimeTable, type: :model do + let( :default_code ){ "3-Generic-2" } + 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/route_control/unactivated_stop_points_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb index e69de29bb..586f92d62 100644 --- a/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb +++ b/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb @@ -0,0 +1,7 @@ + +RSpec.describe RouteControl::UnactivatedStopPoint, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :route_control_unactivated_stop_point } + + 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 e69de29bb..d442fd365 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 @@ -0,0 +1,7 @@ + +RSpec.describe VehicleJourneyControl::VehicleJourneyAtStops, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :vehicle_journey_control_vehicle_journey_at_stops } + + it_behaves_like 'ComplianceControl Class Level Defaults' +end diff --git a/spec/models/compliance_control_class_level_defaults/route_control/zdl_stop_area_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/zdl_stop_area_cccld_spec.rb index e69de29bb..6101c29ff 100644 --- a/spec/models/compliance_control_class_level_defaults/route_control/zdl_stop_area_cccld_spec.rb +++ b/spec/models/compliance_control_class_level_defaults/route_control/zdl_stop_area_cccld_spec.rb @@ -0,0 +1,7 @@ + +RSpec.describe RouteControl::ZDLStopArea, type: :model do + let( :default_code ){ "3-Generic-2" } + let( :factory ){ :route_control_zdl_stop_area } + + it_behaves_like 'ComplianceControl Class Level Defaults' +end -- cgit v1.2.3