From ab85088f34666461e431588a4ec78c0e70c1ba70 Mon Sep 17 00:00:00 2001
From: Jack Wright <jack.wright@disqo.com>
Date: Fri, 28 Jun 2024 16:00:54 -0700
Subject: [PATCH] fixing tests

---
 crates/nu-command/src/network/http/delete.rs  | 12 +---------
 .../tests/commands/network/http/delete.rs     | 19 +++++++++++++++
 .../tests/commands/network/http/patch.rs      | 23 ++++++++++++++++++-
 .../tests/commands/network/http/post.rs       | 22 +++++++++++++++++-
 .../tests/commands/network/http/put.rs        | 23 ++++++++++++++++++-
 5 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/crates/nu-command/src/network/http/delete.rs b/crates/nu-command/src/network/http/delete.rs
index 58525d3a16..c2ef774a01 100644
--- a/crates/nu-command/src/network/http/delete.rs
+++ b/crates/nu-command/src/network/http/delete.rs
@@ -163,7 +163,7 @@ fn run_delete(
     input: PipelineData,
 ) -> Result<PipelineData, ShellError> {
     let (data, maybe_metadata) = call
-        .opt::<Value>(engine_state, stack, 1)?
+        .get_flag::<Value>(engine_state, stack, "data")?
         .map(|v| (HttpBody::Value(v), None))
         .unwrap_or_else(|| match input {
             PipelineData::Value(v, metadata) => (HttpBody::Value(v), metadata),
@@ -176,16 +176,6 @@ fn run_delete(
         .get_flag(engine_state, stack, "content-type")?
         .or_else(|| maybe_metadata.and_then(|m| m.content_type));
 
-    if let HttpBody::None = data {
-        return Err(ShellError::GenericError {
-            error: "Data must be provided either through pipeline or positional argument".into(),
-            msg: "".into(),
-            span: Some(call.head),
-            help: None,
-            inner: vec![],
-        });
-    }
-
     let args = Arguments {
         url: call.req(engine_state, stack, 0)?,
         headers: call.get_flag(engine_state, stack, "headers")?,
diff --git a/crates/nu-command/tests/commands/network/http/delete.rs b/crates/nu-command/tests/commands/network/http/delete.rs
index bc71ed3945..c284c2ccfd 100644
--- a/crates/nu-command/tests/commands/network/http/delete.rs
+++ b/crates/nu-command/tests/commands/network/http/delete.rs
@@ -20,6 +20,25 @@ fn http_delete_is_success() {
     assert!(actual.out.is_empty())
 }
 
+#[test]
+fn http_delete_is_success_pipeline() {
+    let mut server = Server::new();
+
+    let _mock = server.mock("DELETE", "/").create();
+
+    let actual = nu!(pipeline(
+        format!(
+            r#"
+        "foo" | http delete {url}
+        "#,
+            url = server.url()
+        )
+        .as_str()
+    ));
+
+    assert!(actual.out.is_empty())
+}
+
 #[test]
 fn http_delete_failed_due_to_server_error() {
     let mut server = Server::new();
diff --git a/crates/nu-command/tests/commands/network/http/patch.rs b/crates/nu-command/tests/commands/network/http/patch.rs
index 4196b304c6..dc3a755baa 100644
--- a/crates/nu-command/tests/commands/network/http/patch.rs
+++ b/crates/nu-command/tests/commands/network/http/patch.rs
@@ -20,6 +20,25 @@ fn http_patch_is_success() {
     assert!(actual.out.is_empty())
 }
 
+#[test]
+fn http_patch_is_success_pipeline() {
+    let mut server = Server::new();
+
+    let _mock = server.mock("PATCH", "/").match_body("foo").create();
+
+    let actual = nu!(pipeline(
+        format!(
+            r#"
+        "foo" | http patch {url}
+        "#,
+            url = server.url()
+        )
+        .as_str()
+    ));
+
+    assert!(actual.out.is_empty())
+}
+
 #[test]
 fn http_patch_failed_due_to_server_error() {
     let mut server = Server::new();
@@ -55,7 +74,9 @@ fn http_patch_failed_due_to_missing_body() {
         .as_str()
     ));
 
-    assert!(actual.err.contains("Usage: http patch"))
+    assert!(actual
+        .err
+        .contains("Data must be provided either through pipeline or positional argument"))
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/network/http/post.rs b/crates/nu-command/tests/commands/network/http/post.rs
index bd13542482..02aa8df23f 100644
--- a/crates/nu-command/tests/commands/network/http/post.rs
+++ b/crates/nu-command/tests/commands/network/http/post.rs
@@ -19,6 +19,24 @@ fn http_post_is_success() {
 
     assert!(actual.out.is_empty())
 }
+#[test]
+fn http_post_is_success_pipeline() {
+    let mut server = Server::new();
+
+    let _mock = server.mock("POST", "/").match_body("foo").create();
+
+    let actual = nu!(pipeline(
+        format!(
+            r#"
+        "foo" | http post {url}
+        "#,
+            url = server.url()
+        )
+        .as_str()
+    ));
+
+    assert!(actual.out.is_empty())
+}
 
 #[test]
 fn http_post_failed_due_to_server_error() {
@@ -55,7 +73,9 @@ fn http_post_failed_due_to_missing_body() {
         .as_str()
     ));
 
-    assert!(actual.err.contains("Usage: http post"))
+    assert!(actual
+        .err
+        .contains("Data must be provided either through pipeline or positional argument"))
 }
 
 #[test]
diff --git a/crates/nu-command/tests/commands/network/http/put.rs b/crates/nu-command/tests/commands/network/http/put.rs
index 002b1f8632..43251cd21a 100644
--- a/crates/nu-command/tests/commands/network/http/put.rs
+++ b/crates/nu-command/tests/commands/network/http/put.rs
@@ -20,6 +20,25 @@ fn http_put_is_success() {
     assert!(actual.out.is_empty())
 }
 
+#[test]
+fn http_put_is_success_pipeline() {
+    let mut server = Server::new();
+
+    let _mock = server.mock("PUT", "/").match_body("foo").create();
+
+    let actual = nu!(pipeline(
+        format!(
+            r#"
+        "foo" | http put {url} 
+        "#,
+            url = server.url()
+        )
+        .as_str()
+    ));
+
+    assert!(actual.out.is_empty())
+}
+
 #[test]
 fn http_put_failed_due_to_server_error() {
     let mut server = Server::new();
@@ -55,7 +74,9 @@ fn http_put_failed_due_to_missing_body() {
         .as_str()
     ));
 
-    assert!(actual.err.contains("Usage: http put"))
+    assert!(actual
+        .err
+        .contains("Data must be provided either through pipeline or positional argument"))
 }
 
 #[test]