From 9da8496e7361c831854c0498736a8d4c79ac6c43 Mon Sep 17 00:00:00 2001
From: andy <andy@sarsoo.xyz>
Date: Tue, 22 Jun 2021 21:05:22 +0100
Subject: [PATCH] wasm_testing working

---
 .github/workflows/test.yml |  7 ++-----
 src/lib.rs                 |  2 +-
 tests/web.rs               | 25 ++++++++++++++++++++++---
 www/index.js               |  4 ++--
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6ff0aab..52fcd08 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,11 +21,8 @@ jobs:
       - name: Build Rust for WASM
         run: wasm-pack build
 
-      - name: Test WASM on Firefox
-        run: wasm-pack test --firefox --headless
-
-      - name: Test WASM on Chrome
-        run: wasm-pack test --chrome --headless
+      - name: Test WASM in-browser
+        run: wasm-pack test --firefox --chrome --headless
 
       - name: Install Node
         uses: actions/setup-node@v2
diff --git a/src/lib.rs b/src/lib.rs
index 0d3589e..b4702a7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -23,7 +23,7 @@ macro_rules! log {
 }
 
 #[wasm_bindgen]
-pub fn init() {
+pub fn init_game() {
     log!("initialising wasm");
     utils::set_panic_hook();
 
diff --git a/tests/web.rs b/tests/web.rs
index de5c1da..d3641f0 100644
--- a/tests/web.rs
+++ b/tests/web.rs
@@ -3,11 +3,30 @@
 #![cfg(target_arch = "wasm32")]
 
 extern crate wasm_bindgen_test;
-use wasm_bindgen_test::*;
+// use wasm_bindgen_test::*;
+use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
 
 wasm_bindgen_test_configure!(run_in_browser);
 
+extern crate gameoflife;
+use gameoflife::Universe;
+
 #[wasm_bindgen_test]
-fn pass() {
-    assert_eq!(1 + 1, 2);
+fn get_width() {
+    let uni = Universe::new(10, 15, 1, 1.0);
+    assert_eq!(uni.width(), 10);
 }
+
+#[wasm_bindgen_test]
+fn get_height() {
+    let uni = Universe::new(10, 15, 1, 1.0);
+    assert_eq!(uni.height(), 15);
+}
+
+#[wasm_bindgen_test]
+fn get_cells() {
+    let uni = Universe::new(10, 15, 1, 1.0);
+    uni.cells();
+}
+
+
diff --git a/www/index.js b/www/index.js
index 865ca57..e37a521 100644
--- a/www/index.js
+++ b/www/index.js
@@ -1,9 +1,9 @@
-import { Universe, Cell, init } from "gameoflife";
+import { Universe, Cell, init_game } from "gameoflife";
 import { memory } from "gameoflife/gameoflife_bg.wasm";
 
 // let PLAY = true;
 // let PLAY = false;
-init();
+init_game();
 const randSlider = document.getElementById("randThreshold");
 const randSliderLabel = document.getElementById("randThreshold-label");