Refs #4615 Resolve rebase conflict

5 files changed, 17 insertions, 8 deletions

diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb
index b4fb2f1de..eb1ba68ea 100644
--- a/app/controllers/compliance_controls_controller.rb
+++ b/app/controllers/compliance_controls_controller.rb
@@ -4,7 +4,7 @@ class ComplianceControlsController < BreadcrumbController
 
   def new
     @compliance_control_set = parent
-    @compliance_control = GenericAttributeMinMax.new
+    @compliance_control = GenericAttributeControl::MinMax.new
     @compliance_control.build_compliance_control_block
   end
 
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 758eed588..aea06340f 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -48,7 +48,7 @@ Apartment.configure do |config|
     'ImportMessage',
     'ImportResource',
     'ComplianceControl',
-    'GenericAttributeMinMax',
+    'GenericAttributeControl::MinMax',
     'ComplianceControlSet',
     'ComplianceControlBlock',
     'ComplianceCheck',
diff --git a/spec/controllers/compliance_controls_controller_spec.rb b/spec/controllers/compliance_controls_controller_spec.rb
index 511b61b38..a39408ccb 100644
--- a/spec/controllers/compliance_controls_controller_spec.rb
+++ b/spec/controllers/compliance_controls_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe ComplianceControlsController, type: :controller do
 
   let(:compliance_control)        { create(:compliance_control) }
   let!(:compliance_control_set)   { compliance_control.compliance_control_set }
-  let(:compliance_control_params) { compliance_control.as_json.merge(type: 'GenericAttributeMinMax') }
+  let(:compliance_control_params) { compliance_control.as_json.merge(type: 'GenericAttributeControl::MinMax') }
 
   describe "GET show" do
     it 'should be successful' do
@@ -47,7 +47,7 @@ RSpec.describe ComplianceControlsController, type: :controller do
     it 'should be successful' do
       expect {
         delete :destroy, compliance_control_set_id: compliance_control_set.id, id: compliance_control.id
-      }.to change(GenericAttributeMinMax, :count).by(-1)
+      }.to change(GenericAttributeControl::MinMax, :count).by(-1)
       expect(response).to have_http_status(302)
     end
   end
diff --git a/spec/factories/compliance_controls.rb b/spec/factories/compliance_controls.rb
index b1b6bd837..ced505565 100644
--- a/spec/factories/compliance_controls.rb
+++ b/spec/factories/compliance_controls.rb
@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :compliance_control do
     sequence(:name) { |n| "Compliance control #{n}" }
-    type "GenericAttributeMinMax"
+    type "GenericAttributeControl::MinMax"
     criticity :warning
     code "code"
     origin_code "code"
diff --git a/spec/models/compliance_control_spec.rb b/spec/models/compliance_control_spec.rb
index 226e7ae74..d7bffb0b2 100644
--- a/spec/models/compliance_control_spec.rb
+++ b/spec/models/compliance_control_spec.rb
@@ -11,9 +11,6 @@ RSpec.describe ComplianceControl, type: :model do
   it { should belong_to :compliance_control_set }
   it { should have_one(:compliance_control_block).dependent(:destroy) }
 
-  it { should validate_presence_of :code }
-  it { should validate_presence_of :origin_code }
-
   it 'should validate_presence_of criticity' do
     compliance_control.criticity = nil
     expect(compliance_control).not_to be_valid
@@ -24,9 +21,21 @@ RSpec.describe ComplianceControl, type: :model do
     expect(compliance_control).not_to be_valid
   end
 
+  it 'should validate_presence_of code' do
+    compliance_control.code = nil
+    expect(compliance_control).not_to be_valid
+  end
+
+  it 'should validate_presence_of origin_code' do
+    compliance_control.origin_code = nil
+    expect(compliance_control).not_to be_valid
+  end
+
   #TODO dont know why the 'shortcuts' below to validates presence dont work
   # That's why we dont it 'manually'
   # 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