X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/97d1d110d172f410214adac8a49e0c984694a016..1e31ae09539d8265820a2f75f8a981f7d415ef58:/apps/workbench/test/diagnostics/pipeline_test.rb

diff --git a/apps/workbench/test/diagnostics/pipeline_test.rb b/apps/workbench/test/diagnostics/pipeline_test.rb
index e047486d4a..fbc144a996 100644
--- a/apps/workbench/test/diagnostics/pipeline_test.rb
+++ b/apps/workbench/test/diagnostics/pipeline_test.rb
@@ -3,7 +3,7 @@ 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
@@ -11,11 +11,10 @@ class PipelineTest < DiagnosticsTest
     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 = diagnostic_test_pipeline_config pipeline_to_run
+      pipeline_config = Rails.configuration.pipelines_to_test[pipeline_to_test]
 
       # Search for tutorial template
       within('.navbar-fixed-top') do
@@ -36,7 +35,7 @@ class PipelineTest < DiagnosticsTest
 
       # Choose input for the pipeline
       pipeline_config['input_paths'].each do |look_for|
-        select_inut look_for
+        select_input look_for
       end
       wait_for_ajax
 
@@ -44,49 +43,50 @@ class PipelineTest < DiagnosticsTest
       find('a,button', text: 'Run').click
 
       # Pipeline is running. We have a "Stop" button instead now.
-      page.assert_selector 'a,button', text: 'Stop'
+      page.assert_selector 'a,button', text: 'Pause'
 
       # Wait for pipeline run to complete
       wait_until_page_has 'Complete', pipeline_config['max_wait_seconds']
     end
   end
 
-  def select_inut look_for
+  def select_input look_for
     inputs_needed = page.all('.btn', text: 'Choose')
     return if (!inputs_needed || !inputs_needed.any?)
 
-    inputs_needed[0].click
-    within('.modal-dialog') do
-      look_for_uuid = nil
+    look_for_uuid = nil
+    look_for_file = nil
+    if look_for.andand.index('/').andand.>0
+      partitions = look_for.partition('/')
+      look_for_uuid = partitions[0]
+      look_for_file = partitions[2]
+    else
+      look_for_uuid = look_for
       look_for_file = nil
+    end
+
+    inputs_needed[0].click
 
-      if look_for.andand.index('/').andand.>0
-        partitions = look_for.partition('/')
-        look_for_uuid = partitions[0]
-        look_for_file = partitions[2]
-     else
-       look_for_uuid = look_for
-       look_for_file = nil
-     end
-
-     if look_for_uuid
-       fill_in('Search', with: look_for_uuid, exact: true)
-     end
-           
-     wait_for_ajax
-     page.all('.selectable').first.click
-     wait_for_ajax
-     page.all('.selectable').first.click  # don't ask why
-     wait_for_ajax
-     
-    if look_for_file
+    within('.modal-dialog') do
+      if look_for_uuid
+        fill_in('Search', with: look_for_uuid, exact: true)
+        wait_for_ajax
+      end
+             
+      page.all('.selectable').first.click
+      wait_for_ajax
+      # ajax reload is wiping out input selection after search results; so, select again.
+      page.all('.selectable').first.click
       wait_for_ajax
-      within('.collection_files_name', text: look_for_file) do
-        find('.fa-file').click
+
+      if look_for_file
+        wait_for_ajax
+        within('.collection_files_name', text: look_for_file) do
+          find('.fa-file').click
+        end
       end
-    end
-    
-    find('button', text: 'OK').click
+      
+      find('button', text: 'OK').click
       wait_for_ajax
     end
   end