inferno_core 0.3.11 → 0.4.0

data/lib/inferno/dsl/resume_test_route.rb

@@ -1,4 +1,4 @@
-require 'hanami-controller'
+require 'hanami/controller'
 
 module Inferno
   module DSL
@@ -6,44 +6,40 @@ module Inferno
     # an incoming request.
     # @private
     # @see Inferno::DSL::Runnable#resume_test_route
-    class ResumeTestRoute
-      include Hanami::Action
+    class ResumeTestRoute < Hanami::Action
       include Import[
-                requests_repo: 'repositories.requests',
-                results_repo: 'repositories.results',
-                test_runs_repo: 'repositories.test_runs',
-                tests_repo: 'repositories.tests'
+                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(params)
-        new.call(params)
+      def self.call(...)
+        new.call(...)
       end
 
-      # The incoming request
-      #
-      # @return [Inferno::Entities::Request]
-      def request
-        @request ||= Inferno::Entities::Request.from_rack_env(@params.env)
+      # @private
+      def test_run_identifier_block
+        self.class.singleton_class.instance_variable_get(:@test_run_identifier_block)
       end
 
       # @private
-      def test_run
-        @test_run ||=
-          test_runs_repo.find_latest_waiting_by_identifier(test_run_identifier)
+      def find_test_run(test_run_identifier)
+        test_runs_repo.find_latest_waiting_by_identifier(test_run_identifier)
       end
 
       # @private
-      def waiting_result
-        @waiting_result ||= results_repo.find_waiting_result(test_run_id: test_run.id)
+      def find_waiting_result(test_run)
+        results_repo.find_waiting_result(test_run_id: test_run.id)
       end
 
       # @private
-      def update_result
+      def update_result(waiting_result)
         results_repo.pass_waiting_result(waiting_result.id)
       end
 
       # @private
-      def persist_request
+      def persist_request(request, test_run, waiting_result, test)
         requests_repo.create(
           request.to_hash.merge(
             test_session_id: test_run.test_session_id,
@@ -54,35 +50,41 @@ module Inferno
       end
 
       # @private
-      def redirect_route
-        "#{Application['base_url']}/test_sessions/#{test_run.test_session_id}##{resume_ui_at_id}"
+      def redirect_route(test_run, test)
+        "#{Application['base_url']}/test_sessions/#{test_run.test_session_id}##{resume_ui_at_id(test_run, test)}"
       end
 
       # @private
-      def test
-        @test ||= tests_repo.find(waiting_result.test_id)
+      def find_test(waiting_result)
+        tests_repo.find(waiting_result.test_id)
       end
 
       # @private
-      def resume_ui_at_id
+      def resume_ui_at_id(test_run, test)
         test_run.test_suite_id || test_run.test_group_id || test.parent.id
       end
 
       # @private
-      def call(_params)
-        if test_run.nil?
-          status(500, "Unable to find test run with identifier '#{test_run_identifier}'.")
-          return
-        end
+      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)
 
-        update_result
-        persist_request
+        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)
 
-        redirect_to redirect_route
+        res.redirect_to redirect_route(test_run, test)
       end
     end
   end

data/lib/inferno/dsl/runnable.rb

@@ -88,7 +88,7 @@ module Inferno
       # alias the method name they wish to use to define child entities to this
       # method.
       # @private
-      def define_child(*args, &block)
+      def define_child(*args, &)
         hash_args = process_args(args)
 
         klass = create_child_class(hash_args)
@@ -99,7 +99,7 @@ module Inferno
 
         configure_child_class(klass, hash_args)
 
-        handle_child_definition_block(klass, &block)
+        handle_child_definition_block(klass, &)
 
         klass.add_self_to_repository
 
@@ -190,8 +190,8 @@ module Inferno
       end
 
       # @private
-      def handle_child_definition_block(klass, &block)
-        klass.class_eval(&block) if block_given?
+      def handle_child_definition_block(klass, &)
+        klass.class_eval(&) if block_given?
       end
 
       # Set/Get a runnable's id
@@ -353,9 +353,8 @@ module Inferno
       #   {Inferno::Entities::Request} object with the information for the
       #   incoming request.
       def resume_test_route(method, path, &block)
-        route_class = Class.new(ResumeTestRoute) do
-          define_method(:test_run_identifier, &block)
-          define_method(:request_name, -> { options[:name] })
+        route_class = Class.new(ResumeTestRoute) do |klass|
+          klass.singleton_class.instance_variable_set(:@test_run_identifier_block, block)
         end
 
         route(method, path, route_class)
@@ -375,14 +374,18 @@ module Inferno
       #   app](http://sinatrarb.com/)) as described in the [Hanami Router
       #   documentation.](https://github.com/hanami/router/tree/f41001d4c3ee9e2d2c7bb142f74b43f8e1d3a265#mount-rack-applications)
       def route(method, path, handler)
-        Inferno.routes << { method: method, path: path, handler: handler, suite: suite }
+        Inferno.routes << { method:, path:, handler:, suite: }
       end
 
       # @private
       def test_count(selected_suite_options = [])
         @test_counts ||= {}
 
-        @test_counts[selected_suite_options] ||=
+        options_json = selected_suite_options.to_json
+
+        return @test_counts[options_json] if @test_counts[options_json]
+
+        @test_counts[options_json] =
           children(selected_suite_options)
             &.reduce(0) { |sum, child| sum + child.test_count(selected_suite_options) } || 0
       end
@@ -397,7 +400,7 @@ module Inferno
       def required_suite_options(suite_option_requirements)
         @suite_option_requirements =
           suite_option_requirements.map do |key, value|
-            DSL::SuiteOption.new(id: key, value: value)
+            DSL::SuiteOption.new(id: key, value:)
           end
       end
 

data/lib/inferno/entities/header.rb

@@ -35,13 +35,13 @@ module Inferno
 
       def to_hash
         {
-          id: id,
-          request_id: request_id,
-          type: type,
-          name: name,
-          value: value,
-          created_at: created_at,
-          updated_at: updated_at
+          id:,
+          request_id:,
+          type:,
+          name:,
+          value:,
+          created_at:,
+          updated_at:
         }.compact
       end
     end

data/lib/inferno/entities/request.rb

@@ -89,8 +89,8 @@ module Inferno
       # @return [Hash]
       def request
         {
-          verb: verb,
-          url: url,
+          verb:,
+          url:,
           headers: request_headers,
           body: request_body
         }
@@ -101,7 +101,7 @@ module Inferno
       # @return [Hash]
       def response
         {
-          status: status,
+          status:,
           headers: response_headers,
           body: response_body
         }
@@ -110,20 +110,20 @@ module Inferno
       # @private
       def to_hash
         {
-          id: id,
-          verb: verb,
-          url: url,
-          direction: direction,
-          status: status,
-          name: name,
-          request_body: request_body,
-          response_body: response_body,
-          result_id: result_id,
-          test_session_id: test_session_id,
+          id:,
+          verb:,
+          url:,
+          direction:,
+          status:,
+          name:,
+          request_body:,
+          response_body:,
+          result_id:,
+          test_session_id:,
           request_headers: request_headers.map(&:to_hash),
           response_headers: response_headers.map(&:to_hash),
-          created_at: created_at,
-          updated_at: updated_at
+          created_at:,
+          updated_at:
         }.compact
       end
 
@@ -136,22 +136,21 @@ module Inferno
 
       class << self
         # @private
-        def from_rack_env(env, name: nil)
-          rack_request = env['router.request'].rack_request
-          url = "#{rack_request.base_url}#{rack_request.path}"
-          url += "?#{rack_request.query_string}" if rack_request.query_string.present?
+        def from_hanami_request(request, name: nil)
+          url = "#{request.base_url}#{request.path}"
+          url += "?#{request.query_string}" if request.query_string.present?
           request_headers =
-            env
+            request.params.env
               .select { |key, _| key.start_with? 'HTTP_' }
               .transform_keys { |key| key.delete_prefix('HTTP_').tr('_', '-').downcase }
-              .map { |header_name, value| Header.new(name: header_name, value: value, type: 'request') }
+              .map { |header_name, value| Header.new(name: header_name, value:, type: 'request') }
 
           new(
-            verb: rack_request.request_method.downcase,
-            url: url,
+            verb: request.request_method.downcase,
+            url:,
             direction: 'incoming',
-            name: name,
-            request_body: rack_request.body.string,
+            name:,
+            request_body: request.body.string,
             headers: request_headers
           )
         end
@@ -160,20 +159,20 @@ module Inferno
         def from_http_response(response, test_session_id:, direction: 'outgoing', name: nil)
           request_headers =
             response.env.request_headers
-              .map { |header_name, value| Header.new(name: header_name.downcase, value: value, type: 'request') }
+              .map { |header_name, value| Header.new(name: header_name.downcase, value:, type: 'request') }
           response_headers =
             response.headers
-              .map { |header_name, value| Header.new(name: header_name.downcase, value: value, type: 'response') }
+              .map { |header_name, value| Header.new(name: header_name.downcase, value:, type: 'response') }
 
           new(
             verb: response.env.method,
             url: response.env.url.to_s,
-            direction: direction,
-            name: name,
+            direction:,
+            name:,
             status: response.status,
             request_body: response.env.request_body,
             response_body: response.body,
-            test_session_id: test_session_id,
+            test_session_id:,
             headers: request_headers + response_headers
           )
         end
@@ -183,9 +182,9 @@ module Inferno
           request = reply.request
           response = reply.response
           request_headers = request[:headers]
-            .map { |header_name, value| Header.new(name: header_name.downcase, value: value, type: 'request') }
+            .map { |header_name, value| Header.new(name: header_name.downcase, value:, type: 'request') }
           response_headers = response[:headers]
-            .map { |header_name, value| Header.new(name: header_name.downcase, value: value, type: 'response') }
+            .map { |header_name, value| Header.new(name: header_name.downcase, value:, type: 'response') }
           request_body =
             if request.dig(:headers, 'Content-Type')&.include?('application/x-www-form-urlencoded')
               URI.encode_www_form(request[:payload])
@@ -196,12 +195,12 @@ module Inferno
           new(
             verb: request[:method],
             url: request[:url],
-            direction: direction,
-            name: name,
+            direction:,
+            name:,
             status: response[:code].to_i,
-            request_body: request_body,
+            request_body:,
             response_body: response[:body],
-            test_session_id: test_session_id,
+            test_session_id:,
             headers: request_headers + response_headers
           )
         end

data/lib/inferno/entities/session_data.rb

@@ -26,12 +26,12 @@ module Inferno
 
       def to_hash
         {
-          id: id,
-          name: name,
-          value: value,
-          test_session_id: test_session_id,
-          created_at: created_at,
-          updated_at: updated_at
+          id:,
+          name:,
+          value:,
+          test_session_id:,
+          created_at:,
+          updated_at:
         }
       end
     end

data/lib/inferno/entities/test.rb

@@ -104,10 +104,10 @@ module Inferno
       end
 
       # @private
-      def method_missing(name, *args, &block)
+      def method_missing(name, *args, &)
         parent_instance = self.class.parent&.new
         if parent_instance.respond_to?(name)
-          parent_instance.send(name, *args, &block)
+          parent_instance.send(name, *args, &)
         else
           super
         end
@@ -204,10 +204,10 @@ module Inferno
         end
 
         # @private
-        def method_missing(name, *args, &block)
+        def method_missing(name, *args, &)
           parent_instance = parent&.new
           if parent_instance.respond_to?(name)
-            parent_instance.send(name, *args, &block)
+            parent_instance.send(name, *args, &)
           else
             super
           end

data/lib/inferno/entities/test_group.rb

@@ -13,10 +13,10 @@ module Inferno
 
       def_delegators 'self.class', :title, :id, :groups, :inputs, :outputs, :tests
 
-      def method_missing(name, *args, &block)
+      def method_missing(name, *args, &)
         parent_instance = self.class.parent&.new
         if parent_instance.respond_to?(name)
-          parent_instance.send(name, *args, &block)
+          parent_instance.send(name, *args, &)
         else
           super
         end

data/lib/inferno/entities/test_run.rb

@@ -65,7 +65,7 @@ module Inferno
       end
 
       def to_hash
-        super.merge(test_session: test_session).compact
+        super.merge(test_session:).compact
       end
 
       def test_count(selected_suite_options = [])

data/lib/inferno/jobs/execute_test_run.rb

@@ -7,7 +7,7 @@ module Inferno
         test_run = Inferno::Repositories::TestRuns.new.find(test_run_id)
         test_session = Inferno::Repositories::TestSessions.new.find(test_run.test_session_id)
 
-        TestRunner.new(test_session: test_session, test_run: test_run).start
+        TestRunner.new(test_session:, test_run:).start
       end
     end
   end

data/lib/inferno/jobs/resume_test_run.rb

@@ -7,7 +7,7 @@ module Inferno
         test_run = Inferno::Repositories::TestRuns.new.find(test_run_id)
         test_session = Inferno::Repositories::TestSessions.new.find(test_run.test_session_id)
 
-        TestRunner.new(test_session: test_session, test_run: test_run, resume: true).start
+        TestRunner.new(test_session:, test_run:, resume: true).start
       end
     end
   end