Merge branch 'master' into 3836-remove-collection-from-project-bug

[arvados.git] / 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 27b9269032de6af5a5f1317e0db590d1e0c51fea..fae29699166333f9302248fdac13551adcc178c4 100644 (file)
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -4,7 +4,24 @@ require 'headless'
 
 class CollectionsTest < ActionDispatch::IntegrationTest
   setup do
+    Capybara.current_driver = :rack_test
+  end
+
+  test "Can copy a collection to a project" do
     Capybara.current_driver = Capybara.javascript_driver
+
+    collection_uuid = api_fixture('collections')['foo_file']['uuid']
+    collection_name = api_fixture('collections')['foo_file']['name']
+    project_uuid = api_fixture('groups')['aproject']['uuid']
+    project_name = api_fixture('groups')['aproject']['name']
+    visit page_with_token('active', "/collections/#{collection_uuid}")
+    click_link 'Copy to project...'
+    find('.selectable', text: project_name).click
+    find('.modal-footer a,button', text: 'Copy').click
+    wait_for_ajax
+    # It should navigate to the project after copying...
+    assert(page.has_text?(project_name))
+    assert(page.has_text?("Copy of #{collection_name}"))
   end
 
   test "Collection page renders name" do
@@ -18,8 +35,6 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   end
 
   test "can download an entire collection with a reader token" do
-    Capybara.current_driver = :rack_test
-
     uuid = api_fixture('collections')['foo_file']['uuid']
     token = api_fixture('api_client_authorizations')['active_all_collections']['api_token']
     url_head = "/collections/download/#{uuid}/#{token}/"
@@ -52,36 +67,47 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   end
 
   test "combine selected collections into new collection" do
-    foo_collection_uuid = api_fixture('collections')['foo_file']['uuid']
-    bar_collection_uuid = api_fixture('collections')['bar_file']['uuid']
+    headless = Headless.new
+    headless.start
+    Capybara.current_driver = :selenium
+
+    foo_collection = api_fixture('collections')['foo_file']
+    bar_collection = api_fixture('collections')['bar_file']
 
     visit page_with_token('active', "/collections")
 
-    assert(page.has_text?(foo_collection_uuid), "Collection page did not include foo file")
-    assert(page.has_text?(bar_collection_uuid), "Collection page did not include bar file")
+    assert(page.has_text?(foo_collection['uuid']), "Collection page did not include foo file")
+    assert(page.has_text?(bar_collection['uuid']), "Collection page did not include bar file")
 
-    within('tr', text: foo_collection_uuid) do
+    within('tr', text: foo_collection['uuid']) do
       find('input[type=checkbox]').click
     end
 
-    within('tr', text: bar_collection_uuid) do
+    within('tr', text: bar_collection['uuid']) do
       find('input[type=checkbox]').click
     end
 
     click_button 'Selection...'
     within('.selection-action-container') do
-      click_link 'Combine selections into a new collection'
+      click_link 'Create new collection with selected collections'
     end
 
-    # back in collections page
-    assert(page.has_text?(foo_collection_uuid), "Collection page did not include foo file")
-    assert(page.has_text?(bar_collection_uuid), "Collection page did not include bar file")
+    # 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_no_text?(bar_collection['name']), "Collection page did not include foo file")
+    assert(page.has_text?('bar'), "Collection page did not include bar file")
+
+    headless.stop
   end
 
-  test "combine selected collection contents into new collection" do
+  test "combine selected collection files into new collection" do
+    headless = Headless.new
+    headless.start
+    Capybara.current_driver = :selenium
+
     foo_collection = api_fixture('collections')['foo_file']
-   # bar_collection = api_fixture('collections')['bar_file']
-   # pdh_collection = api_fixture('collections')['multilevel_collection_1']
 
     visit page_with_token('active', "/collections")
 
@@ -95,10 +121,14 @@ class CollectionsTest < ActionDispatch::IntegrationTest
 
     click_button 'Selection...'
     within('.selection-action-container') do
-      click_link 'Combine selections into a new collection'
+      click_link 'Create new collection with selected files'
     end
 
-    # go back to collections page
-    visit page_with_token('active', "/collections")
+    # 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")
+
+    headless.stop
   end
 end