Refs #5415 fix ComplianceControl#show for controls which dont have dynamic attributes

2 files changed, 11 insertions, 1 deletions

diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 3fcf26f5d..2bde5b95a 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -6,7 +6,7 @@ class ComplianceControl < ActiveRecord::Base
     def prerequisite; I18n.t('compliance_controls.metas.no_prerequisite'); end
     def predicate; I18n.t("compliance_controls.#{self.name.underscore}.description") end
     def dynamic_attributes
-      stored_attributes[:control_attributes]
+      stored_attributes[:control_attributes] || []
     end
 
     def policy_class
diff --git a/spec/models/compliance_control_spec.rb b/spec/models/compliance_control_spec.rb
index 4267459ea..5cffba58d 100644
--- a/spec/models/compliance_control_spec.rb
+++ b/spec/models/compliance_control_spec.rb
@@ -1,5 +1,15 @@
 RSpec.describe ComplianceControl, type: :model do
 
+  context 'dynamic attributes' do
+    let(:compliance_control1) { build_stubbed :compliance_control }
+    let(:compliance_control2) { build_stubbed :compliance_control, type: 'VehicleJouneyControl::TimeTable' }
+
+    it 'should always return a array' do
+       expect(compliance_control1.class.dynamic_attributes).to be_kind_of Array
+       expect(compliance_control2.class.dynamic_attributes).to be_kind_of Array
+    end
+  end
+
   context 'standard validation' do
 
     let(:compliance_control) { build_stubbed :compliance_control }