X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/34a7e1ea48470ba540bc7d18de4836b0bb9197f8..d084ca24b06c598271844d2ba4c8c40f251c0999:/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 a54d70ff2c..8619858dfe 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -1,25 +1,16 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'integration_helper'
-require 'selenium-webdriver'
-require 'headless'
+require_relative 'integration_test_utils'
 
 class CollectionsTest < ActionDispatch::IntegrationTest
   setup do
-    Capybara.current_driver = :rack_test
-  end
-
-  # check_checkboxes_state asserts that the page holds at least one
-  # checkbox matching 'selector', and that all matching checkboxes
-  # are in state 'checkbox_status' (i.e. checked if true, unchecked otherwise)
-  def assert_checkboxes_state(selector, checkbox_status, msg=nil)
-    assert page.has_selector?(selector)
-    page.all(selector).each do |checkbox|
-      assert(checkbox.checked? == checkbox_status, msg)
-    end
+    need_javascript
   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']
@@ -28,20 +19,9 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     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
-    uuid = api_fixture('collections')['foo_file']['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.
-    assert(page.has_link?('foo'), "Collection page did not include file link")
+    # Should navigate to the Data collections tab of the project after copying
+    assert_text project_name
+    assert_text "Copy of #{collection_name}"
   end
 
   def check_sharing(want_state, link_regexp)
@@ -55,14 +35,13 @@ class CollectionsTest < ActionDispatch::IntegrationTest
       text_assertion = :assert_text
       link_assertion = :refute_empty
     end
-    using_wait_time(Capybara.default_wait_time * 3) do
+    using_wait_time(Capybara.default_max_wait_time * 3) do
       send(text_assertion, "Shared at:")
     end
     send(link_assertion, all("a").select { |a| a[:href] =~ link_regexp })
   end
 
   test "creating and uncreating a sharing link" do
-    Capybara.current_driver = Capybara.javascript_driver
     coll_uuid = api_fixture("collections", "collection_owned_by_active", "uuid")
     download_link_re =
       Regexp.new(Regexp.escape("/collections/download/#{coll_uuid}/"))
@@ -74,6 +53,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   end
 
   test "can download an entire collection with a reader token" do
+    Capybara.current_driver = :rack_test
     CollectionsController.any_instance.
       stubs(:file_enumerator).returns(["foo\n", "file\n"])
     uuid = api_fixture('collections')['foo_file']['uuid']
@@ -104,17 +84,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     end
   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
-    headless = Headless.new
-    headless.start
-    Capybara.current_driver = :selenium
-
     foo_collection = api_fixture('collections')['foo_file']
     bar_collection = api_fixture('collections')['bar_file']
 
@@ -123,11 +93,11 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     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[data-object-uuid=\"#{foo_collection['uuid']}\"]" do
       find('input[type=checkbox]').click
     end
 
-    within('tr', text: bar_collection['uuid']) do
+    within "tr[data-object-uuid=\"#{bar_collection['uuid']}\"]" do
       find('input[type=checkbox]').click
     end
 
@@ -144,7 +114,6 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     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
 
   [
@@ -154,10 +123,6 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     ['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
-
       my_collection = api_fixture('collections')[collection]
 
       visit page_with_token(user, "/collections")
@@ -187,16 +152,10 @@ class CollectionsTest < ActionDispatch::IntegrationTest
         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
@@ -216,39 +175,21 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     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
 
-  test "Collection portable data hash redirect" do
-    di = api_fixture('collections')['docker_image']
-    visit page_with_token('active', "/collections/#{di['portable_data_hash']}")
-
-    # check redirection
-    assert current_path.end_with?("/collections/#{di['uuid']}")
-    assert page.has_text?("docker_image")
-    assert page.has_text?("Activity")
-    assert page.has_text?("Sharing and permissions")
-  end
-
-  test "Collection portable data hash with multiple matches" do
+  test "Collection portable data hash with multiple matches with more than one page of results" do
     pdh = api_fixture('collections')['baz_file']['portable_data_hash']
     visit page_with_token('admin', "/collections/#{pdh}")
 
-    matches = api_fixture('collections').select {|k,v| v["portable_data_hash"] == pdh}
-    assert matches.size > 1
+    assert_selector 'a', text: 'Collection_1'
 
-    matches.each do |k,v|
-      assert page.has_link?(v["name"]), "Page /collections/#{pdh} should contain link '#{v['name']}'"
-    end
-    assert page.has_no_text?("Activity")
-    assert page.has_no_text?("Sharing and permissions")
+    assert_text 'The following collections have this content:'
+    assert_text 'more results are not shown'
+    assert_no_text 'Activity'
+    assert_no_text 'Sharing and permissions'
   end
 
   test "Filtering collection files by regexp" do
-    headless = Headless.new
-    headless.start
-    Capybara.current_driver = :selenium
     col = api_fixture('collections', 'multilevel_collection_1')
     visit page_with_token('active', "/collections/#{col['uuid']}")
 
@@ -272,13 +213,13 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     # make sure that we actually are looking at the collections
     # page and not e.g. a fiddlesticks
     assert page.has_text?("multilevel_collection_1")
-    assert page.has_text?(col['portable_data_hash'])
+    assert page.has_text?(col["name"] || col["uuid"])
 
     # Set filename filter to a syntactically invalid regex
     # Page loads, but stops filtering after the last valid regex parse
     page.find_field('file_regex').set('file[2')
     assert page.has_text?("multilevel_collection_1")
-    assert page.has_text?(col['portable_data_hash'])
+    assert page.has_text?(col["name"] || col["uuid"])
     assert page.has_text?("file1")
     assert page.has_text?("file2")
     assert page.has_text?("file3")
@@ -327,10 +268,6 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   end
 
   test "Creating collection from list of filtered files" do
-    headless = Headless.new
-    headless.start
-    Capybara.current_driver = :selenium
-
     col = api_fixture('collections', 'collection_with_files_in_subdir')
     visit page_with_token('user1_with_load', "/collections/#{col['uuid']}")
     assert page.has_text?('file_in_subdir1'), 'expected file_in_subdir1 not found'
@@ -355,15 +292,220 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     end
 
     # now in the newly created collection page
-    assert page.has_text?('Content hash:'), 'not on new collection page'
-    assert page.has_no_text?(col['uuid']), 'new collection page has old collection uuid'
-    assert page.has_no_text?(col['portable_data_hash']), 'new collection page has old portable_data_hash'
-
     # must have files in subdir1 and subdir3 but not subdir4
     assert page.has_text?('file_in_subdir1'), 'file_in_subdir1 missing from new collection'
     assert page.has_text?('file1_in_subdir3'), 'file1_in_subdir3 missing from new collection'
     assert page.has_text?('file2_in_subdir3'), 'file2_in_subdir3 missing from new collection'
     assert page.has_no_text?('file1_in_subdir4'), 'file1_in_subdir4 found in new collection'
     assert page.has_no_text?('file2_in_subdir4'), 'file2_in_subdir4 found in new collection'
+
+    # Make sure we're not still on the old collection page.
+    refute_match(%r{/collections/#{col['uuid']}}, page.current_url)
+  end
+
+  test "remove a file from collection using checkbox and dropdown option" do
+    need_selenium 'to confirm unlock'
+
+    visit page_with_token('active', '/collections/zzzzz-4zz18-a21ux3541sxa8sf')
+    assert(page.has_text?('file1'), 'file not found - file1')
+
+    unlock_collection
+
+    # remove first file
+    input_files = page.all('input[type=checkbox]')
+    input_files[0].click
+
+    click_button 'Selection...'
+    within('.selection-action-container') do
+      click_link 'Remove selected files'
+    end
+
+    assert(page.has_no_text?('file1'), 'file found - file')
+    assert(page.has_text?('file2'), 'file not found - file2')
+  end
+
+  test "remove a file in collection using trash icon" do
+    need_selenium 'to confirm unlock'
+
+    visit page_with_token('active', '/collections/zzzzz-4zz18-a21ux3541sxa8sf')
+    assert(page.has_text?('file1'), 'file not found - file1')
+
+    unlock_collection
+
+    first('.fa-trash-o').click
+    accept_alert
+
+    assert(page.has_no_text?('file1'), 'file found - file')
+    assert(page.has_text?('file2'), 'file not found - file2')
+  end
+
+  test "rename a file in collection" do
+    need_selenium 'to confirm unlock'
+
+    visit page_with_token('active', '/collections/zzzzz-4zz18-a21ux3541sxa8sf')
+
+    unlock_collection
+
+    within('.collection_files') do
+      first('.fa-pencil').click
+      find('.editable-input input').set('file1renamed')
+      find('.editable-submit').click
+    end
+
+    assert(page.has_text?('file1renamed'), 'file not found - file1renamed')
+  end
+
+  test "remove/rename file options not presented if user cannot update a collection" do
+    # visit a publicly accessible collection as 'spectator'
+    visit page_with_token('spectator', '/collections/zzzzz-4zz18-uukreo9rbgwsujr')
+
+    click_button 'Selection'
+    within('.selection-action-container') do
+      assert_selector 'li', text: 'Create new collection with selected files'
+      assert_no_selector 'li', text: 'Remove selected files'
+    end
+
+    within('.collection_files') do
+      assert(page.has_text?('GNU_General_Public_License'), 'file not found - GNU_General_Public_License')
+      assert_nil first('.fa-pencil')
+      assert_nil first('.fa-trash-o')
+    end
+  end
+
+  test "unlock collection to modify files" do
+    need_selenium 'to confirm remove'
+
+    collection = api_fixture('collections')['collection_owned_by_active']
+
+    # On load, collection is locked, and upload tab, rename and remove options are disabled
+    visit page_with_token('active', "/collections/#{collection['uuid']}")
+
+    assert_selector 'a[data-toggle="disabled"]', text: 'Upload'
+
+    within('.collection_files') do
+      file_ctrls = page.all('.btn-collection-file-control')
+      assert_equal 2, file_ctrls.size
+      assert_equal true, file_ctrls[0]['class'].include?('disabled')
+      assert_equal true, file_ctrls[1]['class'].include?('disabled')
+      find('input[type=checkbox]').click
+    end
+
+    click_button 'Selection'
+    within('.selection-action-container') do
+      assert_selector 'li.disabled', text: 'Remove selected files'
+      assert_selector 'li', text: 'Create new collection with selected files'
+    end
+
+    unlock_collection
+
+    assert_no_selector 'a[data-toggle="disabled"]', text: 'Upload'
+    assert_selector 'a', text: 'Upload'
+
+    within('.collection_files') do
+      file_ctrls = page.all('.btn-collection-file-control')
+      assert_equal 2, file_ctrls.size
+      assert_equal false, file_ctrls[0]['class'].include?('disabled')
+      assert_equal false, file_ctrls[1]['class'].include?('disabled')
+
+      # previous checkbox selection won't result in firing a new event;
+      # undo and redo checkbox to fire the selection event again
+      find('input[type=checkbox]').click
+      find('input[type=checkbox]').click
+    end
+
+    click_button 'Selection'
+    within('.selection-action-container') do
+      assert_no_selector 'li.disabled', text: 'Remove selected files'
+      assert_selector 'li', text: 'Remove selected files'
+    end
+  end
+
+  def unlock_collection
+    first('.lock-collection-btn').click
+    accept_alert
+  end
+
+  test "collection tags tab" do
+    visit page_with_token('active', '/collections/zzzzz-4zz18-bv31uwvy3neko21')
+
+    click_link 'Tags'
+    wait_for_ajax
+
+    # verify initial state
+    assert_selector 'a', text: 'Edit'
+    assert_no_selector 'a', text: 'Add new tag'
+    assert_no_selector 'a', text: 'Save'
+    assert_no_selector 'a', text: 'Cancel'
+
+    # Verify controls in edit mode
+    first('.edit-collection-tags').click
+    assert_selector 'a.disabled', text: 'Edit'
+    assert_selector 'a', text: 'Add new tag'
+    assert_selector 'a', text: 'Save'
+    assert_selector 'a', text: 'Cancel'
+
+    # add two tags
+    first('.glyphicon-plus').click
+    first('.collection-tag-field-key').click
+    first('.collection-tag-field-key').set('key 1')
+    first('.collection-tag-field-value').click
+    first('.collection-tag-field-value').set('value 1')
+
+    first('.glyphicon-plus').click
+    editable_key_fields = page.all('.collection-tag-field-key')
+    editable_key_fields[1].click
+    editable_key_fields[1].set('key 2')
+    editable_val_fields = page.all('.collection-tag-field-value')
+    editable_val_fields[1].click
+    editable_val_fields[1].set('value 2')
+
+    click_on 'Save'
+    wait_for_ajax
+
+    # added tags; verify
+    assert_text 'key 1'
+    assert_text 'value 1'
+    assert_text 'key 2'
+    assert_text 'value 2'
+    assert_selector 'a', text: 'Edit'
+    assert_no_selector 'a', text: 'Save'
+
+    # remove first tag
+    first('.edit-collection-tags').click
+    assert_not_nil first('.glyphicon-remove')
+    first('.glyphicon-remove').click
+    click_on 'Save'
+    wait_for_ajax
+
+    assert_text 'key 2'
+    assert_text 'value 2'
+    assert_no_text 'key 1'
+    assert_no_text 'value 1'
+    assert_selector 'a', text: 'Edit'
+
+    # Click on cancel and verify
+    first('.edit-collection-tags').click
+    first('.collection-tag-field-key').click
+    first('.collection-tag-field-key').set('this key wont stick')
+    first('.collection-tag-field-value').click
+    first('.collection-tag-field-value').set('this value wont stick')
+
+    click_on 'Cancel'
+    wait_for_ajax
+
+    assert_text 'key 2'
+    assert_text 'value 2'
+    assert_no_text 'this key wont stick'
+    assert_no_text 'this value wont stick'
+
+    # remove all tags
+    first('.edit-collection-tags').click
+    first('.glyphicon-remove').click
+    click_on 'Save'
+    wait_for_ajax
+
+    assert_selector 'a', text: 'Edit'
+    assert_no_text 'key 2'
+    assert_no_text 'value 2'
   end
 end