X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4154420cdd2a2ac6cdb2cc57357f42513fb287cc..3ca013aedeae5b2085b8fb37ca80501117f0f918:/apps/workbench/test/integration/collections_test.rb

diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index fae2969916..726c20a9a9 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -98,26 +98,68 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     assert(page.has_text?('foo'), "Collection page did not include foo file")
     assert(page.has_no_text?(bar_collection['name']), "Collection page did not include foo file")
     assert(page.has_text?('bar'), "Collection page did not include bar file")
-
+    assert(page.has_text?('Created new collection in your Home project'),
+                          'Not found flash message that new collection is created in Home project')
     headless.stop
   end
 
-  test "combine selected collection files into new collection" do
-    headless = Headless.new
-    headless.start
-    Capybara.current_driver = :selenium
+  [
+    ['active', 'foo_file', false],
+    ['active', 'foo_collection_in_aproject', true],
+    ['project_viewer', 'foo_file', false],
+    ['project_viewer', 'foo_collection_in_aproject', false], #aproject not writable
+  ].each do |user, collection, expect_collection_in_aproject|
+    test "combine selected collection files into new collection #{user} #{collection} #{expect_collection_in_aproject}" do
+      headless = Headless.new
+      headless.start
+      Capybara.current_driver = :selenium
 
-    foo_collection = api_fixture('collections')['foo_file']
+      my_collection = api_fixture('collections')[collection]
 
-    visit page_with_token('active', "/collections")
+      visit page_with_token(user, "/collections")
 
-    # choose file from foo collection
-    within('tr', text: foo_collection['uuid']) do
-      click_link 'Show'
+      # choose file from foo collection
+      within('tr', text: my_collection['uuid']) do
+        click_link 'Show'
+      end
+
+      # now in collection page
+      find('input[type=checkbox]').click
+
+      click_button 'Selection...'
+      within('.selection-action-container') do
+        click_link 'Create new collection with selected files'
+      end
+
+      # now in the newly created collection page
+      assert(page.has_text?('Copy to project'), "Copy to project text not found in new collection page")
+      assert(page.has_no_text?(my_collection['name']), "Collection page did not include foo file")
+      assert(page.has_text?('foo'), "Collection page did not include foo file")
+      if expect_collection_in_aproject
+        aproject = api_fixture('groups')['aproject']
+        assert page.has_text?("Created new collection in the project #{aproject['name']}"),
+                              'Not found flash message that new collection is created in aproject'
+      else
+        assert page.has_text?("Created new collection in your Home project"),
+                              'Not found flash message that new collection is created in Home project'
+      end
+
+      headless.stop
     end
+  end
+
+  test "combine selected collection files from collection subdirectory" do
+    headless = Headless.new
+    headless.start
+    Capybara.current_driver = :selenium
+
+    visit page_with_token('user1_with_load', "/collections/zzzzz-4zz18-filesinsubdir00")
 
     # now in collection page
-    find('input[type=checkbox]').click
+    input_files = page.all('input[type=checkbox]')
+    (0..input_files.count-1).each do |i|
+      input_files[i].click
+    end
 
     click_button 'Selection...'
     within('.selection-action-container') do
@@ -125,9 +167,11 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     end
 
     # now in the newly created collection page
-    assert(page.has_text?('Copy to project'), "Copy to project text not found in new collection page")
-    assert(page.has_no_text?(foo_collection['name']), "Collection page did not include foo file")
-    assert(page.has_text?('foo'), "Collection page did not include foo file")
+    assert(page.has_text?('file_in_subdir1'), 'file not found - file_in_subdir1')
+    assert(page.has_text?('file1_in_subdir3.txt'), 'file not found - file1_in_subdir3.txt')
+    assert(page.has_text?('file2_in_subdir3.txt'), 'file not found - file2_in_subdir3.txt')
+    assert(page.has_text?('file1_in_subdir4.txt'), 'file not found - file1_in_subdir4.txt')
+    assert(page.has_text?('file2_in_subdir4.txt'), 'file not found - file1_in_subdir4.txt')
 
     headless.stop
   end