From 419347a9b7676f560fc75548d7deb36404ad7672 Mon Sep 17 00:00:00 2001 From: Kaede Hoshikawa Date: Thu, 18 Aug 2022 03:08:37 +0900 Subject: [PATCH 1/5] Fix tests if servers don't start up quickly enough. --- .github/workflows/tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index af61ec86..285132e0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -79,7 +79,10 @@ jobs: - name: Run tests for gloo worker run: | trunk build examples/markdown/index.html - nohup cargo run -p example-markdown --bin example_markdown_test_server -- examples/markdown/dist & + cargo build -p example-markdown --bin example_markdown_test_server + + nohup target/debug/example_markdown_test_server examples/markdown/dist & + sleep 2 wasm-pack test --headless --firefox --chrome examples/markdown From 86e7358636457747ae899f3621506643209e874f Mon Sep 17 00:00:00 2001 From: Kaede Hoshikawa Date: Thu, 18 Aug 2022 03:21:13 +0900 Subject: [PATCH 2/5] Separate tests. --- .github/workflows/tests.yml | 35 ++++++++++++++++++- .../src/bin/example_markdown_test_server.rs | 2 ++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 285132e0..d0df1a35 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -76,13 +76,46 @@ jobs: wasm-pack test --headless --firefox --chrome crates/$x --no-default-features done + + + test-worker: + name: Test gloo-worker + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + target: wasm32-unknown-unknown + override: true + profile: minimal + + - name: Install wasm-pack + run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh + + - name: Setup trunk + uses: jetli/trunk-action@v0.1.0 + with: + version: 'latest' + + - uses: actions/cache@v2 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + key: cargo-${{ runner.os }}-browser-tests-${{ hashFiles('**/Cargo.toml') }} + restore-keys: | + cargo-${{ runner.os }}-test-worker- + cargo-${{ runner.os }}- + - name: Run tests for gloo worker run: | trunk build examples/markdown/index.html cargo build -p example-markdown --bin example_markdown_test_server nohup target/debug/example_markdown_test_server examples/markdown/dist & - sleep 2 + sleep 5 wasm-pack test --headless --firefox --chrome examples/markdown diff --git a/examples/markdown/src/bin/example_markdown_test_server.rs b/examples/markdown/src/bin/example_markdown_test_server.rs index 9b34852b..695528ff 100755 --- a/examples/markdown/src/bin/example_markdown_test_server.rs +++ b/examples/markdown/src/bin/example_markdown_test_server.rs @@ -19,5 +19,7 @@ async fn main() { .allow_any_origin(), ); + println!("Test server is running at: http://127.0.0.1:9999/"); + warp::serve(route).run(([127, 0, 0, 1], 9999)).await; } From e20934a1e113ae80e9f4b688fb367575b98d53f9 Mon Sep 17 00:00:00 2001 From: Kaede Hoshikawa Date: Thu, 18 Aug 2022 03:24:42 +0900 Subject: [PATCH 3/5] Remove chrome for now. --- .github/workflows/tests.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d0df1a35..627829a7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -109,15 +109,18 @@ jobs: cargo-${{ runner.os }}-test-worker- cargo-${{ runner.os }}- - - name: Run tests for gloo worker + - name: Build and Run Test Server run: | - trunk build examples/markdown/index.html cargo build -p example-markdown --bin example_markdown_test_server - nohup target/debug/example_markdown_test_server examples/markdown/dist & - sleep 5 - wasm-pack test --headless --firefox --chrome examples/markdown + - name: Build Test Worker + run: | + trunk build examples/markdown/index.html + + - name: Run tests for gloo worker + run: | + wasm-pack test --headless --firefox examples/markdown test-net: From e219cc62ed507dd3345b848237d3e2aa82132293 Mon Sep 17 00:00:00 2001 From: Kaede Hoshikawa Date: Thu, 18 Aug 2022 04:29:15 +0900 Subject: [PATCH 4/5] CORP. =. = --- .../src/bin/example_markdown_test_server.rs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/examples/markdown/src/bin/example_markdown_test_server.rs b/examples/markdown/src/bin/example_markdown_test_server.rs index 695528ff..a880ce3a 100755 --- a/examples/markdown/src/bin/example_markdown_test_server.rs +++ b/examples/markdown/src/bin/example_markdown_test_server.rs @@ -1,5 +1,6 @@ #![cfg(not(target_arch = "wasm32"))] +use warp::reply::with_header; use warp::Filter; // This server is purely to faclitate testing. @@ -10,14 +11,16 @@ use warp::Filter; async fn main() { let dir = std::env::args().nth(1).expect("expected a target dir."); - let route = warp::fs::dir(dir).with( - // We need a server that serves the request with cross origin resource sharing. - warp::cors() - .allow_method("GET") - .allow_method("HEAD") - .allow_method("OPTIONS") - .allow_any_origin(), - ); + let route = warp::fs::dir(dir) + .with( + // We need a server that serves the request with cross origin resource sharing. + warp::cors() + .allow_method("GET") + .allow_method("HEAD") + .allow_method("OPTIONS") + .allow_any_origin(), + ) + .map(|m| with_header(m, "cross-origin-resource-policy", "cross-origin")); println!("Test server is running at: http://127.0.0.1:9999/"); From df5fdd16be02090a06e670d31447d4a982fd2fe2 Mon Sep 17 00:00:00 2001 From: Kaede Hoshikawa Date: Thu, 18 Aug 2022 04:32:09 +0900 Subject: [PATCH 5/5] Add chrome again. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 627829a7..7cb13225 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -120,7 +120,7 @@ jobs: - name: Run tests for gloo worker run: | - wasm-pack test --headless --firefox examples/markdown + wasm-pack test --headless --firefox --chrome examples/markdown test-net: