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

5 files changed, 74 insertions, 14 deletions

diff --git a/spec/controllers/compliance_control_blocks_controller_spec.rb b/spec/controllers/compliance_control_blocks_controller_spec.rb
new file mode 100644
index 000000000..54617e768
--- /dev/null
+++ b/spec/controllers/compliance_control_blocks_controller_spec.rb
@@ -0,0 +1,47 @@
+require 'rails_helper'
+
+RSpec.describe ComplianceControlBlocksController, type: :controller do
+  login_user
+
+
+  let(:compliance_control_block)        { create(:compliance_control_block) }
+  let!(:compliance_control_set)         { compliance_control_block.compliance_control_set }
+  let(:compliance_control_block_params) { compliance_control_block.as_json.merge(transport_mode: "bus") }
+
+    describe 'GET #new' do
+    it 'should be successful' do
+      get :new, compliance_control_set_id: compliance_control_set.id, id: compliance_control_block.id
+      expect(response).to be_success
+    end
+  end
+
+  describe 'POST #create' do
+    it 'should be successful' do
+      post :create, compliance_control_set_id: compliance_control_set.id, compliance_control_block: compliance_control_block_params
+      expect(response).to redirect_to compliance_control_set_path(compliance_control_set)
+    end
+  end
+
+  describe 'GET #edit' do
+    it 'should be successful' do
+      get :edit, compliance_control_set_id: compliance_control_set.id, id: compliance_control_block.id
+      expect(response).to be_success
+    end
+  end
+
+  describe 'POST #update' do
+    it 'should be successful' do
+      post :update, compliance_control_set_id: compliance_control_set.id, id: compliance_control_block.id, compliance_control_block: compliance_control_block_params
+      expect(response).to redirect_to compliance_control_set_path(compliance_control_set)
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    it 'should be successful' do
+      expect {
+        delete :destroy, compliance_control_set_id: compliance_control_set.id, id: compliance_control_block.id
+      }.to change(ComplianceControlBlock, :count).by(-1)
+      expect(response).to redirect_to compliance_control_set_path(compliance_control_set)
+    end
+  end
+end
diff --git a/spec/controllers/compliance_controls_controller_spec.rb b/spec/controllers/compliance_controls_controller_spec.rb
index a39408ccb..d8368c3d0 100644
--- a/spec/controllers/compliance_controls_controller_spec.rb
+++ b/spec/controllers/compliance_controls_controller_spec.rb
@@ -24,7 +24,14 @@ RSpec.describe ComplianceControlsController, type: :controller do
 
   describe 'GET #new' do
     it 'should be successful' do
-      get :new, compliance_control_set_id: compliance_control_set.id
+      get :new, compliance_control_set_id: compliance_control_set.id, sti_class: 'GenericAttributeControl::MinMax'
+      expect(response).to be_success
+    end
+  end
+
+  describe 'GET #select_type' do
+    it 'should be successful' do
+      get :select_type, compliance_control_set_id: compliance_control_set.id
       expect(response).to be_success
     end
   end
diff --git a/spec/factories/compliance_check_resources.rb b/spec/factories/compliance_check_resources.rb
index 813153be2..95be48de4 100644
--- a/spec/factories/compliance_check_resources.rb
+++ b/spec/factories/compliance_check_resources.rb
@@ -2,5 +2,6 @@ FactoryGirl.define do
   factory :compliance_check_resource do
     status :new
     sequence(:name) { |n| "Compliance check resource #{n}" }
+    association :compliance_check_set
   end
 end
diff --git a/spec/models/compliance_check_resource_spec.rb b/spec/models/compliance_check_resource_spec.rb
index a9366bea2..40e209db0 100644
--- a/spec/models/compliance_check_resource_spec.rb
+++ b/spec/models/compliance_check_resource_spec.rb
@@ -4,4 +4,6 @@ RSpec.describe ComplianceCheckResource, type: :model do
   it 'should have a valid factory' do
     expect(FactoryGirl.build(:compliance_check_resource)).to be_valid
   end
+
+  it { should validate_presence_of(:compliance_check_set) }
 end
diff --git a/spec/support/permissions.rb b/spec/support/permissions.rb
index 13666aca3..7d09e16cb 100644
--- a/spec/support/permissions.rb
+++ b/spec/support/permissions.rb
@@ -13,19 +13,22 @@ module Support
 
     def _permitted_resources
       %w[
-      api_keys
-      access_points
-      connection_links
-      calendars
-      footnotes
-      imports
-      journey_patterns
-      referentials
-      routes
-      routing_constraint_zones
-      time_tables
-      vehicle_journeys
-      compliance_controls
+        access_points
+        connection_links
+        calendars
+        footnotes
+        imports
+        journey_patterns
+        referentials
+        routes
+        routing_constraint_zones
+        time_tables
+        vehicle_journeys
+        api_keys
+        compliance_controls
+        compliance_controls_sets
+        compliance_controls_blocks
+        compliance_check_sets
       ]
     end
   end