robur/builder-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor and fix tests

Browse source 
Uuidm.of_string doesn't check if there are additional bytes at the end,
so check for length as well.
This commit is contained in:
Reynir Björnsson 2022-07-12 11:15:04 +02:00
parent cb43734b7b
commit da28758137
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
test/router.ml
View file

@ -21,8 +21,8 @@ module Param_verification = struct
let is_uuid = function let is_uuid = function
| Some (param, value) -> | Some (param, value) ->
begin match Uuidm.of_string value with begin match Uuidm.of_string value with
| Some _ -> None | Some _ when String.length value = 36 -> None
| None -> Some { | _ -> Some {
param; param;
expected = "Uuidm.t" expected = "Uuidm.t"
} }
@ -32,7 +32,9 @@ module Param_verification = struct
end end
let param req tag = let param req tag =
try Some (tag, Dream.param req tag) with _ -> None match Dream.param req tag with
| param -> Some (tag, param)
| exception _ -> None
let ( &&& ) v v' = let ( &&& ) v v' =
match v with match v with
@ -41,11 +43,11 @@ module Param_verification = struct
let verify req = let verify req =
let verified_params = let verified_params =
(param req "job" |> P.is_string) P.is_string (param req "job")
&&& (param req "build" |> P.is_uuid) &&& P.is_uuid (param req "build")
&&& (param req "build_left" |> P.is_uuid) &&& P.is_uuid (param req "build_left")
&&& (param req "build_right" |> P.is_uuid) &&& P.is_uuid (param req "build_right")
&&& (param req "platform" |> P.is_string) &&& P.is_string (param req "platform")
in in
let response_json = let response_json =
verified_params |> to_yojson |> Yojson.Safe.to_string verified_params |> to_yojson |> Yojson.Safe.to_string
@ -55,13 +57,18 @@ module Param_verification = struct
end end
let router = let router =
let tmp = Fpath.v "/tmp" in (* XXX: this relies on [Builder_web.routes] only using {data,cache,config}dir
Builder_web.routes ~datadir:tmp ~cachedir:tmp ~configdir:tmp * in the handlers which are never called here. The path /nonexistant is
* assumed to not exist. *)
let nodir = Fpath.v "/nonexistant" in
Builder_web.routes ~datadir:nodir ~cachedir:nodir ~configdir:nodir
|> List.map (fun (meth, route, _handler) -> |> List.map (fun (meth, route, _handler) ->
meth, route, Param_verification.verify) meth, route, Param_verification.verify)
|> Builder_web.to_dream_routes |> Builder_web.to_dream_routes
|> Dream.router |> Dream.router
|> Builder_web.Middleware.remove_trailing_url_slash (* XXX: we test without remove_trailing_url_slash to ensure we don't produce
* urls with trailing slashes: *)
(* |> Builder_web.Middleware.remove_trailing_url_slash *)
|> Dream.test |> Dream.test
let test_link method_ target () = let test_link method_ target () =
@ -74,10 +81,9 @@ let test_link method_ target () =
|> Lwt_main.run |> Lwt_main.run
|> Yojson.Safe.from_string |> Yojson.Safe.from_string
|> Param_verification.of_yojson |> Param_verification.of_yojson
|> Result.get_ok
in in
Alcotest.(check' Param_verification.alcotyp ~msg:"param-verification" Alcotest.(check' (result Param_verification.alcotyp string) ~msg:"param-verification"
~actual:body ~expected:None) ~actual:body ~expected:(Ok None))
let test_link_artifact artifact = let test_link_artifact artifact =
let job_name = "test" in let job_name = "test" in