inferno_core 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20fc2d3e3d1a42d30682916011622f3827b809089883dc591f799bfbf334b1f8
-  data.tar.gz: f606bb9364a4e08b29754706692fc1e525e3592c2c01490183574673201ee1be
+  metadata.gz: 669dde4b0ad34993f363e538ed2d7eae59d4211f0b988a7e6306231fd54d74c0
+  data.tar.gz: 5149b96b6931d27a41cd0c3b0a5665024b297c6d8e612e574582cb630ef29867
 SHA512:
-  metadata.gz: 271a59774aa21e093feace017269194676539e0685d87805fdca2c409d1de568cbd99147c16e9484ce416ac32fe1db2c22d323178db5729b52e11e616dbf07db
-  data.tar.gz: eca623df2965155c9b4867c426e75fba81758214495160afd8236ada7e6930fda72cab708561673c2daffd45045fb3fa8994e7d2b7194272eb543f9664cf6018
+  metadata.gz: d5a839c224c59795ab5f79fdd18de124ba6eae8d2cdf60c1afeae4f7bf091ac1a0321ff97e7939753de1d05441df1152929e3d3ba2e743d9777ea39fc0603806
+  data.tar.gz: 602ac59a4417b6751d3e661d15ac55f4d7ac2f2ee171b9ac284637b3d4693f36ae85f09fbd63011fa570609dd1c8f54c7ee5c35fa28f1c909185bec2b28f0234

data/lib/inferno/apps/web/controllers/test_runs/create.rb

@@ -59,7 +59,7 @@ module Inferno
 
             test_run = repo.create(create_params(params).merge(status: 'queued'))
 
-            self.body = serialize(test_run)
+            self.body = serialize(test_run, suite_options: test_session.suite_options)
 
             persist_inputs(params, test_run)
 

data/lib/inferno/apps/web/controllers/test_runs/show.rb

@@ -3,6 +3,8 @@ module Inferno
     module Controllers
       module TestRuns
         class Show < Controller
+          include Import[test_sessions_repo: 'repositories.test_sessions']
+
           def call(params)
             test_run = repo.find(params[:id])
             halt 404 if test_run.nil?
@@ -17,7 +19,8 @@ module Inferno
                 end
             end
 
-            self.body = serialize(test_run)
+            test_session = test_sessions_repo.find(test_run.test_session_id)
+            self.body = serialize(test_run, suite_options: test_session.suite_options)
           end
         end
       end

data/lib/inferno/apps/web/serializers/test_group.rb

@@ -10,11 +10,13 @@ module Inferno
         field :description
         field :short_description
         field :input_instructions
-        field :test_count
         field :run_as_group?, name: :run_as_group
         field :user_runnable?, name: :user_runnable
         field :optional?, name: :optional
 
+        field :test_count do |group, options|
+          group.test_count(options[:suite_options])
+        end
         field :test_groups do |group, options|
           suite_options = options[:suite_options]
           TestGroup.render_as_hash(group.groups(suite_options), suite_options: suite_options)

data/lib/inferno/apps/web/serializers/test_run.rb

@@ -6,7 +6,9 @@ module Inferno
         field :test_session_id
 
         field :status
-        field :test_count
+        field :test_count do |test_run, options|
+          test_run.test_count(options[:suite_options])
+        end
 
         field :test_group_id, if: :field_present?
         field :test_suite_id, if: :field_present?

data/lib/inferno/apps/web/serializers/test_suite.rb

@@ -9,9 +9,13 @@ module Inferno
           field :description
           field :short_description
           field :input_instructions
-          field :test_count
           field :version
           field :links
+
+          field :test_count do |suite, options|
+            suite.test_count(options[:suite_options])
+          end
+
           association :suite_options, blueprint: SuiteOption
           association :presets, view: :summary, blueprint: Preset
         end

data/lib/inferno/entities/test_run.rb

@@ -68,8 +68,8 @@ module Inferno
         super.merge(test_session: test_session).compact
       end
 
-      def test_count
-        @test_count ||= runnable.test_count
+      def test_count(selected_suite_options = [])
+        @test_count ||= runnable.test_count(selected_suite_options)
       end
     end
   end