aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert2017-10-02 22:01:00 +0200
committerRobert2017-10-02 22:01:00 +0200
commit88567b111cf172e7b4368ffc02cb1e5cf27b4231 (patch)
tree6077df70e5d5c3c1dc6c992e5f3483e1862b7cdd
parent87ddd6bc3db3e0ef0792db532973d1de47b7bfef (diff)
downloadchouette-core-88567b111cf172e7b4368ffc02cb1e5cf27b4231.tar.bz2
Refs: #4627@0.2h; Fixes regression for renamed compliance_control factory
-rw-r--r--spec/controllers/compliance_controls_controller_spec.rb2
-rw-r--r--spec/factories/compliance_controls.rb12
-rw-r--r--spec/factories/compliance_controls/generic_factories.rb11
3 files changed, 12 insertions, 13 deletions
diff --git a/spec/controllers/compliance_controls_controller_spec.rb b/spec/controllers/compliance_controls_controller_spec.rb
index e866b037c..e12a75381 100644
--- a/spec/controllers/compliance_controls_controller_spec.rb
+++ b/spec/controllers/compliance_controls_controller_spec.rb
@@ -1,5 +1,3 @@
-require 'rails_helper'
-
RSpec.describe ComplianceControlsController, type: :controller do
login_user
diff --git a/spec/factories/compliance_controls.rb b/spec/factories/compliance_controls.rb
index e69de29bb..83169b13a 100644
--- a/spec/factories/compliance_controls.rb
+++ b/spec/factories/compliance_controls.rb
@@ -0,0 +1,12 @@
+FactoryGirl.define do
+ factory :compliance_control do
+ sequence(:name) { |n| "Compliance control #{n}" }
+ 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/factories/compliance_controls/generic_factories.rb b/spec/factories/compliance_controls/generic_factories.rb
index bfdfc8f09..2c961a654 100644
--- a/spec/factories/compliance_controls/generic_factories.rb
+++ b/spec/factories/compliance_controls/generic_factories.rb
@@ -1,16 +1,5 @@
FactoryGirl.define do
- factory :generic_attribute_control_compliance_control do
- sequence(:name) { |n| "Compliance control #{n}" }
- type "GenericAttributeControl::MinMax"
- criticity :warning
- code "code"
- origin_code "code"
- comment "Text"
- association :compliance_control_set
- association :compliance_control_block
- end
-
factory :generic_attribute_control_min_max, class: 'GenericAttributeControl::MinMax' do
sequence(:name) { |n| "MinMax control #{n}" }
association :compliance_control_set