inferno_core 0.1.1 → 0.1.3.pre2

data/lib/inferno/public/bundle.js.LICENSE.txt

@@ -19,7 +19,7 @@ object-assign
  * @license MIT
  */
 
-/** @license MUI v5.2.0
+/** @license MUI v5.3.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

data/lib/inferno/repositories/results.rb

@@ -140,6 +140,10 @@ module Inferno
         update(result_id, result: 'pass', result_message: message)
       end
 
+      def cancel_waiting_result(result_id, message = nil)
+        update(result_id, result: 'cancel', result_message: message)
+      end
+
       def json_serializer_options
         {
           include: {

data/lib/inferno/repositories/session_data.rb

@@ -27,7 +27,7 @@ module Inferno
 
         case type.to_s
         when 'oauth_credentials'
-          DSL::OAuthCredentials.new(JSON.parse(raw_value))
+          DSL::OAuthCredentials.new(JSON.parse(raw_value || '{}'))
         else
           raw_value
         end

data/lib/inferno/repositories/test_runs.rb

@@ -65,6 +65,10 @@ module Inferno
         build_entity(test_run_hash)
       end
 
+      def status_for_test_run(id)
+        self.class::Model.where(id: id).get(:status)
+      end
+
       def mark_as_running(test_run_id)
         update(test_run_id, status: 'running')
       end
@@ -91,6 +95,10 @@ module Inferno
         )
       end
 
+      def mark_as_cancelling(test_run_id)
+        update(test_run_id, status: 'cancelling')
+      end
+
       class Model < Sequel::Model(db)
         include ValidateRunnableReference
 

data/lib/inferno/test_runner.rb

@@ -29,8 +29,13 @@ module Inferno
       @session_data_repo ||= Repositories::SessionData.new
     end
 
+    def test_run_is_cancelling
+      # forces db refetch of the test run status in case it is being cancelled
+      test_runs_repo.status_for_test_run(test_run.id) == 'cancelling'
+    end
+
     def start
-      test_runs_repo.mark_as_running(test_run.id)
+      test_runs_repo.mark_as_running(test_run.id) unless test_run.status == 'cancelling'
 
       run(test_run.runnable)
 
@@ -60,6 +65,8 @@ module Inferno
       test_instance = test.new(inputs: inputs, test_session_id: test_session.id, scratch: scratch)
 
       result = begin
+        raise Exceptions::CancelException, 'Test cancelled by user' if test_run_is_cancelling
+
         test_instance.load_named_requests
         test_instance.instance_eval(&test.block)
         'pass'

data/lib/inferno/version.rb

@@ -1,3 +1,3 @@
 module Inferno
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.3.pre2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inferno_core
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3.pre2
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -242,14 +242,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 6.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 6.4.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -466,6 +466,7 @@ files:
 - lib/inferno/apps/web/controllers/controller.rb
 - lib/inferno/apps/web/controllers/requests/show.rb
 - lib/inferno/apps/web/controllers/test_runs/create.rb
+- lib/inferno/apps/web/controllers/test_runs/destroy.rb
 - lib/inferno/apps/web/controllers/test_runs/results/index.rb
 - lib/inferno/apps/web/controllers/test_runs/show.rb
 - lib/inferno/apps/web/controllers/test_sessions/create.rb
@@ -537,6 +538,7 @@ files:
 - lib/inferno/jobs/execute_test_run.rb
 - lib/inferno/jobs/resume_test_run.rb
 - lib/inferno/public/217.bundle.js
+- lib/inferno/public/72a5cd989e6aea904540824ec865a0f8.png
 - lib/inferno/public/assets.json
 - lib/inferno/public/bundle.js
 - lib/inferno/public/bundle.js.LICENSE.txt
@@ -593,9 +595,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: