inferno_core 0.0.5 → 0.0.6

data/lib/inferno/repositories/test_runs.rb

@@ -13,6 +13,14 @@ module Inferno
         }
       end
 
+      def build_entity(params)
+        super.tap do |test_run|
+          test_run&.results&.map! do |result|
+            result.is_a?(Entities::Result) ? result : Entities::Result.new(result)
+          end
+        end
+      end
+
       def results_for_test_run(test_run_id)
         test_run_hash =
           self.class::Model
@@ -107,6 +115,13 @@ module Inferno
           super
         end
       end
+
+      def active_test_run_for_session?(test_session_id)
+        self.class::Model
+          .where(test_session_id: test_session_id)
+          .exclude(status: 'done')
+          .count.positive?
+      end
     end
   end
 end

data/lib/inferno/test_runner.rb

@@ -1,6 +1,9 @@
+require_relative './utils/markdown_formatter'
+
 module Inferno
   # @api private
   class TestRunner
+    include Inferno::Utils::MarkdownFormatter
     attr_reader :test_session, :test_run, :resuming
 
     def initialize(test_session:, test_run:, resume: false)
@@ -35,13 +38,13 @@ module Inferno
       run_results.values
     end
 
-    def run(runnable)
+    def run(runnable, scratch = {})
       if runnable < Entities::Test
-        return existing_test_result(runnable) || run_test(runnable) if resuming
+        return existing_test_result(runnable) || run_test(runnable, scratch) if resuming
 
-        run_test(runnable)
+        run_test(runnable, scratch)
       else
-        run_group(runnable)
+        run_group(runnable, scratch)
       end
     end
 
@@ -49,22 +52,22 @@ module Inferno
       results_repo.result_for_test_run(runnable.reference_hash.merge(test_run_id: test_run.id))
     end
 
-    def run_test(test)
+    def run_test(test, scratch)
       inputs = load_inputs(test)
 
       input_json_string = JSON.generate(inputs)
-      test_instance = test.new(inputs: inputs, test_session_id: test_session.id)
+      test_instance = test.new(inputs: inputs, test_session_id: test_session.id, scratch: scratch)
 
       result = begin
         test_instance.load_named_requests
         test_instance.instance_eval(&test.block)
         'pass'
       rescue Exceptions::TestResultException => e
-        test_instance.result_message = e.message
+        test_instance.result_message = format_markdown(e.message)
         e.result
       rescue StandardError => e
         Application['logger'].error(e.full_message)
-        test_instance.result_message = "Error: #{e.message}"
+        test_instance.result_message = format_markdown("Error: #{e.message}\n\n#{e.backtrace.first}")
         'error'
       end
 
@@ -95,10 +98,10 @@ module Inferno
       test_result
     end
 
-    def run_group(group)
+    def run_group(group, scratch)
       results = []
       group.children.each do |child|
-        result = run(child)
+        result = run(child, scratch)
         results << result
         break if results.last.waiting?
       end
@@ -132,26 +135,25 @@ module Inferno
     end
 
     def load_inputs(runnable)
-      runnable.inputs.each_with_object({}) do |input, input_hash|
-        name = input[:name]
-        input_hash[name] = session_data_repo.load(test_session_id: test_session.id, name: name)
+      runnable.inputs.each_with_object({}) do |input_identifier, input_hash|
+        input_alias = runnable.config.input_name(input_identifier)
+        input_hash[input_identifier] = session_data_repo.load(test_session_id: test_session.id, name: input_alias)
       end
     end
 
     def save_outputs(runnable_instance)
       outputs =
-        runnable_instance.outputs.map do |output_name|
+        runnable_instance.outputs_to_persist.map do |output_identifier, value|
           {
-            name: output_name,
-            value: runnable_instance.send(output_name)
+            name: runnable_instance.class.config.output_name(output_identifier),
+            value: value
           }
         end
+
       outputs.compact!
       outputs.each do |output|
         session_data_repo.save(output.merge(test_session_id: test_session.id))
       end
-
-      outputs
     end
 
     def persist_result(params)

data/lib/inferno/utils/markdown_formatter.rb

@@ -0,0 +1,15 @@
+module Inferno
+  module Utils
+    # @api private
+    module MarkdownFormatter
+      def format_markdown(markdown) # rubocop:disable Metrics/CyclomaticComplexity
+        lines = markdown.lines
+
+        return markdown if lines.any? { |line| line.match?(/^\S/) }
+
+        natural_indent = lines.collect { |l| l.index(/[^ ]/) }.select { |l| !l.nil? && l.positive? }.min || 0
+        markdown.lines.map { |l| l[natural_indent..] || "\n" }.join
+      end
+    end
+  end
+end

data/lib/inferno/version.rb

@@ -1,3 +1,3 @@
 module Inferno
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

data/spec/factories/request.rb

@@ -12,6 +12,20 @@ FactoryBot.define do
     name { nil }
     status { 200 }
     direction { 'outgoing' }
+    headers do
+      [
+        {
+          type: 'request',
+          name: 'Request-Header',
+          value: 'REQUEST HEADER VALUE'
+        },
+        {
+          type: 'response',
+          name: 'Response-Header',
+          value: 'RESPONSE HEADER VALUE'
+        }
+      ]
+    end
 
     request_body { nil }
 
@@ -24,12 +38,5 @@ FactoryBot.define do
     to_create do |instance|
       Inferno::Repositories::Requests.new.create(instance.to_hash)
     end
-
-    after(:create) do |instance, evaluator|
-      instance.instance_variable_set(
-        :@headers,
-        repo_create_list(:header, evaluator.header_count, request_id: instance.index)
-      )
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inferno_core
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -445,6 +445,7 @@ files:
 - lib/inferno/apps/web/controllers/test_suites/show.rb
 - lib/inferno/apps/web/index.html.erb
 - lib/inferno/apps/web/router.rb
+- lib/inferno/apps/web/serializers/hash_value_extractor.rb
 - lib/inferno/apps/web/serializers/header.rb
 - lib/inferno/apps/web/serializers/input.rb
 - lib/inferno/apps/web/serializers/message.rb
@@ -472,6 +473,7 @@ files:
 - lib/inferno/db/schema.rb
 - lib/inferno/dsl.rb
 - lib/inferno/dsl/assertions.rb
+- lib/inferno/dsl/configurable.rb
 - lib/inferno/dsl/fhir_client.rb
 - lib/inferno/dsl/fhir_client_builder.rb
 - lib/inferno/dsl/fhir_validation.rb
@@ -522,6 +524,7 @@ files:
 - lib/inferno/repositories/validate_runnable_reference.rb
 - lib/inferno/spec_support.rb
 - lib/inferno/test_runner.rb
+- lib/inferno/utils/markdown_formatter.rb
 - lib/inferno/utils/middleware/request_logger.rb
 - lib/inferno/version.rb
 - spec/factories/header.rb