Merge branch 'main' into id45-session-cli

Author: karlnaden

dev_suites/dev_demo_ig_stu1/demo_suite.rb

@@ -239,7 +239,7 @@ class DemoSuite < Inferno::TestSuite
           identifier = 'abc'
           url_suffix = "?xyz=#{identifier}"
           wait_test_url = "#{config.options[:wait_test_url]}#{url_suffix}"
-          wait_test_fail_url = "#{config.options[:wait_test_fail_url]}#{url_suffix}"
+          wait_test_fail_url = "#{config.options[:wait_test_fail_url]}#{url_suffix}&message=User%20clicked%20fail"
           wait_test_skip_url = "#{config.options[:wait_test_skip_url]}#{url_suffix}"
           wait_test_omit_url = "#{config.options[:wait_test_omit_url]}#{url_suffix}"
           wait_test_cancel_url = "#{config.options[:wait_test_cancel_url]}#{url_suffix}"

lib/inferno/dsl/resume_test_route.rb

@@ -44,8 +44,8 @@ def find_waiting_result(test_run)
       end
 
       # @private
-      def update_result(waiting_result)
-        results_repo.update_result(waiting_result.id, result)
+      def update_result(waiting_result, message)
+        results_repo.update_result(waiting_result.id, result, message)
       end
 
       # @private
@@ -80,6 +80,7 @@ def handle(req, res)
         request = Inferno::Entities::Request.from_hanami_request(req)
 
         test_run_identifier = instance_exec(request, &test_run_identifier_block)
+        result_message = request.query_parameters['message']
 
         test_run = find_test_run(test_run_identifier)
 
@@ -90,7 +91,7 @@ def handle(req, res)
         waiting_result = find_waiting_result(test_run)
         test = find_test(waiting_result)
 
-        update_result(waiting_result)
+        update_result(waiting_result, result_message)
         persist_request(request, test_run, waiting_result, test)
 
         Jobs.perform(Jobs::ResumeTestRun, test_run.id)

spec/inferno/dsl/runnable_spec.rb

@@ -109,6 +109,15 @@
 
         expect(updated_result.result).to eq('cancel')
       end
+
+      it 'includes a result_message when specified' do
+        get '/custom/demo/resume_fail?xyz=IDENTIFIER&message=failure%20reason'
+
+        updated_result = Inferno::Repositories::Results.new.find(result.id)
+
+        expect(updated_result.result).to eq('fail')
+        expect(updated_result.result_message).to eq('failure reason')
+      end
     end
   end