Merge branch 'master' into 3076-topnav-help

[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 9a329f1180383bbe2c68df70059c403dbb44be38..5071fb47666bee5fe73813a3e50cc93d9b3580a2 100644 (file)
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -18,18 +18,17 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       find('a,button', text: 'Run').click
     end
 
+    # project chooser
+    within('.modal-dialog') do
+      find('.selectable', text: 'A Project').click
+      find('button', text: 'Choose').click
+    end
+
     # This pipeline needs input. So, Run should be disabled
     page.assert_selector 'a.disabled,button.disabled', text: 'Run'
 
     instance_page = current_path
 
-    # put this pipeline instance in "A Folder"
-    find('button', text: 'Choose a folder...').click
-    within('.modal-dialog') do
-      find('.selectable', text: 'A Folder').click
-      find('button', text: 'Move').click
-    end
-
     # Go over to the collections page and select something
     visit '/collections'
     within('tr', text: 'GNU_General_Public_License') do
@@ -37,15 +36,15 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     end
     find('#persistent-selection-count').click
 
-    # Add this collection to the folder
-    visit '/folders'
-    find('.arv-folder-list a,button', text: 'A Folder').click
+    # Add this collection to the project
+    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
       find('.btn', text: 'Add').click
     end
-   
+
     find('tr[data-kind="arvados#pipelineInstance"]', text: 'New pipeline instance').
       find('a', text: 'Show').
       click
@@ -57,7 +56,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       click
 
     within('.modal-dialog') do
-      find('span', text: 'foo_tag').click
+      first('span', text: 'foo_tag').click
       find('button', text: 'OK').click
     end
 
@@ -81,8 +80,8 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     assert_not page.has_text? 'Graph'
   end
 
-  # Create a pipeline instance from within a folder and run
-  test 'Create pipeline inside a folder and run' do
+  # Create a pipeline instance from within a project and run
+  test 'Create pipeline inside a project and run' do
     visit page_with_token('active_trustedclient')
 
     # Go over to the collections page and select something
@@ -92,12 +91,12 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     end
     find('#persistent-selection-count').click
 
-    # Add this collection to the folder using collections menu from top nav
-    visit '/folders'
-    find('.arv-folder-list a,button', text: 'A Folder').click
+    # 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('#collections-menu').click
-    click_button 'Copy selections into this folder'
+    find('li.selection-menu > a').click
+    click_button 'Copy selections into this project'
 
     # create a pipeline instance
     find('.btn', text: 'Run a pipeline').click
@@ -114,7 +113,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       click
 
     within('.modal-dialog') do
-      find('span', text: 'foo_tag').click
+      first('span', text: 'foo_tag').click
       find('button', text: 'OK').click
     end