6 files changed, 49 insertions, 23 deletions
diff --git a/spec/controllers/compliance_controls_controller_spec.rb b/spec/controllers/compliance_controls_controller_spec.rb
index 165c00329..a39408ccb 100644
--- a/spec/controllers/compliance_controls_controller_spec.rb
+++ b/spec/controllers/compliance_controls_controller_spec.rb
@@ -3,8 +3,10 @@ require 'rails_helper'
 RSpec.describe ComplianceControlsController, type: :controller do
   login_user
 
-  let(:compliance_control)     { create :compliance_control }
-  let(:compliance_control_set) { compliance_control.compliance_control_set }
+
+  let(:compliance_control)        { create(:compliance_control) }
+  let!(:compliance_control_set)   { compliance_control.compliance_control_set }
+  let(:compliance_control_params) { compliance_control.as_json.merge(type: 'GenericAttributeControl::MinMax') }
 
   describe "GET show" do
     it 'should be successful' do
@@ -13,13 +15,6 @@ RSpec.describe ComplianceControlsController, type: :controller do
     end
   end
 
-  describe "GET index" do
-    it 'should be successful' do
-      get :index, compliance_control_set_id: compliance_control_set.id
-      expect(response).to be_success
-    end
-  end
-
   describe 'GET #edit' do
     it 'should be successful' do
       get :edit, compliance_control_set_id: compliance_control_set.id, id: compliance_control.id
@@ -36,24 +31,24 @@ RSpec.describe ComplianceControlsController, type: :controller do
 
   describe 'POST #create' do
     it 'should be successful' do
-      post :create, compliance_control_set_id: compliance_control_set.id, compliance_control: build(:compliance_control).as_json
+      post :create, compliance_control_set_id: compliance_control_set.id, compliance_control: compliance_control_params
       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, compliance_control_set_id: compliance_control_set.id, id: compliance_control.id, compliance_control: compliance_control.as_json
+      post :update, compliance_control_set_id: compliance_control_set.id, id: compliance_control.id, compliance_control: compliance_control_params
       expect(response).to redirect_to compliance_control_set_compliance_control_path(compliance_control_set, compliance_control)
-      expect(flash[:notice]).to eq(I18n.t('notice.compliance_control.updated'))
     end
   end
 
   describe 'DELETE #destroy' do
     it 'should be successful' do
-      delete :destroy, compliance_control_set_id: compliance_control_set.id, id: compliance_control.id
-      expect(flash[:notice]).to eq I18n.t('notice.compliance_control.destroyed')
+      expect {
+        delete :destroy, compliance_control_set_id: compliance_control_set.id, id: compliance_control.id
+      }.to change(GenericAttributeControl::MinMax, :count).by(-1)
+      expect(response).to have_http_status(302)
     end
   end
 end
diff --git a/spec/factories/compliance_control_blocks.rb b/spec/factories/compliance_control_blocks.rb
index 5bc45cc75..1b043324e 100644
--- a/spec/factories/compliance_control_blocks.rb
+++ b/spec/factories/compliance_control_blocks.rb
@@ -2,5 +2,6 @@ FactoryGirl.define do
   factory :compliance_control_block do
     sequence(:name) { |n| "Compliance control block #{n}" }
     association :compliance_control_set
+    association :compliance_control
   end
 end
diff --git a/spec/factories/compliance_controls.rb b/spec/factories/compliance_controls.rb
index 8aa16b674..ced505565 100644
--- a/spec/factories/compliance_controls.rb
+++ b/spec/factories/compliance_controls.rb
@@ -1,11 +1,11 @@
 FactoryGirl.define do
   factory :compliance_control do
     sequence(:name) { |n| "Compliance control #{n}" }
-    type "ComplianceControl"
+    type "GenericAttributeControl::MinMax"
     criticity :warning
     code "code"
+    origin_code "code"
     comment "Text"
     association :compliance_control_set
-    association :compliance_control_block
   end
 end
diff --git a/spec/models/compliance_control_block_spec.rb b/spec/models/compliance_control_block_spec.rb
index 248049b0c..f45ec3d42 100644
--- a/spec/models/compliance_control_block_spec.rb
+++ b/spec/models/compliance_control_block_spec.rb
@@ -1,9 +1,12 @@
 require 'rails_helper'
 
 RSpec.describe ComplianceControlBlock, type: :model do
+  subject { create(:compliance_control_block) }
+
   it 'should have a valid factory' do
     expect(FactoryGirl.build(:compliance_control_block)).to be_valid
   end
 
   it { should belong_to :compliance_control_set }
+  it { should belong_to :compliance_control }
 end
diff --git a/spec/models/compliance_control_set_spec.rb b/spec/models/compliance_control_set_spec.rb
index ededec5e0..edc684bbc 100644
--- a/spec/models/compliance_control_set_spec.rb
+++ b/spec/models/compliance_control_set_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe ComplianceControlSet, type: :model do
   end
 
   it { should belong_to :organisation }
-  it { should have_many :compliance_controls }
+  it { should have_many(:compliance_controls).dependent(:destroy) }
 
   it { should validate_presence_of :name }
 end
diff --git a/spec/models/compliance_control_spec.rb b/spec/models/compliance_control_spec.rb
index b00ff4c5a..d7bffb0b2 100644
--- a/spec/models/compliance_control_spec.rb
+++ b/spec/models/compliance_control_spec.rb
@@ -1,14 +1,41 @@
 require 'rails_helper'
 
 RSpec.describe ComplianceControl, type: :model do
+
+  let(:compliance_control) { create :compliance_control }
+
   it 'should have a valid factory' do
-    expect(FactoryGirl.build(:compliance_control)).to be_valid
+    expect(compliance_control).to be_valid
   end
 
   it { should belong_to :compliance_control_set }
-  it { should belong_to :compliance_control_block }
+  it { should have_one(:compliance_control_block).dependent(:destroy) }
+
+  it 'should validate_presence_of criticity' do
+    compliance_control.criticity = nil
+    expect(compliance_control).not_to be_valid
+  end
+
+  it 'should validate_presence_of name' do
+    compliance_control.name = nil
+    expect(compliance_control).not_to be_valid
+  end
+
+  it 'should validate_presence_of code' do
+    compliance_control.code = nil
+    expect(compliance_control).not_to be_valid
+  end
+
+  it 'should validate_presence_of origin_code' do
+    compliance_control.origin_code = nil
+    expect(compliance_control).not_to be_valid
+  end
 
-  it { should validate_presence_of :criticity }
-  it { should validate_presence_of :name }
-  it { should validate_presence_of :code }
+  #TODO dont know why the 'shortcuts' below to validates presence dont work
+  # That's why we dont it 'manually'
+  # it { should validate_presence_of :criticity }
+  # it { should validate_presence_of :name }
+  # it { should validate_presence_of :code }
+  # it { should validate_presence_of :origin_code }
+  
 end