Fix: must select to create or select samples in boxes#new

Author: ysbaddaden

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
 

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