X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/90209af8fa35bc99c9821db0c815404d1234ef31..bb91f86ea02e3535e3953ee0916dd6877bf585f7:/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 8b43e5dbe3..71cfe38abf 100644 --- a/apps/workbench/test/integration/collections_test.rb +++ b/apps/workbench/test/integration/collections_test.rb @@ -1,7 +1,13 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + require 'integration_helper' require_relative 'integration_test_utils' class CollectionsTest < ActionDispatch::IntegrationTest + include KeepWebConfig + setup do need_javascript end @@ -40,7 +46,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest test "creating and uncreating a sharing link" do coll_uuid = api_fixture("collections", "collection_owned_by_active", "uuid") download_link_re = - Regexp.new(Regexp.escape("/collections/download/#{coll_uuid}/")) + Regexp.new(Regexp.escape("/c=#{coll_uuid}/")) visit page_with_token("active_trustedclient", "/collections/#{coll_uuid}") within "#sharing-button" do check_sharing(:on, download_link_re) @@ -49,10 +55,20 @@ 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'] + use_keep_web_config + + token = api_fixture('api_client_authorizations')['active']['api_token'] + data = "foo\nfile\n" + datablock = `echo -n #{data.shellescape} | ARVADOS_API_TOKEN=#{token.shellescape} arv-put --no-progress --raw -`.strip + assert $?.success?, $? + + col = nil + use_token 'active' do + mtxt = ". #{datablock} 0:#{data.length}:foo\n" + col = Collection.create(manifest_text: mtxt) + end + + uuid = col.uuid token = api_fixture('api_client_authorizations')['active_all_collections']['api_token'] url_head = "/collections/download/#{uuid}/#{token}/" visit url_head @@ -74,10 +90,8 @@ class CollectionsTest < ActionDispatch::IntegrationTest end assert_equal(['foo'], hrefs.compact.sort, "download page did provide strictly file links") - within "#collection_files" do - click_link "foo" - assert_equal("foo\nfile\n", page.html) - end + click_link "foo" + assert_text "foo\nfile\n" end test "combine selected collections into new collection" do @@ -89,11 +103,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 @@ -420,4 +434,88 @@ class CollectionsTest < ActionDispatch::IntegrationTest 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