fix some tests

kflansburg · kflansburg · commit d47e4764ec58 · 2024-03-11T16:48:42.000-04:00
diff --git a/worker-sandbox/src/d1.rs b/worker-sandbox/src/d1.rs
@@ -83,7 +83,9 @@ pub async fn exec(req: http::Request<Body>, env: &Env) -> Result<http::Response<
 
 pub async fn dump(env: &Env) -> Result<http::Response<Body>> {
     let db = env.d1("DB")?;
+    console_log!("HERE");
     let bytes = db.dump().await?;
+    console_log!("TERE");
     Ok(http::Response::new(bytes.into()))
 }
 
@@ -97,7 +99,7 @@ pub async fn error(env: &Env) -> Result<http::Response<Body>> {
     if let Error::D1(error) = error {
         assert_eq!(
             error.cause(),
-            "Error in line 1: THIS IS NOT VALID SQL: SqliteError: near \"THIS\": syntax error"
+            "Error in line 1: THIS IS NOT VALID SQL: near \"THIS\": syntax error at offset 0"
         )
     } else {
         panic!("expected D1 error");
diff --git a/worker-sandbox/src/lib.rs b/worker-sandbox/src/lib.rs
@@ -330,6 +330,12 @@ pub async fn main(
             // https://developers.cloudflare.com/workers/platform/compatibility-dates#durable-object-stubfetch-requires-a-full-url
             stub.fetch_with_str("https://fake-host/alarm").await
         })
+        .get("/durable/put-raw", |req, ctx| async move {
+            let namespace = ctx.data.durable_object("PUT_RAW_TEST_OBJECT")?;
+            let id = namespace.unique_id()?;
+            let stub = id.get_stub()?;
+            stub.fetch_with_request(req).await
+        })
         .get("/durable/:id", |_req, ctx| async move {
             let namespace = ctx.data.durable_object("COUNTER")?;
             let stub = namespace.id_from_name("A")?.get_stub()?;
@@ -469,7 +475,7 @@ pub async fn main(
             let mut init = RequestInit::new();
             init.method = Method::POST;
 
-            let req = http::Request::post("https://httpbin.org/post").body(()).unwrap();
+            let req = http::Request::post("http://httpbin.org/post").body(()).unwrap();
             fetch_with_init(req, &init).await
         })
         .get("/cancelled-fetch", |_, _| async move {
diff --git a/worker-sandbox/tests/mf.ts b/worker-sandbox/tests/mf.ts
@@ -1,5 +1,5 @@
 import { Miniflare, Response } from "miniflare";
-import { MockAgent } from "undici";
+import { MockAgent, MockClient } from "undici";
 
 const mockAgent = new MockAgent();
 
@@ -8,6 +8,12 @@ mockAgent
   .intercept({ path: "/" })
   .reply(200, "cloudflare!");
 
+let httpbinClient = new MockClient("https://httpbin.org", { agent: mockAgent });
+httpbinClient.intercept({ path: "/post", method: 'POST' })
+  .reply(200, {
+    url: "http://httpbin.org/post"
+  });
+
 mockAgent
   .get("https://miniflare.mocks")
   .intercept({ path: "/delay" })
diff --git a/worker-sandbox/tests/subrequest.spec.ts b/worker-sandbox/tests/subrequest.spec.ts
@@ -22,7 +22,7 @@ describe("subrequest", () => {
       "https://fake.host/request-init-fetch-post"
     );
     expect(await resp.json()).toMatchObject({
-      url: "https://httpbin.org/post",
+      url: "http://httpbin.org/post",
     });
   });
 });
diff --git a/worker-sandbox/wrangler.toml b/worker-sandbox/wrangler.toml
@@ -28,8 +28,8 @@ bindings = [
 [[d1_databases]]
 binding = 'DB'
 database_name = 'my_db'
-database_id = 'test'
-preview_database_id = 'preview-test'
+database_id = '8b1e9b5a-788c-4aed-adcf-409b61dd5da8'
+preview_database_id = '8b1e9b5a-788c-4aed-adcf-409b61dd5da8'
 
 [[queues.consumers]]
 queue = "my_queue"
