6 files changed, 22 insertions, 7 deletions
diff --git a/spec/factories/compliance_check_blocks.rb b/spec/factories/compliance_check_blocks.rb
new file mode 100644
index 000000000..0bd23c0d6
--- /dev/null
+++ b/spec/factories/compliance_check_blocks.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :compliance_check_block do
+    sequence(:name) { |n| "Compliance check block #{n}" }
+    association :compliance_check_set
+  end
+end
diff --git a/spec/factories/compliance_check_sets.rb b/spec/factories/compliance_check_sets.rb
index d16f19845..9fd6ef4e0 100644
--- a/spec/factories/compliance_check_sets.rb
+++ b/spec/factories/compliance_check_sets.rb
@@ -1,8 +1,8 @@
 FactoryGirl.define do
   factory :compliance_check_set do
     status :new
-    referential
-    compliance_control_set
-    workbench
+    association :referential
+    association :compliance_control_set
+    association :workbench
   end
 end
diff --git a/spec/factories/compliance_control_blocks.rb b/spec/factories/compliance_control_blocks.rb
index ca2abef12..5bc45cc75 100644
--- a/spec/factories/compliance_control_blocks.rb
+++ b/spec/factories/compliance_control_blocks.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :compliance_control_block do
     sequence(:name) { |n| "Compliance control block #{n}" }
-    compliance_control_set
+    association :compliance_control_set
   end
 end
diff --git a/spec/factories/compliance_control_sets.rb b/spec/factories/compliance_control_sets.rb
index f322816ed..5e4acf3c4 100644
--- a/spec/factories/compliance_control_sets.rb
+++ b/spec/factories/compliance_control_sets.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :compliance_control_set do
     sequence(:name) { |n| "Compliance control set #{n}" }
-    organisation
+    association :organisation
   end
 end
diff --git a/spec/factories/compliance_controls.rb b/spec/factories/compliance_controls.rb
index 865bfe376..28b760383 100644
--- a/spec/factories/compliance_controls.rb
+++ b/spec/factories/compliance_controls.rb
@@ -5,7 +5,7 @@ FactoryGirl.define do
     criticity :info
     code "code"
     comment "Text"
-    compliance_control_set
-    compliance_control_block
+    association :compliance_control_set
+    association :compliance_control_block
   end
 end
diff --git a/spec/models/compliance_check_block_spec.rb b/spec/models/compliance_check_block_spec.rb
new file mode 100644
index 000000000..f581d5085
--- /dev/null
+++ b/spec/models/compliance_check_block_spec.rb
@@ -0,0 +1,9 @@
+require 'rails_helper'
+
+RSpec.describe ComplianceCheckBlock, type: :model do
+  it 'should have a valid factory' do
+    expect(FactoryGirl.build(:compliance_check_block)).to be_valid
+  end
+
+  it { should belong_to :compliance_check_set }
+end