X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1dd7a37a31234899a0a87e8287260538a99c62a8..aceb1f665394d84ec238d6654b5447a37c2bc3b3:/services/api/test/functional/application_controller_test.rb diff --git a/services/api/test/functional/application_controller_test.rb b/services/api/test/functional/application_controller_test.rb index 175a8f71ea..af7882141e 100644 --- a/services/api/test/functional/application_controller_test.rb +++ b/services/api/test/functional/application_controller_test.rb @@ -24,9 +24,6 @@ class ApplicationControllerTest < ActionController::TestCase token_time = token.split('+', 2).first.to_i assert_operator(token_time, :>=, @start_stamp, "error token too old") assert_operator(token_time, :<=, now_timestamp, "error token too new") - json_response['errors'].each do |err| - assert_match(/req-[a-z0-9]{20}/, err, "X-Request-Id value missing on error message") - end end def check_404(errmsg="Path not found") @@ -56,28 +53,6 @@ class ApplicationControllerTest < ActionController::TestCase check_error_token end - test "X-Request-Id header" do - authorize_with :spectator - get(:index) - assert_match /^req-[0-9a-zA-Z]{20}$/, response.headers['X-Request-Id'] - end - - # The response header is the one that gets logged, so this test also - # ensures we log the ID supplied in the request, if any. - test "X-Request-Id given by client" do - authorize_with :spectator - @request.headers['X-Request-Id'] = 'abcdefG' - get(:index) - assert_equal 'abcdefG', response.headers['X-Request-Id'] - end - - test "X-Request-Id given by client is ignored if too long" do - authorize_with :spectator - @request.headers['X-Request-Id'] = 'abcdefG' * 1000 - get(:index) - assert_match /^req-[0-9a-zA-Z]{20}$/, response.headers['X-Request-Id'] - end - ['foo', '', 'FALSE', 'TRUE', nil, [true], {a:true}, '"true"'].each do |bogus| test "bogus boolean parameter #{bogus.inspect} returns error" do @controller = Arvados::V1::GroupsController.new @@ -100,7 +75,7 @@ class ApplicationControllerTest < ActionController::TestCase @controller = Arvados::V1::GroupsController.new authorize_with :active post :create, params: { - group: {}, + group: {group_class: "project"}, ensure_unique_name: boolparam } assert_response :success @@ -113,7 +88,8 @@ class ApplicationControllerTest < ActionController::TestCase post :create, params: { group: { name: groups(:aproject).name, - owner_uuid: groups(:aproject).owner_uuid + owner_uuid: groups(:aproject).owner_uuid, + group_class: "project" }, ensure_unique_name: boolparam }