inferno_core 0.3.3 → 0.3.6

data/lib/inferno/repositories/presets.rb

@@ -1,3 +1,5 @@
+require 'erb'
+
 require_relative 'in_memory_repository'
 require_relative '../entities/preset'
 
@@ -6,7 +8,14 @@ module Inferno
     # Repository that deals with persistence for the `Preset` entity.
     class Presets < InMemoryRepository
       def insert_from_file(path)
-        preset_hash = JSON.parse(File.read(path))
+        case path
+        when /\.json$/
+          preset_hash = JSON.parse(File.read(path))
+        when /\.erb$/
+          templated = ERB.new(File.read(path)).result
+          preset_hash = JSON.parse(templated)
+        end
+
         preset_hash.deep_symbolize_keys!
         preset_hash[:id] ||= SecureRandom.uuid
         preset = Entities::Preset.new(preset_hash)

data/lib/inferno/repositories/test_sessions.rb

@@ -19,6 +19,18 @@ module Inferno
         }
       end
 
+      def create(params)
+        raw_suite_options = params[:suite_options]
+        suite_options =
+          if raw_suite_options.blank?
+            '[]'
+          else
+            JSON.generate(raw_suite_options.map(&:to_hash))
+          end
+
+        super(params.merge(suite_options: suite_options))
+      end
+
       def results_for_test_session(test_session_id)
         test_session_hash =
           self.class::Model
@@ -37,6 +49,18 @@ module Inferno
         end
       end
 
+      def build_entity(params)
+        suite_options = JSON.parse(params[:suite_options] || '[]').map do |suite_option_hash|
+          suite_option_hash.deep_symbolize_keys!
+          suite_option_hash[:id] = suite_option_hash[:id].to_sym
+          DSL::SuiteOption.new(suite_option_hash)
+        end
+
+        final_params = params.merge(suite_options: suite_options)
+        add_non_db_entities(final_params)
+        entity_class.new(final_params)
+      end
+
       class Model < Sequel::Model(db)
         include Import[test_suites_repo: 'repositories.test_suites']
 

data/lib/inferno/test_runner.rb

@@ -62,7 +62,13 @@ module Inferno
       inputs = load_inputs(test)
       input_json_string = inputs_as_json(test, inputs)
 
-      test_instance = test.new(inputs: inputs, test_session_id: test_session.id, scratch: scratch)
+      test_instance =
+        test.new(
+          inputs: inputs,
+          test_session_id: test_session.id,
+          scratch: scratch,
+          suite_options: test_session.suite_options_hash
+        )
 
       result = begin
         raise Exceptions::CancelException, 'Test cancelled by user' if test_run_is_cancelling
@@ -118,7 +124,7 @@ module Inferno
       end
 
       results = []
-      group.children.each do |child|
+      group.children(test_session.suite_options).each do |child|
         result = run(child, scratch)
         results << result
         break if results.last.waiting?
@@ -137,7 +143,7 @@ module Inferno
     def update_parent_result(parent)
       return if parent.nil?
 
-      children = parent.children
+      children = parent.children(test_session.suite_options)
       child_results = results_repo.current_results_for_test_session_and_runnables(test_session.id, children)
       required_children = children.select(&:required?)
       required_results = child_results.select(&:required?)

data/lib/inferno/version.rb

@@ -1,4 +1,4 @@
 module Inferno
   # Standard patterns for gem versions: https://guides.rubygems.org/patterns/
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.3.6'.freeze
 end

data/spec/support/factory_bot.rb

@@ -16,6 +16,12 @@ class CreateStrategy
 
     result
   end
+
+  # breaking change in factory_bot 6.2.1
+  # https://github.com/thoughtbot/factory_bot/issues/1536
+  def to_sym
+    :repo_create
+  end
 end
 
 FactoryBot.register_strategy(:repo_create, CreateStrategy)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inferno_core
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.6
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -68,6 +68,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: dry-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: dry-system
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +110,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: fhir_client
   requirement: !ruby/object:Gem::Requirement
@@ -492,6 +520,7 @@ files:
 - lib/inferno/apps/web/serializers/result.rb
 - lib/inferno/apps/web/serializers/serializer.rb
 - lib/inferno/apps/web/serializers/session_data.rb
+- lib/inferno/apps/web/serializers/suite_option.rb
 - lib/inferno/apps/web/serializers/test.rb
 - lib/inferno/apps/web/serializers/test_group.rb
 - lib/inferno/apps/web/serializers/test_run.rb
@@ -511,6 +540,7 @@ files:
 - lib/inferno/db/migrations/004_add_request_results_table.rb
 - lib/inferno/db/migrations/005_add_updated_at_index_to_results.rb
 - lib/inferno/db/migrations/006_remove_unused_tables.rb
+- lib/inferno/db/migrations/007_add_suite_options.rb
 - lib/inferno/db/schema.rb
 - lib/inferno/dsl.rb
 - lib/inferno/dsl/assertions.rb
@@ -526,6 +556,8 @@ files:
 - lib/inferno/dsl/results.rb
 - lib/inferno/dsl/resume_test_route.rb
 - lib/inferno/dsl/runnable.rb
+- lib/inferno/dsl/suite_option.rb
+- lib/inferno/dsl/tcp_exception_handler.rb
 - lib/inferno/entities.rb
 - lib/inferno/entities/attributes.rb
 - lib/inferno/entities/entity.rb