X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/56b3e82324aea74cee083d3831c89eb7b553fb9c..3e48f1c6d32cf1694af48ae2d6f182cfe5a6c73b:/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..2eee6fe8db 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -1,25 +1,12 @@
 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,13 +15,13 @@ 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}"))
+    # Should navigate to the Data collections tab of the project after copying
+    assert_text project_name
+    assert_text "Copy of #{collection_name}"
   end
 
   test "Collection page renders name" do
+    Capybara.current_driver = :rack_test
     uuid = api_fixture('collections')['foo_file']['uuid']
     coll_name = api_fixture('collections')['foo_file']['name']
     visit page_with_token('active', "/collections/#{uuid}")
@@ -62,7 +49,6 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   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 +60,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']
@@ -105,16 +92,13 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   end
 
   test "can view empty collection" do
+    Capybara.current_driver = :rack_test
     uuid = 'd41d8cd98f00b204e9800998ecf8427e+0'
     visit page_with_token('active', "/collections/#{uuid}")
-    assert page.has_text?('This collection is empty')
+    assert page.has_text?(/This collection is empty|The following collections have this content/)
   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']
 
@@ -144,7 +128,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 +137,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 +166,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,8 +189,6 @@ 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
@@ -232,7 +203,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
   end
 
   test "Collection portable data hash with multiple matches" do
-    pdh = api_fixture('collections')['baz_file']['portable_data_hash']
+    pdh = api_fixture('collections')['foo_file']['portable_data_hash']
     visit page_with_token('admin', "/collections/#{pdh}")
 
     matches = api_fixture('collections').select {|k,v| v["portable_data_hash"] == pdh}
@@ -241,14 +212,25 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     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_no_text 'more results are not shown'
+    assert_no_text 'Activity'
+    assert_no_text 'Sharing and permissions'
+  end
+
+  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}")
+
+    assert_selector 'a', text: 'Collection_1'
+
+    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 +254,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 +309,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 +333,14 @@ 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
 end