X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f233795c54fbfd3b0481e5bce0914a9192e2b8ff..a3615da860d1d78d0ecb7e2890eea26963b5c01e:/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 8ac8fe4fb3..34b77d841c 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -3,46 +3,14 @@ require 'selenium-webdriver'
 require 'headless'
 
 class CollectionsTest < ActionDispatch::IntegrationTest
-  def change_persist oldstate, newstate
-    find "div[data-persistent-state='#{oldstate}']"
-    page.assert_no_selector "div[data-persistent-state='#{newstate}']"
-    find('.btn', text: oldstate.capitalize).click
-    find '.btn', text: newstate.capitalize
-    page.assert_no_selector '.btn', text: oldstate.capitalize
-    find "div[data-persistent-state='#{newstate}']"
-    page.assert_no_selector "div[data-persistent-state='#{oldstate}']"
-  end
-
-  ['/collections', '/users/welcome'].each do |path|
-    test "Flip persistent switch at #{path}" do
-      Capybara.current_driver = Capybara.javascript_driver
-      uuid = api_fixture('collections')['foo_file']['uuid']
-      visit page_with_token('active', path)
-      within "tr[data-object-uuid='#{uuid}']" do
-        change_persist 'cache', 'persistent'
-      end
-      # Refresh page and make sure the change was committed.
-      visit current_path
-      within "tr[data-object-uuid='#{uuid}']" do
-        change_persist 'persistent', 'cache'
-      end
-    end
-  end
-
-  test 'Flip persistent switch on collection#show' do
+  setup do
     Capybara.current_driver = Capybara.javascript_driver
-    uuid = api_fixture('collections')['foo_file']['uuid']
-    visit page_with_token('active', "/collections/#{uuid}")
-    change_persist 'cache', 'persistent'
-    visit current_path
-    change_persist 'persistent', 'cache'
   end
 
-  test "Collection page renders default name links" do
+  test "Collection page renders name" do
     uuid = api_fixture('collections')['foo_file']['uuid']
-    coll_name = api_fixture('links')['foo_collection_name_in_aproject']['name']
-    name_uuid = api_fixture('links')['foo_collection_name_in_aproject']['uuid']
-    visit page_with_token('active', "/collections/#{name_uuid}")
+    coll_name = api_fixture('collections')['foo_file']['name']
+    visit page_with_token('active', "/collections/#{uuid}")
     assert(page.has_text?(coll_name), "Collection page did not include name")
     # Now check that the page is otherwise normal, and the collection name
     # isn't only showing up in an error message.
@@ -50,6 +18,8 @@ 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}/"
@@ -74,4 +44,64 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     assert_equal(['foo'], hrefs.compact.sort,
                  "download page did provide strictly file links")
   end
+
+  test "can view empty collection" do
+    uuid = 'd41d8cd98f00b204e9800998ecf8427e+0'
+    visit page_with_token('active', "/collections/#{uuid}")
+    assert page.has_text?('This collection is empty')
+  end
+
+  test "combine selected collections into new collection" do
+    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")
+
+    within('tr', text: foo_collection['uuid']) do
+      find('input[type=checkbox]').click
+    end
+
+    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'
+    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_no_text?(bar_collection['name']), "Collection page did not include foo file")
+    assert(page.has_text?('bar'), "Collection page did not include bar file")
+  end
+
+  test "combine selected collection contents into new collection" do
+    foo_collection = api_fixture('collections')['foo_file']
+
+    visit page_with_token('active', "/collections")
+
+    # choose file from foo collection
+    within('tr', text: foo_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 'Combine selections into a new collection'
+    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")
+  end
 end