Skip to content

Commit fb470be

Browse files
committed
Get slice tests running in CI
1 parent 6684987 commit fb470be

File tree

2 files changed

+3
-35
lines changed

2 files changed

+3
-35
lines changed

crates/web-sys/tests/wasm/element.js

-15
Original file line numberDiff line numberDiff line change
@@ -151,21 +151,6 @@ export function new_title() {
151151
return document.createElement("title");
152152
}
153153

154-
export function new_webgl_rendering_context() {
155-
const canvas = document.createElement('canvas');
156-
return canvas.getContext('webgl');
157-
}
158-
159-
export function new_webgl2_rendering_context() {
160-
const canvas = document.createElement('canvas');
161-
return canvas.getContext('webgl2');
162-
}
163-
164-
export function new_websocket () {
165-
const websocket = new WebSocket("");
166-
return websocket;
167-
}
168-
169154
export function new_xpath_result() {
170155
let xmlDoc = new DOMParser().parseFromString("<root><value>tomato</value></root>", "application/xml");
171156
let xpathResult = xmlDoc.evaluate("/root//value", xmlDoc, null, XPathResult.ANY_TYPE, null);

crates/web-sys/tests/wasm/whitelisted_immutable_slices.rs

+3-20
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,9 @@
1010
//!
1111
//! @see https://github.com/rustwasm/wasm-bindgen/issues/1005
1212
13-
use wasm_bindgen::prelude::*;
1413
use web_sys::{WebGl2RenderingContext, WebGlRenderingContext, WebSocket};
15-
use wasm_bindgen_test::*;
1614

17-
wasm_bindgen_test_configure!(run_in_browser);
18-
19-
#[wasm_bindgen(module = "/tests/wasm/element.js")]
20-
extern "C" {
21-
fn new_webgl_rendering_context() -> WebGlRenderingContext;
22-
fn new_webgl2_rendering_context() -> WebGl2RenderingContext;
23-
fn new_websocket() -> WebSocket;
24-
// TODO: Add a function to create another type to test here.
25-
// These functions come from element.js
26-
}
27-
28-
// Ensure that our whitelisted WebGlRenderingContext methods work
29-
// GECKODRIVER=geckodriver cargo test -p web-sys --target wasm32-unknown-unknown --all-features test_webgl_rendering_context_immutable_slices
30-
#[wasm_bindgen_test]
15+
// Ensure that our whitelisted WebGlRenderingContext methods compile with immutable slices.
3116
fn test_webgl_rendering_context_immutable_slices() {
3217
let gl = new_webgl_rendering_context();
3318

@@ -70,8 +55,7 @@ fn test_webgl_rendering_context_immutable_slices() {
7055
gl.compressed_tex_image_2d_with_u8_array(0, 0, 0, 0, 0, 0, &[1]);
7156
}
7257

73-
// GECKODRIVER=geckodriver cargo test -p web-sys --target wasm32-unknown-unknown --all-features test_webgl2_rendering_context_immutable_slices
74-
#[wasm_bindgen_test]
58+
// Ensure that our whitelisted WebGl2RenderingContext methods compile with immutable slices.
7559
fn test_webgl2_rendering_context_immutable_slices() {
7660
let gl = new_webgl2_rendering_context();
7761

@@ -80,8 +64,7 @@ fn test_webgl2_rendering_context_immutable_slices() {
8064
gl.compressed_tex_image_3d_with_u8_array(0, 0, 0, 0, 0, 0, 0, &[1]);
8165
}
8266

83-
// GECKODRIVER=geckodriver cargo test -p web-sys --target wasm32-unknown-unknown --all-features test_websocket_immutable_slices
84-
#[wasm_bindgen_test]
67+
// Ensure that our whitelisted WebSocket methods compile with immutable slices.
8568
fn test_websocket_immutable_slices() {
8669
let ws = new_websocket();
8770
ws.send_with_u8_array(&[0]);

0 commit comments

Comments
 (0)