X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2768b056f5d99952d2d2c4ba8cd1dfbb898901e3..407f1cf196f60f4af21c89cbdccb2c98e05518fb:/apps/workbench/test/functional/collections_controller_test.rb diff --git a/apps/workbench/test/functional/collections_controller_test.rb b/apps/workbench/test/functional/collections_controller_test.rb index 7a1516116b..569343e4b9 100644 --- a/apps/workbench/test/functional/collections_controller_test.rb +++ b/apps/workbench/test/functional/collections_controller_test.rb @@ -1,6 +1,17 @@ require 'test_helper' class CollectionsControllerTest < ActionController::TestCase + NONEXISTENT_COLLECTION = "ffffffffffffffffffffffffffffffff+0" + + def stub_file_content + # For the duration of the current test case, stub file download + # content with a randomized (but recognizable) string. Return the + # string, the test case can use it in assertions. + txt = 'the quick brown fox ' + rand(2**32).to_s + @controller.stubs(:file_enumerator).returns([txt]) + txt + end + def collection_params(collection_name, file_name=nil) uuid = api_fixture('collections')[collection_name.to_s]['uuid'] params = {uuid: uuid, id: uuid} @@ -8,13 +19,6 @@ class CollectionsControllerTest < ActionController::TestCase params end - def expected_contents(params, token) - unless token.is_a? String - token = params[:api_token] || token[:arvados_api_token] - end - [token, params[:uuid], params[:file]].join('/') - end - def assert_hash_includes(actual_hash, expected_hash, msg=nil) expected_hash.each do |key, value| assert_equal(value, actual_hash[key], msg) @@ -40,24 +44,16 @@ class CollectionsControllerTest < ActionController::TestCase assert_response response end - # Mock the collection file reader to avoid external calls and return - # a predictable string. - CollectionsController.class_eval do - def file_enumerator(opts) - [[opts[:arvados_api_token], opts[:uuid], opts[:file]].join('/')] - end - end - test "viewing a collection" do show_collection(:foo_file, :active) assert_equal([['.', 'foo', 3]], assigns(:object).files) end - test "viewing a collection fetches related folders" do - show_collection(:foo_file, :active) - assert_includes(assigns(:folders).map(&:uuid), - api_fixture('groups')['afolder']['uuid'], - "controller did not find linked folder") + test "viewing a collection fetches related projects" do + show_collection({id: api_fixture('collections')["foo_file"]['portable_data_hash']}, :active) + assert_includes(assigns(:same_pdh).map(&:owner_uuid), + api_fixture('groups')['aproject']['uuid'], + "controller did not find linked project") end test "viewing a collection fetches related permissions" do @@ -88,37 +84,31 @@ class CollectionsControllerTest < ActionController::TestCase "controller did not find related log") end - test "viewing a collection with a reader token" do + test "viewing collection files with a reader token" do params = collection_params(:foo_file) - params[:reader_tokens] = - [api_fixture('api_client_authorizations')['active']['api_token']] - show_collection(params) + params[:reader_token] = + api_fixture('api_client_authorizations')['active']['api_token'] + get(:show_file_links, params) + assert_response :success assert_equal([['.', 'foo', 3]], assigns(:object).files) assert_no_session end - test "viewing the index with a reader token" do - params = {reader_tokens: - [api_fixture('api_client_authorizations')['spectator']['api_token']] - } - get(:index, params) - assert_response :success - assert_no_session - listed_collections = assigns(:collections).map { |c| c.uuid } - assert_includes(listed_collections, - api_fixture('collections')['bar_file']['uuid'], - "spectator reader token didn't list bar file") - refute_includes(listed_collections, - api_fixture('collections')['foo_file']['uuid'], - "spectator reader token listed foo file") + test "reader token Collection links end with trailing slash" do + # Testing the fix for #2937. + session = session_for(:active_trustedclient) + post(:share, collection_params(:foo_file), session) + assert(@controller.download_link.ends_with? '/', + "Collection share link does not end with slash for wget") end test "getting a file from Keep" do params = collection_params(:foo_file, 'foo') sess = session_for(:active) + expect_content = stub_file_content get(:show_file, params, sess) assert_response :success - assert_equal(expected_contents(params, sess), @response.body, + assert_equal(expect_content, @response.body, "failed to get a correct file from Keep") end @@ -126,7 +116,7 @@ class CollectionsControllerTest < ActionController::TestCase params = collection_params(:foo_file, 'foo') sess = session_for(:spectator) get(:show_file, params, sess) - assert_includes([403, 404], @response.code.to_i) + assert_response 404 end test "trying to get a nonexistent file from Keep returns a 404" do @@ -139,10 +129,11 @@ class CollectionsControllerTest < ActionController::TestCase test "getting a file from Keep with a good reader token" do params = collection_params(:foo_file, 'foo') read_token = api_fixture('api_client_authorizations')['active']['api_token'] - params[:reader_tokens] = [read_token] + params[:reader_token] = read_token + expect_content = stub_file_content get(:show_file, params) assert_response :success - assert_equal(expected_contents(params, read_token), @response.body, + assert_equal(expect_content, @response.body, "failed to get a correct file from Keep using a reader token") assert_not_equal(read_token, session[:arvados_api_token], "using a reader token set the session's API token") @@ -150,9 +141,8 @@ class CollectionsControllerTest < ActionController::TestCase test "trying to get from Keep with an unscoped reader token prompts login" do params = collection_params(:foo_file, 'foo') - read_token = + params[:reader_token] = api_fixture('api_client_authorizations')['active_noscope']['api_token'] - params[:reader_tokens] = [read_token] get(:show_file, params) assert_response :redirect end @@ -161,12 +151,30 @@ class CollectionsControllerTest < ActionController::TestCase params = collection_params(:foo_file, 'foo') sess = session_for(:expired) read_token = api_fixture('api_client_authorizations')['active']['api_token'] - params[:reader_tokens] = [read_token] + params[:reader_token] = read_token + expect_content = stub_file_content get(:show_file, params, sess) assert_response :success - assert_equal(expected_contents(params, read_token), @response.body, + assert_equal(expect_content, @response.body, "failed to get a correct file from Keep using a reader token") assert_not_equal(read_token, session[:arvados_api_token], "using a reader token set the session's API token") end + + test "inactive user can retrieve user agreement" do + ua_collection = api_fixture('collections')['user_agreement'] + get :show_file, { + uuid: ua_collection['uuid'], + file: ua_collection['manifest_text'].match(/ \d+:\d+:(\S+)/)[1] + }, session_for(:inactive) + assert_nil(assigns(:unsigned_user_agreements), + "Did not skip check_user_agreements filter " + + "when showing the user agreement.") + assert_response :success + end + + test "requesting nonexistent Collection returns 404" do + show_collection({uuid: NONEXISTENT_COLLECTION, id: NONEXISTENT_COLLECTION}, + :active, 404) + end end