Merge pull request #1914 from instedd/fix/1910-box-form-errors

Fixes issues with boxes#new form

Author: ysbaddaden

app/helpers/cdx_form_helper.rb

@@ -123,9 +123,9 @@ def log_unhandled_errors
     end
 
     Rails.logger.info "Unhandled form errors in #{@object.model_name}: #{unhandled_errors}"
-    Raven.capture_message("Unhandled form errors",
+    Raven.capture_message("Unhandled form errors", extra: {
       form: @object.model_name,
       errors: unhandled_errors,
-    )
+    })
   end
 end

app/models/box.rb

@@ -30,7 +30,7 @@ def self.entity_scope
   attribute_field :purpose, copy: true
 
   validates_presence_of :purpose
-  validates_inclusion_of :purpose, in: ->(_) { Box.purposes }
+  validates_inclusion_of :purpose, in: ->(_) { Box.purposes }, allow_blank: true
   validates_associated :samples
 
   scope :count_samples, -> {

app/models/box_form.rb

@@ -131,13 +131,13 @@ def validate_batches_or_samples_for_purpose
     case @option
     when "add_batches"
       case @box.purpose
-      when "LOD", "Other"
-        @box.errors.add(:base, "A batch is required") unless unique_batch_count >= 1
       when "Variants"
         @box.errors.add(:base, "You must select at least two different batches") unless unique_batch_count >= 2
       when "Challenge"
         @box.errors.add(:base, "You must select at least one non-distractor batch") unless have_virus_batch?
         @box.errors.add(:base, "You must select at least one distractor batch") unless have_distractor_batch?
+      else
+        @box.errors.add(:base, "A batch is required") unless unique_batch_count >= 1
       end
     when "add_samples"
       if @samples.empty?
@@ -153,6 +153,8 @@ def validate_batches_or_samples_for_purpose
           @box.errors.add(:base, "You must select at least one distractor sample") unless have_distractor_sample?
         end
       end
+    else
+      @box.errors.add(:base, "You must create or select samples")
     end
   end
 

app/views/boxes/_form.haml

@@ -7,6 +7,7 @@
         .col
           = cdx_select form: f, name: :purpose, searchable: false, :class => 'input-large' do |select|
             - select.items Box.purposes
+          = f.field_errors :purpose
 
       = f.form_field :media do
         = cdx_select form: f, name: :media, searchable: false, class: "input-large" do |select|

spec/controllers/boxes_controller_spec.rb

@@ -442,6 +442,13 @@ def expect_samples(batch, concentrations: [1], replicates:)
         end.to change(institution.boxes, :count).by(0)
       end
     end
+
+    it "validates option" do
+      expect do
+        post :create, params: { box: { purpose: "Other", option: "" } }
+        expect(response).to have_http_status(:unprocessable_entity)
+      end.to change(institution.boxes, :count).by(0)
+    end
   end
 
   describe "destroy" do