multilist: fix min validation when both min and max specified

Author: sveinn

lib/tty/prompt/multi_list.rb

@@ -45,7 +45,7 @@ def max(value)
       def keyenter(*)
         valid = true
         valid = @min <= @selected.size if @min
-        valid = @selected.size <= @max if @max
+        valid &= @selected.size <= @max if @max
 
         super if valid
       end

spec/unit/multi_select_spec.rb

@@ -17,8 +17,12 @@ def output_helper(prompt, choices, active, selected, options = {})
     out = []
     out << "\e[?25l" if init
     out << prompt << " "
-    out << "(min. #{options[:min]}) " if options[:min]
-    out << "(max. #{options[:max]}) " if options[:max]
+    if options[:min] && options[:max]
+      out << "(min. #{options[:min]}, max. #{options[:max]}) "
+    else
+      out << "(min. #{options[:min]}) " if options[:min]
+      out << "(max. #{options[:max]}) " if options[:max]
+    end
     out << selected.join(", ")
     out << " " if (init || hint) && !selected.empty?
     out << "\e[90m(#{hint})\e[0m" if hint
@@ -905,4 +909,32 @@ def exit_message(prompt, choices)
       expect(prompt.output.string).to eq(expected_output)
     end
   end
+
+  context "with :min and :max" do
+    let(:choices) { %w[A B C] }
+    let(:keydown) { "j" }
+    let(:spacebar) { " " }
+    let(:enter) { "\r" }
+    before do
+      prompt.on(:keypress) { |e| prompt.trigger(:keydown) if e.value == keydown }
+    end
+    it "requires a min number of choices" do
+      prompt.input << spacebar << enter << keydown << spacebar << enter
+      prompt.input.rewind
+
+      value = prompt.multi_select("What letter?", choices, min: 2, max: 2, per_page: choices.count)
+      expect(value).to eq(%w[A B])
+
+      expected_output =
+        output_helper("What letter?", choices, "A", [], init: true, min: 2, max: 2,
+          hint: "Press #{up_down} arrow to move, Space to select and Enter to finish") +
+        output_helper("What letter?", choices, "A", %w[A], min: 2, max: 2) +
+        output_helper("What letter?", choices, "A", %w[A], min: 2, max: 2) +
+        output_helper("What letter?", choices, "B", %w[A], min: 2, max: 2) +
+        output_helper("What letter?", choices, "B", %w[A B], min: 2, max: 2) +
+        exit_message("What letter?", %w[A B])
+
+      expect(prompt.output.string).to eq(expected_output)
+    end
+  end
 end