Merge branch 'master' into staging

2 files changed, 8 insertions, 5 deletions

diff --git a/spec/models/compliance_control_validations/genric_attribute_validation/min_max_validation_spec.rb b/spec/models/compliance_control_validations/genric_attribute_validation/min_max_validation_spec.rb
index 276d09a92..4d30d61e3 100644
--- a/spec/models/compliance_control_validations/genric_attribute_validation/min_max_validation_spec.rb
+++ b/spec/models/compliance_control_validations/genric_attribute_validation/min_max_validation_spec.rb
@@ -1,8 +1,8 @@
-# RSpec.describe GenericAttributeControl::MinMax do
+RSpec.describe GenericAttributeControl::MinMax do
 
-#   let( :factory ){ :generic_attribute_control_min_max }
-#   subject{ build factory }
+  let( :factory ){ :generic_attribute_control_min_max }
+  subject{ build factory }
 
-#   it_behaves_like 'has min_max_values'
+  it_behaves_like 'has min_max_values'
 
-# end
+end
diff --git a/spec/models/import_spec.rb b/spec/models/import_spec.rb
index cd5a30982..c06d05dab 100644
--- a/spec/models/import_spec.rb
+++ b/spec/models/import_spec.rb
@@ -10,6 +10,9 @@ RSpec.describe Import, type: :model do
   it { should validate_presence_of(:workbench) }
   it { should validate_presence_of(:creator) }
 
+  it { should allow_value('file.zip').for(:file).with_message(I18n.t('activerecord.errors.models.imports.wrong_file_extension')) }
+  it { should_not allow_values('file.json', 'file.png', 'file.pdf').for(:file) }
+
   let(:workbench_import) { build_stubbed(:workbench_import) }
   let(:workbench_import_with_completed_steps) do
     workbench_import = build_stubbed(