aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert2017-10-17 10:32:33 +0200
committerRobert2017-10-17 12:19:59 +0200
commit8fffc6dd27175b20cc18c246a10151bc98bba4ee (patch)
tree1095c91611dfe340e8c00a207e93f18bbbffc1ee
parentaaa5d31971ebf2b429efea3c869a8e132f9d0836 (diff)
downloadchouette-core-8fffc6dd27175b20cc18c246a10151bc98bba4ee.tar.bz2
Refs: #4727@2h; Debugged test setup to comply to new validation
-rw-r--r--lib/compliance_control_set_cloner.rb1
-rw-r--r--spec/lib/compliance_control_set_cloner_spec.rb4
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/compliance_control_set_cloner.rb b/lib/compliance_control_set_cloner.rb
index 50c757a9f..3856ce25e 100644
--- a/lib/compliance_control_set_cloner.rb
+++ b/lib/compliance_control_set_cloner.rb
@@ -58,6 +58,7 @@ class ComplianceControlSetCloner
criticity: compliance_control.criticity,
name: name_of_copy(:compliance_controls, compliance_control.name),
origin_code: compliance_control.origin_code,
+ target: compliance_control.target,
type: compliance_control.type
).tap do | control |
control_id_map.update compliance_control.id => control
diff --git a/spec/lib/compliance_control_set_cloner_spec.rb b/spec/lib/compliance_control_set_cloner_spec.rb
index 5313c15de..ca359536a 100644
--- a/spec/lib/compliance_control_set_cloner_spec.rb
+++ b/spec/lib/compliance_control_set_cloner_spec.rb
@@ -51,7 +51,7 @@ RSpec.describe ComplianceControlSetCloner do
3.times.map{ |_| create :compliance_control_block, compliance_control_set: source_set }
}
let(:direct_ccs){
- 3.times.map{ |n| create :compliance_control, compliance_control_set: source_set, name: "direct #{n.succ}", code: "direct-#{n.succ}" }
+ 3.times.map{ |n| create :generic_attribute_control_min_max, compliance_control_set: source_set, name: "direct #{n.succ}", code: "direct-#{n.succ}" }
}
# Needed to check we do not dulicate a node (compliance_control) twice
let(:indirect_ccs){
@@ -61,7 +61,7 @@ RSpec.describe ComplianceControlSetCloner do
cc.update compliance_control_block_id: source_block.id
end
source_blox.each_with_index.map{ | source_block, n |
- create(:compliance_control, compliance_control_set: source_set, compliance_control_block: source_block, name: "indirect #{n.succ}", code: "indirect-#{n.succ}")
+ create(:generic_attribute_control_min_max, compliance_control_set: source_set, compliance_control_block: source_block, name: "indirect #{n.succ}", code: "indirect-#{n.succ}")
}
}
let( :sources ){ source_set.compliance_controls.order(:id) }