Merge branch 'master' into 3654-combine-selections

[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 fff5db78d5f55cba5dadc23251d0b2024900a463..34b77d841c87897363998dca78a1ab2ee02d0337 100644 (file)
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -3,11 +3,14 @@ require 'selenium-webdriver'
 require 'headless'
 
 class CollectionsTest < ActionDispatch::IntegrationTest
-  test "Collection page renders default name links" do
+  setup do
+    Capybara.current_driver = Capybara.javascript_driver
+  end
+
+  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.
@@ -47,4 +50,58 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     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