Add more curl tests

Author: LucasPickering

crates/cli/src/completions.rs

@@ -161,7 +161,21 @@ mod tests {
     #[rstest]
     fn test_complete_recipe(_current_dir: CurrentDirGuard) {
         let completions = complete(complete_recipe());
-        assert_eq!(&completions, &["getUser", "jsonBody", "chained"]);
+        assert_eq!(
+            &completions,
+            &[
+                "getUser",
+                "query",
+                "headers",
+                "authBasic",
+                "authBearer",
+                "textBody",
+                "jsonBody",
+                "fileBody",
+                "multipart",
+                "chained"
+            ]
+        );
     }
 
     /// Complete request IDs from the database

crates/cli/tests/slumber.yml

@@ -20,21 +20,59 @@ requests:
     method: GET
     url: "{{ host }}/users/{{ username }}"
 
+  query:
+    method: GET
+    url: "{{ host }}/query"
+    query:
+      a: 1
+      b: [2, 3]
+
+  headers:
+    method: GET
+    url: "{{ host }}/headers"
+    headers:
+      Content-Type: text/plain
+
+  authBasic:
+    method: GET
+    url: "{{ host }}/headers"
+    authentication:
+      type: basic
+      username: "{{ username }}"
+      password: hunter2
+
+  authBearer:
+    method: GET
+    url: "{{ host }}/headers"
+    authentication:
+      type: bearer
+      token: my-token
+
+  textBody:
+    method: POST
+    url: "{{ host }}/text"
+    body: "This is an HTTP body"
+
   jsonBody:
     method: POST
     url: "{{ host }}/json"
     body:
       type: json
       data: { "username": "{{ username }}", "name": "Frederick Smidgen" }
 
+  fileBody:
+    method: POST
+    url: "{{ host }}/file"
+    body: "{{ file('test_data/data.json') }}"
+
   multipart:
     method: POST
     url: "{{ host }}/multipart"
     body:
       type: form_multipart
       data:
         username: "{{ username }}"
-        file: "{{ file('data.json') }}"
+        file: "{{ file('test_data/data.json') }}"
 
   chained:
     method: GET

crates/cli/tests/test_data

@@ -0,0 +1 @@
+../../../test_data

crates/cli/tests/test_generate.rs

@@ -3,66 +3,76 @@
 mod common;
 
 use crate::common::tests_dir;
+use rstest::rstest;
 use serde_json::json;
 use slumber_core::database::Database;
 use wiremock::{Mock, MockServer, ResponseTemplate, matchers};
 
-/// Test generating a curl command with:
-/// - URL
-/// - Query params
-/// - Headers
-#[test]
-fn test_generate_curl() {
+/// Test generating a curl command with a variety of request components
+#[rstest]
+#[case::url(
+    &["getUser"],
+    "curl -XGET --url 'http://server/users/username1'\n",
+)]
+#[case::query(
+    &["query"],
+    "curl -XGET --url 'http://server/query?a=1&b=2&b=3'\n",
+)]
+#[case::headers(
+    &["headers"],
+    "curl -XGET --url 'http://server/headers' \
+    --header 'content-type: text/plain'\n",
+)]
+#[case::authentication_basic(
+    &["authBasic"],
+    "curl -XGET --url 'http://server/headers' --user 'username1:hunter2'\n",
+)]
+#[case::authentication_bearer(
+    &["authBearer"],
+    "curl -XGET --url 'http://server/headers' \
+    --header 'authorization: Bearer my-token'\n",
+)]
+#[case::text(
+    &["textBody"],
+    "curl -XPOST --url 'http://server/text' --data 'This is an HTTP body'\n",
+)]
+#[case::json(
+    &["jsonBody"],
+    "curl -XPOST --url 'http://server/json' \
+    --json '{\"username\":\"username1\",\"name\":\"Frederick Smidgen\"}'\n",
+)]
+#[case::file(
+    &["fileBody"],
+    "curl -XPOST --url 'http://server/file' --data '{ \"a\": 1, \"b\": 2 }'\n",
+)]
+#[case::multipart(
+    &["multipart"],
+    "curl -XPOST --url 'http://server/multipart' \
+    -F 'username=username1' \
+    -F 'file=@{ROOT}/test_data/data.json'\n"
+)]
+#[case::profile(
+    &["getUser", "-p", "profile2"],
+    "curl -XGET --url 'http://server/users/username2'\n",
+)]
+#[case::overrides(
+    &["getUser", "-o", "username=username3"],
+    "curl -XGET --url 'http://server/users/username3'\n",
+)]
+fn test_generate_curl(
+    #[case] arguments: &[&str],
+    #[case] expected: &'static str,
+) {
     let (mut command, _) = common::slumber();
-    command.args(["generate", "curl", "getUser"]);
-    command
-        .assert()
-        .success()
-        .stdout("curl -XGET --url 'http://server/users/username1'\n");
-}
+    command.args(["generate", "curl"]);
+    command.args(arguments);
 
-/// Make sure the profile option is reflected correctly
-#[test]
-fn test_generate_curl_profile() {
-    let (mut command, _) = common::slumber();
-    command.args(["generate", "curl", "getUser", "-p", "profile2"]);
-    command
-        .assert()
-        .success()
-        .stdout("curl -XGET --url 'http://server/users/username2'\n");
+    // The expected output may contain file paths, which will be dynamic based
+    // on the system, so we need to make the expectation dynamic too
+    let expected = expected.replace("{ROOT}", &tests_dir().to_string_lossy());
+    command.assert().success().stdout(expected);
 }
 
-/// Make sure field overrides are applied correctly
-#[test]
-fn test_generate_curl_override() {
-    let (mut command, _) = common::slumber();
-    command.args(["generate", "curl", "getUser", "-o", "username=username3"]);
-    command
-        .assert()
-        .success()
-        .stdout("curl -XGET --url 'http://server/users/username3'\n");
-}
-
-/// Test generating a curl command with a multipart form body, where one field
-/// is streamed from a file
-#[test]
-fn test_generate_curl_multipart() {
-    let (mut command, _) = common::slumber();
-    command.args(["generate", "curl", "multipart"]);
-    command.assert().success().stdout(
-        "curl -XPOST --url 'http://server/multipart' \
-            -F 'username=username1' \
-            -F 'file=@{ROOT}/data.json'\n"
-            // The path is dynamic based on the system, so we need to make the
-            // expectation dynamic too
-            .replace("{ROOT}", &tests_dir().to_string_lossy()),
-    );
-}
-
-// TODO file body test
-// TODO text body test
-// TODO json body test
-
 /// Test failure when a downstream request is needed but cannot be triggered
 #[test]
 fn test_generate_curl_trigger_error() {

crates/core/src/http/tests.rs

@@ -339,8 +339,7 @@ Content-Disposition: form-data; name=\"user_id\"\r
 Content-Disposition: form-data; name=\"file\"; filename=\"data.json\"\r
 Content-Type: application/json\r
 \r
-{ \"a\": 1, \"b\": 2 }
-\r
+{ \"a\": 1, \"b\": 2 }\r
 --BOUNDARY--\r
 ",
 )]
@@ -356,8 +355,7 @@ Content-Type: application/json\r
     "--BOUNDARY\r
 Content-Disposition: form-data; name=\"file\"\r
 \r
-data: { \"a\": 1, \"b\": 2 }
-\r
+data: { \"a\": 1, \"b\": 2 }\r
 --BOUNDARY--\r
 ",
 )]

crates/template/src/tests.rs

@@ -51,7 +51,7 @@ async fn test_expression(#[case] template: Template, #[case] expected: Value) {
     Value::Bytes(b"my name is \xc3\x28".as_slice().into(),
 ))]
 // Stream gets resolved to bytes, then converted to a string
-#[case::stream("{{ stream() }}", "{ \"a\": 1, \"b\": 2 }\n".into())]
+#[case::stream("{{ stream() }}", "{ \"a\": 1, \"b\": 2 }".into())]
 #[tokio::test]
 async fn test_render_value(
     #[case] template: Template,
@@ -68,11 +68,11 @@ async fn test_render_value(
 
 /// Render to a stream
 #[rstest]
-#[case::stream("{{ stream() }}", b"{ \"a\": 1, \"b\": 2 }\n", true)]
-#[case::text("text: {{ stream() }}", b"text: { \"a\": 1, \"b\": 2 }\n", false)]
+#[case::stream("{{ stream() }}", b"{ \"a\": 1, \"b\": 2 }", true)]
+#[case::text("text: {{ stream() }}", b"text: { \"a\": 1, \"b\": 2 }", false)]
 #[case::binary(
     "{{ invalid_utf8 }} {{ stream() }}",
-    b"\xc3\x28 { \"a\": 1, \"b\": 2 }\n",
+    b"\xc3\x28 { \"a\": 1, \"b\": 2 }",
     false
 )]
 #[tokio::test]