Merge branch 'master' into 3714-report-issue-issues

[arvados.git] / apps / workbench / test / integration / pipeline_instances_test.rb

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index f5d6e633f340ea85cb7e438c35b208e7c3a13510..d06604d2602c6980566b2b340cac558d3b4375db 100644 (file)
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -40,13 +40,17 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     visit '/projects'
     find('.arv-project-list a,button', text: 'A Project').click
     find('.btn', text: 'Add data').click
-    find('span', text: 'foo_tag').click
     within('.modal-dialog') do
+      wait_for_ajax
+      first('span', text: 'foo_tag').click
       find('.btn', text: 'Add').click
     end
+    using_wait_time(Capybara.default_wait_time * 3) do
+      wait_for_ajax
+    end
 
     click_link 'Jobs and pipelines'
-    find('tr[data-kind="arvados#pipelineInstance"]', text: 'New pipeline instance').
+    find('tr[data-kind="arvados#pipelineInstance"]', text: '(none)').
       find('a', text: 'Show').
       click
 
@@ -57,10 +61,12 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       click
 
     within('.modal-dialog') do
+      assert(has_text?("Foo/bar pair"),
+             "pipeline input picker missing name of input")
+      wait_for_ajax
       first('span', text: 'foo_tag').click
       find('button', text: 'OK').click
     end
-
     wait_for_ajax
 
     # "Run" button is now enabled
@@ -102,7 +108,6 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     # create a pipeline instance
     find('.btn', text: 'Run a pipeline').click
     within('.modal-dialog') do
-      assert page.has_text? 'Two Part Pipeline Template'
       find('.selectable', text: 'Two Part Pipeline Template').click
       find('.btn', text: 'Next: choose inputs').click
     end
@@ -114,10 +119,11 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       click
 
     within('.modal-dialog') do
+      assert_selector 'button.dropdown-toggle', text: 'A Project'
+      wait_for_ajax
       first('span', text: 'foo_tag').click
       find('button', text: 'OK').click
     end
-
     wait_for_ajax
 
     # "Run" button present and enabled