inferno_core 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 470abbacaa895d2d3451f130734c0e34eec9303ec19858976f79b0456c0d619b
-  data.tar.gz: c60351312c3116c39260332b88675f2d8e2b0a3732be2dbf68c2a41c63cd62ab
+  metadata.gz: 79e59753922bf1c5a06e2603a27f267e6b75aed91d46b5531b2ecffcf13a95a8
+  data.tar.gz: 318edf53524ede718e5331b9ec4eb626537553cd0d88ff2df3a4237dc83c2f3e
 SHA512:
-  metadata.gz: 1ff98dd5180315c77a4627710a7bb9c5eaf82d87f81a173f849e24aadf6cad908feb71ac3d92b6a9ca14b38163cf9a821ce236c407e5eb688467e36295fd148e
-  data.tar.gz: 324efe61696b3e86b061adede76bd6c3a1d997f15e2c2e1225dc5edb3bc1f24f3ca7ec21b6363c060ed68eb1d66306baa247d34df8cb465a82c7d70b239a1bec
+  metadata.gz: 6ab836f245a7172c320405d75649be9ab8281b9d7e9520818b160f75aecdac21a7a94aa8d91f9337361475e27560260b36896e7ee5c7f7f6b749123e4b75f4a4
+  data.tar.gz: 3c1f9dbd1209817b38114a609a20c4e6cca27c89743d7c91a8fe954be70a4450112ee72f07ceabf7e9e9c40a8140e7990a6280b70625f71596d8aa0b0ee2b569

data/lib/inferno/apps/cli/main.rb

@@ -18,12 +18,25 @@ module Inferno
       end
 
       desc 'start', 'Start Inferno'
+      option :watch,
+             default: false,
+             type: :boolean,
+             desc: 'Automatically restart Inferno when a file is changed.'
       def start
+        command = 'foreman start --env=/dev/null'
         if `gem list -i foreman`.chomp == 'false'
-          puts "You must install foreman with 'gem install foreman' prior to running inferno."
+          puts "You must install foreman with 'gem install foreman' prior to running Inferno."
         end
 
-        system 'foreman start --env=/dev/null'
+        if options[:watch]
+          if `gem list -i rerun`.chomp == 'false'
+            puts "You must install 'rerun' with 'gem install rerun' to restart on file changes."
+          end
+
+          command = "rerun \"#{command}\" --background"
+        end
+
+        system command
       end
 
       desc 'suites', 'List available test suites'

data/lib/inferno/apps/web/controllers/test_sessions/client_show.rb

@@ -0,0 +1,40 @@
+module Inferno
+  module Web
+    module Controllers
+      module TestSessions
+        class ClientShow < Controller
+          config.default_response_format = :html
+
+          CLIENT_PAGE =
+            ERB.new(
+              File.read(
+                File.join(
+                  Inferno::Application.root, 'lib', 'inferno', 'apps', 'web', 'index.html.erb'
+                )
+              )
+            ).result.freeze
+
+          def handle(req, res)
+            test_session_id = req.params[:id]
+            test_suite_id = req.params[:test_suite_id]
+
+            test_session = repo.find(test_session_id)
+            halt 404 if test_session.nil?
+
+            if test_suite_id.blank? || test_suite_id != test_session.test_suite_id
+              test_suite_id = test_session.test_suite_id
+
+              res.redirect_to "#{Inferno::Application['base_url']}/#{test_suite_id}/#{test_session_id}"
+            end
+
+            test_suite = Inferno::Repositories::TestSuites.new.find(test_suite_id)
+
+            halt 404 if test_suite.nil?
+
+            res.body = CLIENT_PAGE
+          end
+        end
+      end
+    end
+  end
+end

data/lib/inferno/apps/web/router.rb

@@ -53,7 +53,6 @@ module Inferno
       # Should not need Content-Type header but GitHub Codespaces will not work without them.
       # This could be investigated and likely removed if addressed properly elsewhere.
       get '/', to: ->(_env) { [200, { 'Content-Type' => 'text/html' }, [client_page]] }
-      get '/test_sessions/:id', to: ->(_env) { [200, { 'Content-Type' => 'text/html' }, [client_page]] }
 
       Inferno.routes.each do |route|
         cleaned_id = route[:suite].id.gsub(/[^a-zA-Z\d\-._~]/, '_')
@@ -70,6 +69,9 @@ module Inferno
         Application['logger'].info("Registering suite route: #{suite_path}")
         get suite_path, to: ->(_env) { [200, {}, [client_page]] }
       end
+
+      get '/test_sessions/:id', to: Inferno::Web::Controllers::TestSessions::ClientShow, as: :client_session_show
+      get '/:test_suite_id/:id', to: Inferno::Web::Controllers::TestSessions::ClientShow, as: :client_suite_session_show
     end
 
     Router = # rubocop:disable Naming/ConstantName

data/lib/inferno/dsl/assertions.rb

@@ -22,13 +22,15 @@ module Inferno
         "Unexpected response status: expected #{Array.wrap(expected).join(', ')}, but received #{received}"
       end
 
-      # Check an response's status
+      # Check a response's status
       #
       # @param status [Integer, Array<Integer>] a single integer or an array of
       #   integer status codes
+      # @param request [Inferno::Entities::Request]
       # @param response [Hash]
       # @return [void]
-      def assert_response_status(status, response: self.response)
+      def assert_response_status(status, request: self.request, response: nil)
+        response ||= request&.response
         assert Array.wrap(status).include?(response[:status]), bad_response_status_message(status, response[:status])
       end
 
@@ -171,7 +173,8 @@ module Inferno
         assert uri =~ /\A#{URI::DEFAULT_PARSER.make_regexp(['http', 'https'])}\z/, error_message
       end
 
-      # Check the Content-Type header of a response
+      # Check the Content-Type header of a response. This assertion will fail if
+      # the response's content type does not begin with the provided type.
       #
       # @param type [String]
       # @param request [Inferno::Entities::Request]

data/lib/inferno/entities/test_session.rb

@@ -40,7 +40,7 @@ module Inferno
 
         self.suite_options ||= []
 
-        test_suite.suite_options&.each do |option|
+        test_suite&.suite_options&.each do |option|
           if suite_options.none? { |selected_option| selected_option.id == option.id }
             suite_options << DSL::SuiteOption.new(id: option.id, value: option.list_options.first[:value])
           end