Address review comments

Deduplicate code in tests and minor clean-up

Signed-off-by: Sudha Parimala <sudharg247@gmail.com>

Author: Sudha247

CHANGES.md

@@ -2,7 +2,7 @@
 
 ### Added
 
-- Add support for marking a release as a prerelease. Closes  (#PR_NUMBER,
+- Add support for marking a release as a prerelease. Closes  (#517,
   @Sudha247, closes #516)
 
 ## 2.2.0

bin/cli.ml

@@ -186,7 +186,9 @@ let draft =
   named (fun x -> `Draft x) Arg.(value & flag & info [ "draft" ] ~doc)
 
 let prerelease =
-  let doc = "Produce a release that is marked as prerelease." in
+  let doc =
+    "Produce a release that is marked as prerelease on the Github release."
+  in
   named (fun x -> `Prerelease x) Arg.(value & flag & info [ "prerelease" ] ~doc)
 
 let yes =

tests/bin/prerelease/dune

@@ -0,0 +1,2 @@
+(cram
+ (deps %{bin:dune-release}))

tests/bin/prerelease/run.t

@@ -3,10 +3,6 @@ We need a basic opam project skeleton
   $ cat > CHANGES.md << EOF
   > ## 0.1.0
   > 
-  > - Some other feature
-  > 
-  > ## 0.0.0
-  > 
   > - Some feature
   > EOF
   $ cat > whatever.opam << EOF
@@ -46,4 +42,4 @@ We create a prerelease through the `dune-release` process.
 prerelease and submit it as such to GitHub.
 
   $ dune-release publish --dry-run --yes --prerelease | grep prerelease
-       {"tag_name":"0.1.0","name":"0.1.0","body":"CHANGES:\n\n- Some other feature\n","draft":false,"prerelease":true}
+       {"tag_name":"0.1.0","name":"0.1.0","body":"CHANGES:\n\n- Some feature\n","draft":false,"prerelease":true}

tests/lib/test_github_v3_api.ml

@@ -1,80 +1,52 @@
 open Dune_release.Github_v3_api
 
 let test_create_release =
-  let make_test ~test_name ~version ~tag ~msg ~user ~repo ~draft ~expected
-      ~prerelease =
-    let version = Dune_release.Version.of_string version in
-    let tag = Dune_release.Vcs.Tag.of_string tag in
+  let version = "1.1.0"
+  and tag = "1.1.0"
+  and msg = "this is a message"
+  and user = "you"
+  and repo = "some-repo"
+  and draft = false in
+  let make_test ~test_name ~prerelease =
+    let expected : Dune_release.Curl.t =
+      {
+        url = "https://api.github.com/repos/you/some-repo/releases";
+        meth = `POST;
+        args =
+          [
+            Location;
+            Silent;
+            Show_error;
+            Config `Stdin;
+            Dump_header `Ignore;
+            Data
+              (`Data
+                 (Yojson.Basic.to_string
+                    (`Assoc
+                       [
+                         ("tag_name", `String tag);
+                         ("name", `String version);
+                         ("body", `String msg);
+                         ("draft", `Bool draft);
+                         ("prerelease", `Bool prerelease);
+                       ])));
+          ];
+      }
+    in
     let test_fun () =
+      let version = Dune_release.Version.of_string version in
+      let tag = Dune_release.Vcs.Tag.of_string tag in
+
       let actual =
         Release.Request.create ~version ~tag ~msg ~user ~repo ~draft ~prerelease
       in
       Alcotest.check Alcotest_ext.curl test_name expected actual
     in
     (test_name, `Quick, test_fun)
   in
-  let version = "1.1.0"
-  and tag = "1.1.0"
-  and msg = "this is a message"
-  and user = "you"
-  and repo = "some-repo"
-  and draft = false in
-
   [
-    (let prerelease = false in
-     make_test ~test_name:"simple-release" ~version ~tag ~msg ~user ~repo ~draft
-       ~prerelease
-       ~expected:
-         {
-           url = "https://api.github.com/repos/you/some-repo/releases";
-           meth = `POST;
-           args =
-             [
-               Location;
-               Silent;
-               Show_error;
-               Config `Stdin;
-               Dump_header `Ignore;
-               Data
-                 (`Data
-                    (Yojson.Basic.to_string
-                       (`Assoc
-                          [
-                            ("tag_name", `String tag);
-                            ("name", `String version);
-                            ("body", `String msg);
-                            ("draft", `Bool draft);
-                            ("prerelease", `Bool prerelease);
-                          ])));
-             ];
-         });
-    (let prerelease = true in
-     make_test ~test_name:"simple-prerelease" ~version ~tag ~msg ~user ~repo
-       ~draft ~prerelease
-       ~expected:
-         {
-           url = "https://api.github.com/repos/you/some-repo/releases";
-           meth = `POST;
-           args =
-             [
-               Location;
-               Silent;
-               Show_error;
-               Config `Stdin;
-               Dump_header `Ignore;
-               Data
-                 (`Data
-                    (Yojson.Basic.to_string
-                       (`Assoc
-                          [
-                            ("tag_name", `String tag);
-                            ("name", `String version);
-                            ("body", `String msg);
-                            ("draft", `Bool draft);
-                            ("prerelease", `Bool prerelease);
-                          ])));
-             ];
-         });
+    make_test ~test_name:"simple-release" ~prerelease:false;
+    make_test ~test_name:"simple-prerelease" ~prerelease:true;
   ]
 
 let test_upload_archive =