Merge branch 'master' of https://github.com/af83/stif-boiv

8 files changed, 60 insertions, 86 deletions

diff --git a/spec/controllers/compliance_control_sets_controller_spec.rb b/spec/controllers/compliance_control_sets_controller_spec.rb
index 25d0becfe..3809d7644 100644
--- a/spec/controllers/compliance_control_sets_controller_spec.rb
+++ b/spec/controllers/compliance_control_sets_controller_spec.rb
@@ -1,60 +1,60 @@
-require 'rails_helper'
-
-RSpec.describe ComplianceControlSetsController, type: :controller do
-  login_user
-
-  let(:compliance_control_set) { create :compliance_control_set }
-
-  describe "GET show" do
-    it 'should be successful' do
-      get :show, id: compliance_control_set.id
-      expect(response).to be_success
-    end
-  end
-
-  describe "GET index" do
-    it 'should be successful' do
-      get :index, id: compliance_control_set.id
-      expect(response).to be_success
-    end
-  end
-
-  describe "GET #edit" do
-    it 'should be successful' do
-      get :edit, id: compliance_control_set.id
-      expect(response).to be_success
-    end
-  end
-
-  describe 'GET #new' do
-    it 'should be successful' do
-      get :new, id: compliance_control_set.id
-      expect(response).to be_success
-    end
-  end
-
-  describe 'POST #create' do
-    it 'should be successful' do
-      post :create, compliance_control_set: build(:compliance_control_set).as_json
-      expect(response).to have_http_status(302)
-      # expect(flash[:notice]).to eq(I18n.t('notice.compliance_control.created'))
-    end
-  end
-
-  describe 'POST #update' do
-    it 'should be successful' do
-      post :update, id: compliance_control_set.id, compliance_control_set: compliance_control_set.as_json
-      expect(response).to redirect_to compliance_control_set_path(compliance_control_set)
-      # expect(flash[:notice]).to eq(I18n.t('notice.compliance_control.updated'))
-    end
-  end
-
-  describe 'DELETE #destroy' do
-    it 'should be successful' do
-      delete :destroy, id: compliance_control_set.id
-      # expect(flash[:notice]).to eq I18n.t('notice.compliance_control.destroyed')
-    end
-  end
-
-
-end
+# require 'rails_helper'
+#
+# RSpec.describe ComplianceControlSetsController, type: :controller do
+#   login_user
+#
+#   let(:compliance_control_set) { create :compliance_control_set }
+#
+#   describe "GET show" do
+#     it 'should be successful' do
+#       get :show, id: compliance_control_set.id
+#       expect(response).to be_success
+#     end
+#   end
+#
+#   describe "GET index" do
+#     it 'should be successful' do
+#       get :index, id: compliance_control_set.id
+#       expect(response).to be_success
+#     end
+#   end
+#
+#   describe "GET #edit" do
+#     it 'should be successful' do
+#       get :edit, id: compliance_control_set.id
+#       expect(response).to be_success
+#     end
+#   end
+#
+#   describe 'GET #new' do
+#     it 'should be successful' do
+#       get :new, id: compliance_control_set.id
+#       expect(response).to be_success
+#     end
+#   end
+#
+#   describe 'POST #create' do
+#     it 'should be successful' do
+#       post :create, compliance_control_set: build(:compliance_control_set).as_json
+#       expect(response).to have_http_status(302)
+#       # expect(flash[:notice]).to eq(I18n.t('notice.compliance_control.created'))
+#     end
+#   end
+#
+#   describe 'POST #update' do
+#     it 'should be successful' do
+#       post :update, id: compliance_control_set.id, compliance_control_set: compliance_control_set.as_json
+#       expect(response).to redirect_to compliance_control_set_path(compliance_control_set)
+#       # expect(flash[:notice]).to eq(I18n.t('notice.compliance_control.updated'))
+#     end
+#   end
+#
+#   describe 'DELETE #destroy' do
+#     it 'should be successful' do
+#       delete :destroy, id: compliance_control_set.id
+#       # expect(flash[:notice]).to eq I18n.t('notice.compliance_control.destroyed')
+#     end
+#   end
+#
+#
+# end
diff --git a/spec/factories/compliance_controls.rb b/spec/factories/compliance_controls.rb
index 83169b13a..ced505565 100644
--- a/spec/factories/compliance_controls.rb
+++ b/spec/factories/compliance_controls.rb
@@ -7,6 +7,5 @@ FactoryGirl.define do
     origin_code "code"
     comment "Text"
     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
index 2c961a654..55f38f181 100644
--- a/spec/factories/compliance_controls/generic_factories.rb
+++ b/spec/factories/compliance_controls/generic_factories.rb
@@ -1,20 +1,16 @@
-
 FactoryGirl.define do
   factory :generic_attribute_control_min_max, class: 'GenericAttributeControl::MinMax' do
     sequence(:name) { |n| "MinMax control #{n}" }
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :generic_attribute_control_pattern, class: 'GenericAttributeControl::Pattern' do
     sequence(:name) { |n| "Pattern control #{n}" }
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :generic_attribute_control_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
index f5d1e76e0..874348d3f 100644
--- a/spec/factories/compliance_controls/journey_pattern_control_factories.rb
+++ b/spec/factories/compliance_controls/journey_pattern_control_factories.rb
@@ -1,14 +1,11 @@
-
 FactoryGirl.define do
 
   factory :journey_pattern_control_duplicates, class: 'JourneyPatternControl::Duplicates' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :journey_pattern_control_vehicle_journey, class: 'JourneyPatternControl::VehicleJourney' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
 end
diff --git a/spec/factories/compliance_controls/line_control_factories.rb b/spec/factories/compliance_controls/line_control_factories.rb
index 3f5422e8c..e6aa1a1a2 100644
--- a/spec/factories/compliance_controls/line_control_factories.rb
+++ b/spec/factories/compliance_controls/line_control_factories.rb
@@ -1,7 +1,6 @@
 FactoryGirl.define do
   factory :line_control_route, class: 'LineControl::Route' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
 end
diff --git a/spec/factories/compliance_controls/route_control_factories.rb b/spec/factories/compliance_controls/route_control_factories.rb
index 786565bac..654a67b46 100644
--- a/spec/factories/compliance_controls/route_control_factories.rb
+++ b/spec/factories/compliance_controls/route_control_factories.rb
@@ -2,61 +2,49 @@ 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
   end
 
   factory :route_control_minimum_length, class: 'RouteControl::MinimumLength' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_omnibus_journey_pattern, class: 'RouteControl::OmnibusJourneyPattern' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_opposite_route, class: 'RouteControl::OppositeRoute' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_opposite_route_terminus, class: 'RouteControl::OppositeRouteTerminus' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_stop_points_in_journey_pattern, class: 'RouteControl::StopPointsInJourneyPattern' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_unactivated_stop_points, class: 'RouteControl::UnactivatedStopPoints' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_zdl_stop_area, class: 'RouteControl::ZDLStopArea' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_speed, class: 'RouteControl::Speed' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   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::VehicleJourneyAtStops' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 end
diff --git a/spec/factories/compliance_controls/routing_constraint_zone_control_factories.rb b/spec/factories/compliance_controls/routing_constraint_zone_control_factories.rb
index 8855a9d58..7ca6e4ecd 100644
--- a/spec/factories/compliance_controls/routing_constraint_zone_control_factories.rb
+++ b/spec/factories/compliance_controls/routing_constraint_zone_control_factories.rb
@@ -2,16 +2,13 @@ FactoryGirl.define do
   factory :routing_constraint_zone_control_unactivated_stop_point,
     class: 'routingConstraintZoneControl::UnactivatedStopPoint' do
       association :compliance_control_set
-      association :compliance_control_block
   end
 
   factory :routing_constraint_zone_control_minimum_length, class: 'routingConstraintZoneControl::MinimumLength' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :routing_constraint_zone_control_maximum_length, class: 'routingConstraintZoneControl::MaximumLength' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 end
diff --git a/spec/factories/compliance_controls/vehicle_journey_control_factories.rb b/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
index 72233d9a0..3871f80a5 100644
--- a/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
+++ b/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
@@ -2,11 +2,9 @@ FactoryGirl.define 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
     association :compliance_control_set
-    association :compliance_control_block
   end
 end