Update integration-wagi component

Change approach to do test assertions in the test component.

Signed-off-by: Lann Martin <[email protected]>

Author: lann

tests/integration.rs

@@ -1040,11 +1040,6 @@ route = "/..."
             testing_framework::ServicesConfig::none(),
             move |env| {
                 let spin = env.runtime_mut();
-                assert_spin_request(
-                    spin,
-                    testing_framework::Request::new(reqwest::Method::GET, "/base/hello"),
-                    testing_framework::Response::new_with_body(200, "I'm a teapot"),
-                )?;
                 assert_spin_request(
                     spin,
                     testing_framework::Request::full(
@@ -1057,19 +1052,25 @@ route = "/..."
                 )?;
                 assert_spin_request(
                     spin,
-                    testing_framework::Request::new(reqwest::Method::GET, "/base/args?x=y"),
-                    testing_framework::Response::new_with_body(200, r#"["/base/args", "x=y"]"#),
+                    testing_framework::Request::full(
+                        Method::GET,
+                        "/base/assert-args?x=y",
+                        &[],
+                        Some(r#"["/base/assert-args", "x=y"]"#),
+                    ),
+                    testing_framework::Response::new(200),
                 )?;
                 assert_spin_request(
                     spin,
                     testing_framework::Request::full(
-                        reqwest::Method::GET,
-                        "/base/env?HTTP_X_CUSTOM_FOO",
+                        Method::GET,
+                        "/base/assert-env",
                         &[("X-Custom-Foo", "bar")],
-                        Option::<Vec<u8>>::None,
+                        Some(r#"{"HTTP_X_CUSTOM_FOO": "bar"}"#),
                     ),
-                    testing_framework::Response::new_with_body(200, "bar"),
-                )
+                    testing_framework::Response::new(200),
+                )?;
+                Ok(())
             },
         )?;
 

tests/test-components/components/Cargo.lock

@@ -1,4 +1,7 @@
 [package]
 name = "integration_wagi"
 version = "0.1.0"
-edition = "2021"
+edition = "2021"
+
+[dependencies]
+miniserde = "0.1.36"

tests/test-components/components/integration-wagi/Cargo.toml

@@ -1,21 +1,43 @@
-use std::error::Error;
+use std::{collections::HashMap, error::Error};
 
 fn main() -> Result<(), Box<dyn Error>> {
-    let body = match std::env::var("PATH_INFO")?.as_str() {
-        "/hello" => "I'm a teapot".into(),
-        "/echo" => std::io::read_to_string(std::io::stdin())?,
-        "/args" => format!("{:?}", std::env::args().collect::<Vec<_>>()),
-        "/env" => {
-            let key = std::env::args().nth(1).unwrap_or_default();
-            std::env::var(key)?
+    let mut body = "".to_string();
+    match std::env::var("PATH_INFO")?.as_str() {
+        // Echos request body to response body
+        "/echo" => {
+            body = std::io::read_to_string(std::io::stdin())?;
         }
+
+        // Asserts that WAGI args match the JSON array in the request body
+        "/assert-args" => {
+            let expected: Vec<String> = stdin_json()?;
+            let args = std::env::args().collect::<Vec<_>>();
+            if args != expected {
+                return Err(format!("expected args {expected:?} got {args:?}").into());
+            }
+        }
+
+        // Asserts that env vars contains the JSON object entries in the request body
+        "/assert-env" => {
+            let expected: HashMap<String, String> = stdin_json()?;
+            for (key, val) in expected {
+                let got = std::env::var(&key)?;
+                if got != val {
+                    return Err(format!("expected env var {key}={val:?}, got {got:?}").into());
+                }
+            }
+        }
+
         other => {
-            println!("Content-Type: text/plain");
-            println!("Status: 404\n\n");
-            println!("Not Found (PATH_INFO={other:?})");
-            return Ok(());
+            return Err(format!("unknown test route {other:?}").into());
         }
     };
+
     print!("Content-Type: text/plain\n\n{body}");
     Ok(())
 }
+
+fn stdin_json<T: miniserde::Deserialize>() -> Result<T, Box<dyn Error>> {
+    let body = std::io::read_to_string(std::io::stdin())?;
+    Ok(miniserde::json::from_str(&body)?)
+}