Fixes: #4727@0.1h; Added organisation to clone for and rebased master4727-clone-compliance-control-set

2 files changed, 8 insertions, 5 deletions

diff --git a/spec/lib/compliance_control_set_cloner_spec.rb b/spec/lib/compliance_control_set_cloner_spec.rb
index ca359536a..4305ec70b 100644
--- a/spec/lib/compliance_control_set_cloner_spec.rb
+++ b/spec/lib/compliance_control_set_cloner_spec.rb
@@ -2,6 +2,8 @@ RSpec.describe ComplianceControlSetCloner do
 
   subject{ described_class.new }
 
+  let( :new_organisation ){ create :organisation }
+
   let( :source_set ){ create :compliance_control_set }
   let( :set_prefix ){ I18n.t('compliance_control_sets.clone.prefix') }
   let( :block_prefix ){ I18n.t('compliance_control_blocks.clone.prefix') }
@@ -80,11 +82,11 @@ RSpec.describe ComplianceControlSetCloner do
           #
           #  Execute copy and keep count
           counts = object_counts
-          subject.copy(source_set.id)
+          subject.copy(source_set.id, new_organisation.id)
           delta  = count_diff counts, object_counts
 
           # Check correctly copied set
-          expect(target_set.organisation).to eq(source_set.organisation)
+          expect(target_set.organisation).to eq(new_organisation)
           expect(target_set.name).to eq( [set_prefix, source_set.name].join(' ') )
 
           # Check correctly copied controls
diff --git a/spec/workers/compliance_control_set_cloning_worker_spec.rb b/spec/workers/compliance_control_set_cloning_worker_spec.rb
index dee3e6dd5..3a2332f62 100644
--- a/spec/workers/compliance_control_set_cloning_worker_spec.rb
+++ b/spec/workers/compliance_control_set_cloning_worker_spec.rb
@@ -6,9 +6,10 @@ RSpec.describe ComplianceControlSetCloningWorker do
   end
 
   it 'delegates perform to the correct lib call' do
-    id = random_int
-    expect_any_instance_of(ComplianceControlSetCloner).to receive(:copy).with(id) 
-    described_class.new.perform(id)
+    id = double('id')
+    organisation_id = double('organisation_id')
+    expect_any_instance_of(ComplianceControlSetCloner).to receive(:copy).with(id, organisation_id) 
+    described_class.new.perform(id, organisation_id)
   end
   
 end