From fb470beb3b61117ef276505ced6b3f128e3fcffa Mon Sep 17 00:00:00 2001 From: Chinedu Francis Nwafili Date: Fri, 28 Feb 2020 12:51:24 -0500 Subject: [PATCH] Get slice tests running in CI --- crates/web-sys/tests/wasm/element.js | 15 ------------ .../wasm/whitelisted_immutable_slices.rs | 23 +++---------------- 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/crates/web-sys/tests/wasm/element.js b/crates/web-sys/tests/wasm/element.js index 92d3cfeee53..ed51fbdbe71 100644 --- a/crates/web-sys/tests/wasm/element.js +++ b/crates/web-sys/tests/wasm/element.js @@ -151,21 +151,6 @@ export function new_title() { return document.createElement("title"); } -export function new_webgl_rendering_context() { - const canvas = document.createElement('canvas'); - return canvas.getContext('webgl'); -} - -export function new_webgl2_rendering_context() { - const canvas = document.createElement('canvas'); - return canvas.getContext('webgl2'); -} - -export function new_websocket () { - const websocket = new WebSocket(""); - return websocket; -} - export function new_xpath_result() { let xmlDoc = new DOMParser().parseFromString("tomato", "application/xml"); let xpathResult = xmlDoc.evaluate("/root//value", xmlDoc, null, XPathResult.ANY_TYPE, null); diff --git a/crates/web-sys/tests/wasm/whitelisted_immutable_slices.rs b/crates/web-sys/tests/wasm/whitelisted_immutable_slices.rs index 5e39236cb54..19c79b862f9 100644 --- a/crates/web-sys/tests/wasm/whitelisted_immutable_slices.rs +++ b/crates/web-sys/tests/wasm/whitelisted_immutable_slices.rs @@ -10,24 +10,9 @@ //! //! @see https://github.com/rustwasm/wasm-bindgen/issues/1005 -use wasm_bindgen::prelude::*; use web_sys::{WebGl2RenderingContext, WebGlRenderingContext, WebSocket}; -use wasm_bindgen_test::*; -wasm_bindgen_test_configure!(run_in_browser); - -#[wasm_bindgen(module = "/tests/wasm/element.js")] -extern "C" { - fn new_webgl_rendering_context() -> WebGlRenderingContext; - fn new_webgl2_rendering_context() -> WebGl2RenderingContext; - fn new_websocket() -> WebSocket; -// TODO: Add a function to create another type to test here. -// These functions come from element.js -} - -// Ensure that our whitelisted WebGlRenderingContext methods work -// GECKODRIVER=geckodriver cargo test -p web-sys --target wasm32-unknown-unknown --all-features test_webgl_rendering_context_immutable_slices -#[wasm_bindgen_test] +// Ensure that our whitelisted WebGlRenderingContext methods compile with immutable slices. fn test_webgl_rendering_context_immutable_slices() { let gl = new_webgl_rendering_context(); @@ -70,8 +55,7 @@ fn test_webgl_rendering_context_immutable_slices() { gl.compressed_tex_image_2d_with_u8_array(0, 0, 0, 0, 0, 0, &[1]); } -// GECKODRIVER=geckodriver cargo test -p web-sys --target wasm32-unknown-unknown --all-features test_webgl2_rendering_context_immutable_slices -#[wasm_bindgen_test] +// Ensure that our whitelisted WebGl2RenderingContext methods compile with immutable slices. fn test_webgl2_rendering_context_immutable_slices() { let gl = new_webgl2_rendering_context(); @@ -80,8 +64,7 @@ fn test_webgl2_rendering_context_immutable_slices() { gl.compressed_tex_image_3d_with_u8_array(0, 0, 0, 0, 0, 0, 0, &[1]); } -// GECKODRIVER=geckodriver cargo test -p web-sys --target wasm32-unknown-unknown --all-features test_websocket_immutable_slices -#[wasm_bindgen_test] +// Ensure that our whitelisted WebSocket methods compile with immutable slices. fn test_websocket_immutable_slices() { let ws = new_websocket(); ws.send_with_u8_array(&[0]);