Set up tests with wasm-bindgen-test

Author: tomhoule

crates/xhr/Cargo.toml

@@ -1,4 +1,3 @@
-
 [package]
 name = "gloo-xhr"
 version = "0.1.0"
@@ -9,6 +8,7 @@ edition = "2018"
 wasm-bindgen = "0.2.37"
 js-sys = "0.3.14"
 http = "0.1.16"
+futures = "0.1.25"
 
 [dependencies.web-sys]
 version = "0.3.14"

crates/xhr/src/lib.rs

@@ -20,7 +20,9 @@ pub mod raw {
     impl XmlHttpRequest {
         /// Initialize an XmlHttpRequest.
         pub fn new() -> Self {
-            let xhr = web_sys::XmlHttpRequest::new().expect_throw("XMLHttpRequest constructor");
+            // we assume this is safe because all browsers that support webassembly
+            // implement XmlHttpRequest.
+            let xhr = web_sys::XmlHttpRequest::new().unwrap_throw();
             XmlHttpRequest { xhr }
         }
 
@@ -50,9 +52,19 @@ pub mod raw {
             self.xhr.abort().expect_throw("aborting XHR")
         }
 
+        /// Send without a body.
+        ///
+        /// Should probably be renamed.
+        pub fn send_no_body(&self) {
+            self.xhr
+                .send()
+                .expect_throw("Error sending request. Did you forget to call `open`?")
+        }
+
         /// Send!
         pub fn send<B: XhrBody>(&self, body: B) {
-            body.send(&self.xhr).expect_throw("sending XHR")
+            body.send(&self.xhr)
+                .expect_throw("Error sending request. Did you forget to call `open`?")
         }
 
         /// Set a header on the request.
@@ -88,7 +100,20 @@ pub mod raw {
                 .collect()
         }
 
+        /// The error callback can fire in cases such as CORS errors.
+        pub fn set_onerror<C>(&self, callback: C)
+        where
+            C: FnMut(web_sys::ProgressEvent) + 'static,
+        {
+            let closure = Closure::wrap(Box::new(callback) as Box<FnMut(web_sys::ProgressEvent)>);
+            self.xhr.set_onerror(Some(closure.as_ref().unchecked_ref()));
+            closure.forget();
+        }
+
         /// see mdn
+        ///
+        /// This takes an FnMut because the callback can be called more than once (if
+        /// `send` is called more than once)
         pub fn set_onload<C>(&self, callback: C)
         where
             C: FnMut(web_sys::ProgressEvent) + 'static,
@@ -152,7 +177,7 @@ pub mod raw {
         /// https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/readyState
         pub fn ready_state(&self) -> ReadyState {
             ReadyState::from_u16(self.xhr.ready_state())
-                .expect_throw("XMLHttpRequest ReadyState must be 0 < n < 4")
+                .expect_throw("XMLHttpRequest ReadyState must be 0 ≤ n ≤ 4")
         }
     }
 

crates/xhr/tests/web.rs

@@ -0,0 +1,55 @@
+//! Test suite for the Web and headless browsers.
+
+#![cfg(target_arch = "wasm32")]
+
+use futures::prelude::*;
+use gloo_xhr::raw::XmlHttpRequest;
+use wasm_bindgen::*;
+use wasm_bindgen_test::*;
+
+wasm_bindgen_test_configure!(run_in_browser);
+
+#[wasm_bindgen_test]
+fn constructor_does_not_throw() {
+    XmlHttpRequest::new();
+}
+
+#[wasm_bindgen_test(async)]
+fn minimal_request_empty_body() -> impl Future<Item = (), Error = wasm_bindgen::JsValue> {
+    use futures::sync::oneshot;
+
+    let (sender, receiver) = oneshot::channel::<()>();
+    let mut sender = Some(sender);
+
+    let request = XmlHttpRequest::new();
+
+    request.set_onload(move |_event| {
+        sender.take().map(|sender| sender.send(()).unwrap());
+    });
+
+    request.open(&http::Method::GET, "/");
+    request.send_no_body();
+
+    receiver.map_err(|_| JsValue::from_str("onload channel was canceled"))
+}
+
+#[wasm_bindgen_test(async)]
+fn on_error_callback() -> impl Future<Item = (), Error = wasm_bindgen::JsValue> {
+    use futures::sync::oneshot;
+
+    let (sender, receiver) = oneshot::channel::<()>();
+    let mut sender = Some(sender);
+
+    let request = XmlHttpRequest::new();
+
+    request.set_onerror(move |_event| {
+        sender.take().map(|sender| sender.send(()).unwrap());
+    });
+
+    // this will trigger a CORS error.
+    request.open(&http::Method::GET, "https://example.com/");
+
+    request.send_no_body();
+
+    receiver.map_err(|_| JsValue::from_str("onload channel was canceled"))
+}