Merge pull request #2032 from alphagov/avoid-rescuing-argument-error-in-next-node-blocks

Avoid rescuing argument error in next node blocks

Author: chrisroos

lib/smart_answer/flow.rb

@@ -125,7 +125,7 @@ def process(responses)
         begin
           state = node(state.current_node).transition(state, response)
           node(state.current_node).evaluate_precalculations(state)
-        rescue ArgumentError, InvalidResponse => e
+        rescue InvalidResponse => e
           state.dup.tap do |new_state|
             new_state.error = e.message
             new_state.freeze

lib/smart_answer/question/value.rb

@@ -10,15 +10,15 @@ def parse_input(raw_input)
         if Integer == @parse
           begin
             Integer(raw_input)
-          rescue TypeError
+          rescue TypeError, ArgumentError
             raise InvalidResponse
           end
         elsif :to_i == @parse
           raw_input.to_i
         elsif Float == @parse
           begin
             Float(raw_input)
-          rescue TypeError
+          rescue TypeError, ArgumentError
             raise InvalidResponse
           end
         elsif :to_f == @parse

test/unit/value_question_test.rb

@@ -31,12 +31,12 @@ class ValueQuestionTest < ActiveSupport::TestCase
         assert_equal 123, new_state.myval
       end
 
-      should "raise ArgumentError for non-integer value" do
-        assert_raises(ArgumentError) { @q.transition(@initial_state, "1.5") }
+      should "raise InvalidResponse for non-integer value" do
+        assert_raises(InvalidResponse) { @q.transition(@initial_state, "1.5") }
       end
 
-      should "raise ArgumentError for blank value" do
-        assert_raises(ArgumentError) { @q.transition(@initial_state, "") }
+      should "raise InvalidResponse for blank value" do
+        assert_raises(InvalidResponse) { @q.transition(@initial_state, "") }
       end
 
       should "raise InvalidResponse for nil value" do
@@ -81,12 +81,12 @@ class ValueQuestionTest < ActiveSupport::TestCase
         assert_equal 1.23, new_state.myval
       end
 
-      should "raise ArgumentError for non-float value" do
-        assert_raises(ArgumentError) { @q.transition(@initial_state, "not-a-float") }
+      should "raise InvalidResponse for non-float value" do
+        assert_raises(InvalidResponse) { @q.transition(@initial_state, "not-a-float") }
       end
 
-      should "raise ArgumentError for blank value" do
-        assert_raises(ArgumentError) { @q.transition(@initial_state, "") }
+      should "raise InvalidResponse for blank value" do
+        assert_raises(InvalidResponse) { @q.transition(@initial_state, "") }
       end
 
       should "raise InvalidResponse for nil value" do