aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert2017-10-16 09:51:02 +0200
committerRobert2017-10-16 12:39:26 +0200
commit87e4f61382968c7029192edaa52e74a961b490d6 (patch)
tree16dc9ee6a8574e5f18f420d1fb8bedeac8d30582
parent3d69e36539cee8796f9da2a981ba3c6b5e535e9f (diff)
downloadchouette-core-87e4f61382968c7029192edaa52e74a961b490d6.tar.bz2
Refs: #4728@0.25h; Validation hstore presence, seems ok
-rw-r--r--app/models/generic_attribute_control/pattern.rb4
-rw-r--r--spec/models/compliance_control_validations/genric_attribute_validation/pattern_validation_spec.rb1
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/generic_attribute_control/pattern.rb b/app/models/generic_attribute_control/pattern.rb
index d59f211dc..027d6948e 100644
--- a/app/models/generic_attribute_control/pattern.rb
+++ b/app/models/generic_attribute_control/pattern.rb
@@ -2,8 +2,8 @@ module GenericAttributeControl
class Pattern < ComplianceControl
hstore_accessor :control_attributes, pattern: :string, target: :string
- #validates :target, presence: true
- #validates :pattern, presence: true
+ validates :target, presence: true
+ validates :pattern, presence: true
class << self
def attribute_type; :string end
diff --git a/spec/models/compliance_control_validations/genric_attribute_validation/pattern_validation_spec.rb b/spec/models/compliance_control_validations/genric_attribute_validation/pattern_validation_spec.rb
index f2814bfd4..93140725a 100644
--- a/spec/models/compliance_control_validations/genric_attribute_validation/pattern_validation_spec.rb
+++ b/spec/models/compliance_control_validations/genric_attribute_validation/pattern_validation_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe GenericAttributeControl::Pattern do
context "is valid" do
it 'if the pattern contains a basic regex' do
subject.pattern = 'hel+o?'
+ subject.target = 'world'
expect_it.to be_valid
end
end