2761: update config

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 1a6bd026f3b42a6248579703687bffaed8ce64ec..22ed3a340faff1127d7ddf383df17d342c23b1f0 100644 (file)
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -1,6 +1,32 @@
 # Do not use this file for site configuration. Create application.yml
 # instead (see application.yml.example).
 
+# Below is a sample setting for diagnostics testing.
+# Configure workbench URL as "arvados_workbench_url"
+# Configure test user tokens as "user_tokens".
+#   At this time the tests need an "active" user token.
+# Also, configure the pipelines to be executed as "pipelines_to_test".
+# For each of the pipelines identified by the name of your choice
+#     ("pipeline_1" and "pipeline_2" in this sample), provide the following:
+#   template_uuid: is the uuid of the template to be executed
+#   input_paths: an array of inputs for the pipeline. Use either a collection's "uuid"
+#     or a file's "uuid/file_name" path in this array. If the pipeline does not require
+#     any inputs, this can be omitted. 
+#   max_wait_seconds: max time in seconds to wait for the pipeline run to complete.
+#     Default value of 30 seconds is used when this value is not provided.
+diagnostics:
+  arvados_workbench_url: https://localhost:3000/
+  user_tokens:
+    active: eu33jurqntstmwo05h1jr3eblmi961e802703y6657s8zb14r
+  pipelines_to_test:
+    pipeline_1:
+      template_uuid: zzzzz-p5p6p-rxj8d71854j9idn
+      input_paths: [zzzzz-4zz18-nz98douzhaa3jh2]
+      max_wait_seconds: 10
+    pipeline_2:
+      template_uuid: zzzzz-p5p6p-1xbobfobk94ppbv
+      input_paths: [zzzzz-4zz18-nz98douzhaa3jh2, zzzzz-4zz18-gpw9o5wpcti3nib]
+
 development:
   cache_classes: false
   eager_load: true
@@ -142,36 +168,5 @@ common:
   issue_reporter_email_to: arvados@example.com
   support_email_address: arvados@example.com
 
-#  # Configuration for diagnostics testing. See the "diagnostics" section for more explanation.
-#  arvados_workbench_url: false
-#  diagnostics_testing_user_tokens: false
-#  diagnostics_testing_pipeline_fields: false
-
   # filename suffixes for which view icon would be shown in collection show page
   filename_suffixes_with_view_icon: [txt, gif, jpeg, jpg, png, html, htm, pdf]
-
-# Below is a sample setting for diagnostics testing.
-# Configure test user tokens as "diagnostics_testing_user_tokens".
-#   At this time the tests need an "active" user token.
-# Also, configure the pipelines to be executed as "diagnostics_testing_pipeline_fields".
-# For each of the pipelines identified by the name of your choice
-#     ("tutorial pipeline" and "tutorial pipeline 2" in this sample):
-#   template_uuid: is the uuid of the template to be executed
-#   input_paths: an array of inputs for the pipeline. Use either a collection's "uuid"
-#     or a file's "uuid/file_name" path in this array. If the pipeline does not require
-#     any inputs, this can be omitted. 
-#   max_wait_seconds: max time in seconds to wait for the pipeline run to complete.
-#     Default value of 30 seconds is used when this value is not provided.
-
-diagnostics:
-  arvados_workbench_url: https://localhost:3000/
-  diagnostics_testing_user_tokens:
-    active: eu33jurqntstmwo05h1jr3eblmi961e802703y6657s8zb14r
-  diagnostics_testing_pipeline_fields:
-    tutorial pipeline 1:
-      template_uuid: zzzzz-p5p6p-rxj8d71854j9idn
-      input_paths: [zzzzz-4zz18-nz98douzhaa3jh2]
-      max_wait_seconds: 10
-    tutorial pipeline 2:
-      template_uuid: zzzzz-p5p6p-1xbobfobk94ppbv
-      input_paths: [zzzzz-4zz18-nz98douzhaa3jh2, zzzzz-4zz18-gpw9o5wpcti3nib]

diff --git a/apps/workbench/config/database.yml b/apps/workbench/config/database.yml
index 188ca37eec273e22f9fcb2e0991bafd783297b95..dd7669cb281555304f789cc7971281ba1b93d9cc 100644 (file)
--- a/apps/workbench/config/database.yml
+++ b/apps/workbench/config/database.yml
@@ -24,9 +24,9 @@ production:
   pool: 5
   timeout: 5000
 
+# Note: The "diagnostics" database configuration is not actually used.
 diagnostics:
   adapter: sqlite3
   database: db/diagnostics.sqlite3
   pool: 5
   timeout: 5000
-

diff --git a/apps/workbench/test/diagnostics/pipeline_test.rb b/apps/workbench/test/diagnostics/pipeline_test.rb
index 95396c2b91f88af97da24bf8bfeb76685a986330..a52d1a6a55a5686b6ec9baf0ec6ea2102586edca 100644 (file)
--- a/apps/workbench/test/diagnostics/pipeline_test.rb
+++ b/apps/workbench/test/diagnostics/pipeline_test.rb
@@ -3,18 +3,18 @@ require 'selenium-webdriver'
 require 'headless'
 
 class PipelineTest < DiagnosticsTest
-  pipelines_to_run = Rails.configuration.diagnostics_testing_pipeline_fields.andand.keys
+  pipelines_to_test = Rails.configuration.pipelines_to_test.andand.keys
 
   setup do
-#    headless = Headless.new
-#    headless.start
+    headless = Headless.new
+    headless.start
     Capybara.current_driver = :selenium
   end
 
-  pipelines_to_run.andand.each do |pipeline_to_run|
-    test "visit home page for user #{pipeline_to_run}" do
+  pipelines_to_test.andand.each do |pipeline_to_test|
+    test "visit home page for user #{pipeline_to_test}" do
       visit_page_with_token 'active'
-      pipeline_config = Rails.configuration.diagnostics_testing_pipeline_fields[pipeline_to_run]
+      pipeline_config = Rails.configuration.pipelines_to_test[pipeline_to_test]
 
       # Search for tutorial template
       within('.navbar-fixed-top') do
@@ -75,7 +75,7 @@ class PipelineTest < DiagnosticsTest
              
       page.all('.selectable').first.click
       wait_for_ajax
-      # it appears that ajax reload is wiping out input selection after search results; so, select one more time.
+      # ajax reload is wiping out input selection after search results; so, select again.
       page.all('.selectable').first.click
       wait_for_ajax
 

diff --git a/apps/workbench/test/diagnostics_test_helper.rb b/apps/workbench/test/diagnostics_test_helper.rb
index ad2e737afb181fd1c7cea4139db8c17d43e58724..55821ed21dff5d567f1f4add306bfe813a61270b 100644 (file)
--- a/apps/workbench/test/diagnostics_test_helper.rb
+++ b/apps/workbench/test/diagnostics_test_helper.rb
@@ -7,7 +7,7 @@ class DiagnosticsTest < ActionDispatch::IntegrationTest
     if !path.start_with? Rails.configuration.arvados_workbench_url
       path = Rails.configuration.arvados_workbench_url + path
     end
-    tokens = Rails.configuration.diagnostics_testing_user_tokens
+    tokens = Rails.configuration.user_tokens
     visit page_with_token(tokens[token_name], path)
   end
 

diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index 7f23988837b8ced4d4343b16dc3a1993e68c211e..f7cf87f718b8b67474a7fd6a7fbc223fef97452d 100644 (file)
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -1,4 +1,4 @@
-ENV["RAILS_ENV"] = "test" if !ENV["RAILS_ENV"]
+ENV["RAILS_ENV"] = "test" if (ENV["RAILS_ENV"] != "diagnostics")
 
 unless ENV["NO_COVERAGE_TEST"]
   begin