inferno_core 0.4.37.dev → 0.4.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccd64a44d96c18439d7d844bd6ec467d9eb0c23d5964b0928539fd70a0e806f0
-  data.tar.gz: b72e0ac46e7aca9d496fe23f6b89537c4a5c2054acc20690e089dc17d3d2528d
+  metadata.gz: 5fad068333ba8fce867afba323937728da89231ded560129675318866059975a
+  data.tar.gz: d231cf80975b781b0584c5bb2b4677e1493eaba2fa6469ffca490e113d46ba08
 SHA512:
-  metadata.gz: 33d89c3291db6f4bfaf92b704eb13177b961e49b2b5c9c358661e062bde12f0eb00f5ab55e91945e089a7d2d83a13002926153c53b75b30b1a18926b69791496
-  data.tar.gz: b6878fd8a73f017dccf8f027ac1ddfb7811a122f287a55ea6fe393b7e4d5dd0f2885d4e55d1a540f6bd5ec723619af8c00bdb8d633fd3ce187f9dd0d63790a97
+  metadata.gz: 34c983546c7ea05443d9edde97e59d9c9dab2e1848271eefb4f888ff58cafc1219541de91634250ae4831162689cdd9e1e8f043735bc0fe6e495c86eb3a1bf41
+  data.tar.gz: 2208622633268affb624426a91f4d6b7feed45cd7eac97dbad7c750c22169d7c08c5297fa96f8be86d13785faccf9966ad328b700528bcce0d2b8c6ba9cf97d1

data/lib/inferno/dsl/resume_test_route.rb

@@ -1,4 +1,4 @@
-require 'hanami/controller'
+require_relative 'suite_endpoint'
 
 module Inferno
   module DSL
@@ -6,58 +6,47 @@ module Inferno
     # an incoming request.
     # @private
     # @see Inferno::DSL::Runnable#resume_test_route
-    class ResumeTestRoute < Hanami::Action
-      include Import[
-                requests_repo: 'inferno.repositories.requests',
-                results_repo: 'inferno.repositories.results',
-                test_runs_repo: 'inferno.repositories.test_runs',
-                tests_repo: 'inferno.repositories.tests'
-              ]
-
-      def self.call(...)
-        new.call(...)
+    class ResumeTestRoute < SuiteEndpoint
+      # The incoming request
+      #
+      # @return [Inferno::Entities::Request]
+      def request
+        @request ||= Inferno::Entities::Request.from_hanami_request(req)
       end
 
       # @private
-      def test_run_identifier_block
-        self.class.singleton_class.instance_variable_get(:@test_run_identifier_block)
+      def test_run_identifier
+        @test_run_identifier ||= instance_exec(request, &test_run_identifier_block)
       end
 
       # @private
       def tags
-        self.class.singleton_class.instance_variable_get(:@tags)
+        self.class.singleton_class.instance_variable_get(:@tags) || []
       end
 
       # @private
-      def result
-        self.class.singleton_class.instance_variable_get(:@result)
+      def update_result
+        results_repo.update_result(result.id, new_result)
       end
 
       # @private
-      def find_test_run(test_run_identifier)
-        test_runs_repo.find_latest_waiting_by_identifier(test_run_identifier)
+      def make_response
+        res.redirect_to redirect_route(test_run, test)
       end
 
       # @private
-      def find_waiting_result(test_run)
-        results_repo.find_waiting_result(test_run_id: test_run.id)
+      def name
+        test.config.request_name(test.incoming_request_name)
       end
 
       # @private
-      def update_result(waiting_result)
-        results_repo.update_result(waiting_result.id, result)
+      def test_run_identifier_block
+        self.class.singleton_class.instance_variable_get(:@test_run_identifier_block)
       end
 
       # @private
-      def persist_request(request, test_run, waiting_result, test)
-        requests_repo.create(
-          request.to_hash.merge(
-            test_session_id: test_run.test_session_id,
-            result_id: waiting_result.id,
-            name: test.config.request_name(test.incoming_request_name),
-            tags:
-          )
-        )
+      def new_result
+        self.class.singleton_class.instance_variable_get(:@new_result)
       end
 
       # @private
@@ -65,38 +54,10 @@ module Inferno
         "#{Application['base_url']}/test_sessions/#{test_run.test_session_id}##{resume_ui_at_id(test_run, test)}"
       end
 
-      # @private
-      def find_test(waiting_result)
-        tests_repo.find(waiting_result.test_id)
-      end
-
       # @private
       def resume_ui_at_id(test_run, test)
         test_run.test_suite_id || test_run.test_group_id || test.parent.id
       end
-
-      # @private
-      def handle(req, res)
-        request = Inferno::Entities::Request.from_hanami_request(req)
-
-        test_run_identifier = instance_exec(request, &test_run_identifier_block)
-
-        test_run = find_test_run(test_run_identifier)
-
-        halt 500, "Unable to find test run with identifier '#{test_run_identifier}'." if test_run.nil?
-
-        test_runs_repo.mark_as_no_longer_waiting(test_run.id)
-
-        waiting_result = find_waiting_result(test_run)
-        test = find_test(waiting_result)
-
-        update_result(waiting_result)
-        persist_request(request, test_run, waiting_result, test)
-
-        Jobs.perform(Jobs::ResumeTestRun, test_run.id)
-
-        res.redirect_to redirect_route(test_run, test)
-      end
     end
   end
 end

data/lib/inferno/dsl/runnable.rb

@@ -343,7 +343,7 @@ module Inferno
         route_class = Class.new(ResumeTestRoute) do |klass|
           klass.singleton_class.instance_variable_set(:@test_run_identifier_block, block)
           klass.singleton_class.instance_variable_set(:@tags, tags)
-          klass.singleton_class.instance_variable_set(:@result, result)
+          klass.singleton_class.instance_variable_set(:@new_result, result)
         end
 
         route(method, path, route_class)

data/lib/inferno/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inferno_core
 version: !ruby/object:Gem::Version
-  version: 0.4.37.dev
+  version: 0.4.37
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-18 00:00:00.000000000 Z
+date: 2024-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -755,7 +755,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Inferno Core is an open source tool for testing data exchanges enabled by