inferno_core 0.2.0.rc1 → 0.2.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4408a2e15cb53d6ceac3b8b91233ef68e445addbcd8b8a410b4af92620d7ebc
-  data.tar.gz: e53339ad3edd1f341e0f267f88d14e471da2af29cada5e922eddfac39a1b2e68
+  metadata.gz: c7de4730f1060b36bcbf8b21b72adc9594f13de5206396405b07d08f1daa7502
+  data.tar.gz: 653df5e0cc89e54e22003f1e84aa449b6820e99db2a8e4664948f09e3c37b04d
 SHA512:
-  metadata.gz: 999b967b6be7e306697f4ae91800648b52a6efba07a9fff876014d7a568f9bb70da0747d279c8e8b9c6262782eb9315fa9e656b403c460c8a3aec20585ba6b01
-  data.tar.gz: 74460a748196d27b1616f38fb1883f5685b3c82fd1eaab953ed9a4b87f2f201aae4080f241f583365ea76f5b27e83b1156fc7931f6a131ed18edae23c8c5c95d
+  metadata.gz: aad804d546fa0e6d019bff63faf128e268d16fe7347d553526ff93bd289bf954ccedd81eefbd04b98bf8c1197b33a3f3529f70eaf7e685a4d160385150206c09
+  data.tar.gz: 93ab6a078198329e36691ace251afba7589c2ceb6c1e56d7678ca6d8b3f5cdfdcf7896acfb0b15ce477a7ec43483a40c3b0d2001d85d966a05d094e5700919f9

data/lib/inferno/apps/web/index.html.erb

@@ -40,6 +40,6 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
-    <script src='<%= Inferno::Application['js_host'] %>/bundle.js'></script>
+    <script src='<%= Inferno::Application['js_host'] %>/bundle.js?<%= Inferno::Application['cache_bust_token']%>'></script>
   </body>
 </html>

data/lib/inferno/config/application.rb

@@ -21,6 +21,7 @@ module Inferno
     Application.register('async_jobs', ENV['ASYNC_JOBS'] != 'false')
     Application.register('inferno_host', ENV.fetch('INFERNO_HOST', 'http://localhost:4567'))
     Application.register('base_url', URI.join(Application['inferno_host'], base_path).to_s)
+    Application.register('cache_bust_token', SecureRandom.uuid)
 
     configure do |config|
       config.root = File.expand_path('../../..', __dir__)

data/lib/inferno/config/boot/db.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+require 'erb'
 
 Inferno::Application.boot(:db) do
   init do
@@ -9,7 +10,8 @@ Inferno::Application.boot(:db) do
     Sequel::Model.plugin :json_serializer
 
     config_path = File.expand_path('database.yml', File.join(Dir.pwd, 'config'))
-    config = YAML.load_file(config_path)[ENV['APP_ENV']]
+    config_contents = ERB.new(File.read(config_path)).result
+    config = YAML.safe_load(config_contents)[ENV['APP_ENV']]
       .merge(logger: Inferno::Application['logger'])
     connection_attempts_remaining = ENV.fetch('MAX_DB_CONNECTION_ATTEMPTS', '10').to_i
     connection_retry_delay = ENV.fetch('DB_CONNECTION_RETRY_DELAY', '5').to_i

data/lib/inferno/dsl/resume_test_route.rb

@@ -55,7 +55,7 @@ module Inferno
 
       # @private
       def redirect_route
-        "#{Application['base_url']}/test_sessions/#{test_run.test_session_id}##{waiting_group_id}"
+        "#{Application['base_url']}/test_sessions/#{test_run.test_session_id}##{resume_ui_at_id}"
       end
 
       # @private
@@ -64,8 +64,8 @@ module Inferno
       end
 
       # @private
-      def waiting_group_id
-        test.parent.id
+      def resume_ui_at_id
+        test_run.test_suite_id || test_run.test_group_id || test.parent.id
       end
 
       # @private

data/lib/inferno/public/assets.json

@@ -1,6 +1,6 @@
 {
   "main.js": "/public/bundle.js",
   "217.bundle.js": "/public/217.bundle.js",
-  "inferno_logo.png": "/public/e09b16f5cb645eb05f90c8f38f3409fb.png",
-  "inferno_icon.png": "/public/72a5cd989e6aea904540824ec865a0f8.png"
+  "inferno_logo.png": "/public/0e0b993fd6ff351f435ff1c2938daf2d.png",
+  "inferno_icon.png": "/public/a5cd39450ab0336db73c5e57228b649d.png"
 }