diff options
| -rw-r--r-- | app/models/compliance_control.rb | 2 | ||||
| -rw-r--r-- | app/models/route_control/unactivated_stop_point.rb (renamed from app/models/route_control/unactivated_stop_points.rb) | 2 | ||||
| -rw-r--r-- | config/initializers/apartment.rb | 2 | ||||
| -rw-r--r-- | config/locales/compliance_controls.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/compliance_controls.fr.yml | 2 | ||||
| -rw-r--r-- | spec/factories/compliance_controls/route_control_factories.rb | 2 | ||||
| -rw-r--r-- | spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_point_cccld_spec.rb | 7 | ||||
| -rw-r--r-- | spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb | 7 |
8 files changed, 13 insertions, 13 deletions
diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb index 146c4e838..65e22643d 100644 --- a/app/models/compliance_control.rb +++ b/app/models/compliance_control.rb @@ -83,7 +83,7 @@ require_dependency 'route_control/omnibus_journey_pattern' require_dependency 'route_control/opposite_route_terminus' require_dependency 'route_control/opposite_route' require_dependency 'route_control/stop_points_in_journey_pattern' -require_dependency 'route_control/unactivated_stop_points' +require_dependency 'route_control/unactivated_stop_point' require_dependency 'route_control/zdl_stop_area' require_dependency 'routing_constraint_zone_control/maximum_length' require_dependency 'routing_constraint_zone_control/minimum_length' diff --git a/app/models/route_control/unactivated_stop_points.rb b/app/models/route_control/unactivated_stop_point.rb index a903fff53..3066bb523 100644 --- a/app/models/route_control/unactivated_stop_points.rb +++ b/app/models/route_control/unactivated_stop_point.rb @@ -1,5 +1,5 @@ module RouteControl - class UnactivatedStopPoints < ComplianceControl + class UnactivatedStopPoint < ComplianceControl def self.default_code; "3-Route-10" end end diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb index 87bca0b45..69204a5d7 100644 --- a/config/initializers/apartment.rb +++ b/config/initializers/apartment.rb @@ -61,7 +61,7 @@ Apartment.configure do |config| 'RouteControl::OppositeRouteTerminus', 'RouteControl::OppositeRoute', 'RouteControl::StopPointsInJourneyPattern', - 'RouteControl::UnactivatedStopPoints', + 'RouteControl::UnactivatedStopPoint', 'RouteControl::ZDLStopArea', 'RoutingConstraintZoneControl::MaximumLength', 'RoutingConstraintZoneControl::MinimumLength', diff --git a/config/locales/compliance_controls.en.yml b/config/locales/compliance_controls.en.yml index 9615bbf69..0c476a46d 100644 --- a/config/locales/compliance_controls.en.yml +++ b/config/locales/compliance_controls.en.yml @@ -160,7 +160,7 @@ en: one: "A route must have at least 2 stop points" route_control/omnibus_journey_pattern: one: "A journey pattern of a route should connect all of a route's stop points" - route_control/unactivated_stop_points: + route_control/unactivated_stop_point: one: "Route and unactivated stop point" route_control/stop_points_in_journey_pattern: one: "The stop points of a route must be used by at least one journey pattern" diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml index 9afffa823..70227b01f 100644 --- a/config/locales/compliance_controls.fr.yml +++ b/config/locales/compliance_controls.fr.yml @@ -159,7 +159,7 @@ fr: one: "Un itinéraire doit contenir au moins 2 arrêts" route_control/omnibus_journey_pattern: one: "Existence d’une mission passant par tous les arrêts de l'itinéraire" - route_control/unactivated_stop_points: + route_control/unactivated_stop_point: one: "Itinéraire & arrêt désactivé" route_control/stop_points_in_journey_pattern: one: "Utilisation des arrêts par les missions" diff --git a/spec/factories/compliance_controls/route_control_factories.rb b/spec/factories/compliance_controls/route_control_factories.rb index 1462ca635..35d8f481f 100644 --- a/spec/factories/compliance_controls/route_control_factories.rb +++ b/spec/factories/compliance_controls/route_control_factories.rb @@ -28,7 +28,7 @@ FactoryGirl.define do association :compliance_control_set end - factory :route_control_unactivated_stop_points, class: 'RouteControl::UnactivatedStopPoints' do + factory :route_control_unactivated_stop_point, class: 'RouteControl::UnactivatedStopPoint' do association :compliance_control_set end diff --git a/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_point_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_point_cccld_spec.rb new file mode 100644 index 000000000..e9c335dea --- /dev/null +++ b/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_point_cccld_spec.rb @@ -0,0 +1,7 @@ + +RSpec.describe RouteControl::UnactivatedStopPoint, type: :model do + let( :default_code ){ "3-Route-10" } + 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/unactivated_stop_points_cccld_spec.rb b/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb deleted file mode 100644 index bf725d743..000000000 --- a/spec/models/compliance_control_class_level_defaults/route_control/unactivated_stop_points_cccld_spec.rb +++ /dev/null @@ -1,7 +0,0 @@ - -RSpec.describe RouteControl::UnactivatedStopPoints, type: :model do - let( :default_code ){ "3-Route-10" } - let( :factory ){ :route_control_unactivated_stop_points } - - it_behaves_like 'ComplianceControl Class Level Defaults' -end |