X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bb91f86ea02e3535e3953ee0916dd6877bf585f7..70e5c7a3c6a5860d702d5e5c219dc0f3a3696d35:/apps/workbench/test/controllers/collections_controller_test.rb?ds=sidebyside diff --git a/apps/workbench/test/controllers/collections_controller_test.rb b/apps/workbench/test/controllers/collections_controller_test.rb index 773a4f4571..4f3e098d5c 100644 --- a/apps/workbench/test/controllers/collections_controller_test.rb +++ b/apps/workbench/test/controllers/collections_controller_test.rb @@ -409,7 +409,7 @@ class CollectionsControllerTest < ActionController::TestCase assert_equal true, files.length>0, "Expected one or more files in collection" disabled = css_select('[disabled="disabled"]').collect do |el| - el.attributes['title'].split[-1] + el.attributes['title'].value.split[-1] end assert_equal files.sort, disabled.sort, "Expected to see all collection files in disabled list of files" @@ -728,64 +728,4 @@ class CollectionsControllerTest < ActionController::TestCase assert_response 422 assert_includes json_response['errors'], 'Duplicate file path' end - - [ - [:active, true], - [:spectator, false], - ].each do |user, editable| - test "tags tab #{editable ? 'shows' : 'does not show'} edit button to #{user}" do - use_token user - - get :tags, { - id: api_fixture('collections')['collection_with_tags_owned_by_active']['uuid'], - format: :js, - }, session_for(user) - - assert_response :success - - found = 0 - response.body.scan /]+>/ do |remove_icon| - remove_icon.scan(/\ collection-tag-remove(.*?)\"/).each do |i,| - found += 1 - end - end - - if editable - assert_equal(3, found) # two from the tags + 1 from the hidden "add tag" row - else - assert_equal(0, found) - end - end - end - - test "save_tags and verify that 'other' properties are retained" do - use_token :active - - collection = api_fixture('collections')['collection_with_tags_owned_by_active'] - - new_tags = {"new_tag1" => "new_tag1_value", - "new_tag2" => "new_tag2_value"} - - post :save_tags, { - id: collection['uuid'], - tag_data: new_tags, - format: :js, - }, session_for(:active) - - assert_response :success - assert_equal true, response.body.include?("new_tag1") - assert_equal true, response.body.include?("new_tag1_value") - assert_equal true, response.body.include?("new_tag2") - assert_equal true, response.body.include?("new_tag2_value") - assert_equal false, response.body.include?("existing tag 1") - assert_equal false, response.body.include?("value for existing tag 1") - - updated_tags = Collection.find(collection['uuid']).properties - assert_equal true, updated_tags.keys.include?(:'new_tag1') - assert_equal new_tags['new_tag1'], updated_tags[:'new_tag1'] - assert_equal true, updated_tags.keys.include?(:'new_tag2') - assert_equal new_tags['new_tag2'], updated_tags[:'new_tag2'] - assert_equal false, updated_tags.keys.include?(:'existing tag 1') - assert_equal false, updated_tags.keys.include?(:'existing tag 2') - end end