Merge branch 'master' into 3990-owner-when-rerunning-pipeline

[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 0be483a29b0fcad13399c3c416e3f947a65c4131..386d6b0b648afd64f8afbf2b6861fb811d63ccb4 100644 (file)
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -38,7 +38,8 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
 
     # Add this collection to the project
     visit '/projects'
-    find('.arv-project-list a,button', text: 'A Project').click
+    find("#projects-menu").click
+    find('.dropdown-menu a,button', text: 'A Project').click
     find('.btn', text: 'Add data').click
     within('.modal-dialog') do
       wait_for_ajax
@@ -100,7 +101,8 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
 
     # Add this collection to the project using collections menu from top nav
     visit '/projects'
-    find('.arv-project-list a,button', text: 'A Project').click
+    find("#projects-menu").click
+    find('.dropdown-menu a,button', text: 'A Project').click
     find('.btn', text: 'Add data').click
     within('.modal-dialog') do
       wait_for_ajax
@@ -111,6 +113,17 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       wait_for_ajax
     end
 
+    create_and_run_pipeline_in_aproject false
+  end
+
+  # Create a pipeline instance from within a project and run
+  test 'Run a pipeline from dashboard' do
+    visit page_with_token('active_trustedclient')
+    create_and_run_pipeline_in_aproject true
+  end
+
+  # Create and run a pipeline for 'Two Part Pipeline Template' in 'A Project'
+  def create_and_run_pipeline_in_aproject choose_project
     # create a pipeline instance
     find('.btn', text: 'Run a pipeline').click
     within('.modal-dialog') do
@@ -125,8 +138,16 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       click
 
     within('.modal-dialog') do
-      assert_selector 'button.dropdown-toggle', text: 'A Project'
-      wait_for_ajax
+      if choose_project
+        assert_selector 'button.dropdown-toggle', text: 'Home'
+        wait_for_ajax
+        click_button "Home"
+        click_link "A Project"
+        wait_for_ajax
+      else
+        assert_selector 'button.dropdown-toggle', text: 'A Project'
+        wait_for_ajax
+      end
       first('span', text: 'foo_tag').click
       find('button', text: 'OK').click
     end