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

7 files changed, 28 insertions, 4 deletions

diff --git a/spec/controllers/compliance_check_sets_controller_spec.rb b/spec/controllers/compliance_check_sets_controller_spec.rb
new file mode 100644
index 000000000..804b0a658
--- /dev/null
+++ b/spec/controllers/compliance_check_sets_controller_spec.rb
@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+RSpec.describe ComplianceCheckSetsController, type: :controller do
+  login_user
+
+  let(:compliance_check_set) { create :compliance_check_set }
+
+  describe "GET show" do
+    it 'should be successful' do
+      get :show, workbench_id: compliance_check_set.workbench.id, id: compliance_check_set.id
+      expect(response).to be_success
+    end
+  end
+
+  describe "GET index" do
+    it 'should be successful' do
+      get :index, workbench_id: compliance_check_set.workbench.id, id: compliance_check_set.id
+      expect(response).to be_success
+    end
+  end
+
+end
diff --git a/spec/factories/compliance_checks.rb b/spec/factories/compliance_checks.rb
index 4009653da..f9af62c73 100644
--- a/spec/factories/compliance_checks.rb
+++ b/spec/factories/compliance_checks.rb
@@ -4,6 +4,7 @@ FactoryGirl.define do
     type "Type"
     criticity :info
     code "code"
+    origin_code "code"
     comment "Text"
     association :compliance_check_set
     association :compliance_check_block
diff --git a/spec/factories/compliance_control_blocks.rb b/spec/factories/compliance_control_blocks.rb
index 1b043324e..5bc45cc75 100644
--- a/spec/factories/compliance_control_blocks.rb
+++ b/spec/factories/compliance_control_blocks.rb
@@ -2,6 +2,5 @@ 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 ced505565..83169b13a 100644
--- a/spec/factories/compliance_controls.rb
+++ b/spec/factories/compliance_controls.rb
@@ -7,5 +7,6 @@ FactoryGirl.define do
     origin_code "code"
     comment "Text"
     association :compliance_control_set
+    association :compliance_control_block
   end
 end
diff --git a/spec/models/compliance_check_spec.rb b/spec/models/compliance_check_spec.rb
index 4fbc23d42..acdcc3ebf 100644
--- a/spec/models/compliance_check_spec.rb
+++ b/spec/models/compliance_check_spec.rb
@@ -11,4 +11,5 @@ RSpec.describe ComplianceCheck, type: :model do
   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
diff --git a/spec/models/compliance_control_block_spec.rb b/spec/models/compliance_control_block_spec.rb
index f45ec3d42..a50fe026b 100644
--- a/spec/models/compliance_control_block_spec.rb
+++ b/spec/models/compliance_control_block_spec.rb
@@ -8,5 +8,5 @@ RSpec.describe ComplianceControlBlock, type: :model do
   end
 
   it { should belong_to :compliance_control_set }
-  it { should belong_to :compliance_control }
+  it { should have_many(:compliance_controls).dependent(:destroy) }
 end
diff --git a/spec/models/compliance_control_spec.rb b/spec/models/compliance_control_spec.rb
index d7bffb0b2..0fc830021 100644
--- a/spec/models/compliance_control_spec.rb
+++ b/spec/models/compliance_control_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe ComplianceControl, type: :model do
   end
 
   it { should belong_to :compliance_control_set }
-  it { should have_one(:compliance_control_block).dependent(:destroy) }
+  it { should belong_to :compliance_control_block }
 
   it 'should validate_presence_of criticity' do
     compliance_control.criticity = nil
@@ -37,5 +37,5 @@ RSpec.describe ComplianceControl, type: :model do
   # it { should validate_presence_of :name }
   # it { should validate_presence_of :code }
   # it { should validate_presence_of :origin_code }
-  
+
 end