Refs: #4267@1.5h; ComplianceControlClassLevelDefaults

  - All Specs and Factories implemented
  - Fixing More Typos in dir/file names and incorrect module names; long live copy and paste

8 files changed, 5 insertions, 9 deletions

diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 930d54fe8..0860f07b6 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -33,10 +33,6 @@ class ComplianceControl < ActiveRecord::Base
    self.name ||= self.class.name
    self.code ||= self.class.default_code
    self.origin_code ||= self.class.default_code
-   # TODO: Remove this very ambigous line, as a matter of fact it is never triggered
-   # **unless** `criticity` is **explicitly** set to nil, thusly bypassing the att's
-   # initialisation by `Enumerize`'s default.
-   self.criticity ||= self.class.default_criticity
   end
 
 end
diff --git a/app/models/route_control/speed.rb b/app/models/route_control/speed.rb
index 84d892c70..593b103cc 100644
--- a/app/models/route_control/speed.rb
+++ b/app/models/route_control/speed.rb
@@ -1,4 +1,4 @@
-module VehicleJourneyControl
+module RouteControl
   class Speed < ComplianceControl
 
     hstore_accessor :control_attributes, minimum: :integer, maximum: :integer
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 48a66298d..7b72a9b44 100644
--- a/app/models/route_control/stop_points_in_journey_pattern.rb
+++ b/app/models/route_control/stop_points_in_journey_pattern.rb
@@ -1,5 +1,5 @@
 module RouteControl
-  class StopPointInJourneyPattern < ComplianceControl
+  class StopPointsInJourneyPattern < ComplianceControl
 
     @@default_code = "3-Route-6"
   end
diff --git a/app/models/route_control/time_table.rb b/app/models/route_control/time_table.rb
index 1153a5269..132bd32bb 100644
--- a/app/models/route_control/time_table.rb
+++ b/app/models/route_control/time_table.rb
@@ -1,4 +1,4 @@
-module VehicleJourneyControl
+module RouteControl
   class TimeTable < ComplianceControl
 
     @@default_code = "3-VehicleJourney-4"
diff --git a/app/models/route_control/unactivated_stop_points.rb b/app/models/route_control/unactivated_stop_points.rb
index b7276baaf..821fe03cb 100644
--- a/app/models/route_control/unactivated_stop_points.rb
+++ b/app/models/route_control/unactivated_stop_points.rb
@@ -1,5 +1,5 @@
 module RouteControl
-  class UnactivatedStopPoint < ComplianceControl
+  class UnactivatedStopPoints < ComplianceControl
 
     @@default_code = "3-Route-10"
   end
diff --git a/app/models/route_control/vehicle_journey_at_stops.rb b/app/models/route_control/vehicle_journey_at_stops.rb
index e1c0e8c6b..5dd9d6b6d 100644
--- a/app/models/route_control/vehicle_journey_at_stops.rb
+++ b/app/models/route_control/vehicle_journey_at_stops.rb
@@ -1,4 +1,4 @@
-module VehicleJourneyControl
+module RouteControl
   class VehicleJourneyAtStops < ComplianceControl
 
     @@default_code = "3-VehicleJourney-5"
diff --git a/app/models/vechicle_journey_control/delta.rb b/app/models/vehicle_journey_control/delta.rb
index c90e05abd..c90e05abd 100644
--- a/app/models/vechicle_journey_control/delta.rb
+++ b/app/models/vehicle_journey_control/delta.rb
diff --git a/app/models/vechicle_journey_control/waiting_time.rb b/app/models/vehicle_journey_control/waiting_time.rb
index 9f4192520..9f4192520 100644
--- a/app/models/vechicle_journey_control/waiting_time.rb
+++ b/app/models/vehicle_journey_control/waiting_time.rb