run tests for browser/dedicated worker/shared worker

Alorel · Oct 21, 2024 · a19b92b · a19b92b
1 parent 6737fb7
commit a19b92b
Show file tree

Hide file tree

Showing 52 changed files with 107 additions and 137 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -140,6 +140,3 @@ jobs:
       - name: Generate changelog
         id: changelog
         uses: ./.github/actions/changelog
-
-      - name: Echo changelog
-        run: echo -e "${{ steps.changelog.outputs.changelog }}"
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -48,12 +48,12 @@ jobs:
 
       - name: Test (Chrome)
         if: ${{ runner.os != 'macOS' }}
-        run: wasm-pack test --chrome --headless --locked --package idb_test ${{ inputs.flags }}
+        run: wasm-pack test --chrome --headless --locked ${{ inputs.flags }}
 
       - name: Test (Firefox)
         if: ${{ runner.os != 'macOS' }}
-        run: wasm-pack test --firefox --headless --locked --package idb_test ${{ inputs.flags }}
+        run: wasm-pack test --firefox --headless --locked ${{ inputs.flags }}
 
       - name: Test (Safari)
         if: ${{ runner.os == 'macOS' }}
-        run: wasm-pack test --safari --headless --locked --package idb_test ${{ inputs.flags }}
+        run: wasm-pack test --safari --headless --locked ${{ inputs.flags }}
diff --git a/.idea/indexed_db.iml b/.idea/indexed_db.iml
diff --git a/.idea/runConfigurations/Sync_readme.xml b/.idea/runConfigurations/Sync_readme.xml
diff --git a/.idea/runConfigurations/Test.xml b/.idea/runConfigurations/Test.xml
diff --git a/.idea/runConfigurations/Build.xml → .idea/runConfigurations/build.xml b/.idea/runConfigurations/Build.xml → .idea/runConfigurations/build.xml
diff --git a/.idea/runConfigurations/Build_tests.xml → .idea/runConfigurations/build_tests.xml b/.idea/runConfigurations/Build_tests.xml → .idea/runConfigurations/build_tests.xml
diff --git a/...runConfigurations/Build_tests_default.xml → ...runConfigurations/build_tests_default.xml b/...runConfigurations/Build_tests_default.xml → ...runConfigurations/build_tests_default.xml
diff --git a/.idea/runConfigurations/Clippy.xml → .idea/runConfigurations/clippy.xml b/.idea/runConfigurations/Clippy.xml → .idea/runConfigurations/clippy.xml
diff --git a/.idea/runConfigurations/Clippy__fix.xml → .idea/runConfigurations/clippy__fix.xml b/.idea/runConfigurations/Clippy__fix.xml → .idea/runConfigurations/clippy__fix.xml
diff --git a/.idea/runConfigurations/Doc.xml → .idea/runConfigurations/doc.xml b/.idea/runConfigurations/Doc.xml → .idea/runConfigurations/doc.xml
diff --git a/.idea/runConfigurations/Fmt.xml → .idea/runConfigurations/fmt.xml b/.idea/runConfigurations/Fmt.xml → .idea/runConfigurations/fmt.xml
diff --git a/.idea/runConfigurations/Test_all.xml → .idea/runConfigurations/test_all.xml b/.idea/runConfigurations/Test_all.xml → .idea/runConfigurations/test_all.xml
diff --git a/.idea/runConfigurations/test_all_chrome.xml b/.idea/runConfigurations/test_all_chrome.xml
diff --git a/.idea/runConfigurations/test_all_firefox.xml b/.idea/runConfigurations/test_all_firefox.xml
diff --git a/.idea/runConfigurations/Test_default.xml → .idea/runConfigurations/test_default.xml b/.idea/runConfigurations/Test_default.xml → .idea/runConfigurations/test_default.xml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,6 @@ resolver = "2"
 members = [
   ".",
   "internal_macros",
-  "test",
 ]
 
 [package]
@@ -31,6 +30,7 @@ cursors = [
 ]
 dates = [
   "dep:web-time",
+  "_serialise-deserialise-dyn",
 ]
 indices = [
   "web-sys/IdbIndex",
@@ -51,7 +51,7 @@ streams = [
 switch = []
 typed-arrays = []
 version-change = ["tokio/macros"]
-__unit-tests = ["dep:log"]
+_serialise-deserialise-dyn = []
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
@@ -97,7 +97,6 @@ fancy_constructor = { workspace = true }
 futures-core = { workspace = true, optional = true }
 impartial-ord = { workspace = true, optional = true }
 js-sys = { workspace = true }
-log = { workspace = true, optional = true }
 sealed = { workspace = true }
 serde = { workspace = true, optional = true }
 smallvec = { workspace = true }
@@ -137,7 +136,13 @@ features = [
 ]
 
 [dev-dependencies]
+console_log = { workspace = true }
+futures = { workspace = true }
+impartial-ord = { workspace = true }
 log = { workspace = true }
+rand = { workspace = true }
+uuid = { workspace = true, features = ["v4", "js"] }
+wasm-bindgen-test = { workspace = true }
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/internal_macros/src/lib.rs b/internal_macros/src/lib.rs
@@ -81,11 +81,12 @@ pub fn derive_from_dom_exception(input: TokenStream1) -> TokenStream1 {
 ///
 /// # Example
 ///
-/// ```rust
+#[cfg_attr(doctest, doc = " ````no_test")]
+/// ```
 /// #[errdoc(
 ///     InvalidStateError("Thrown when bars do a foo."),
 /// )]
-/// ```
+/// ````
 #[proc_macro_attribute]
 pub fn errdoc(defs: TokenStream1, function: TokenStream1) -> TokenStream1 {
     errdoc::Errdoc::exec(defs, function)

diff --git a/test/Cargo.toml b/test/Cargo.toml
diff --git a/tests/browser.rs b/tests/browser.rs
@@ -0,0 +1,6 @@
+wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_worker);
+
+pub mod tests;
+
+#[allow(unused_imports)]
+use tests::prelude;
diff --git a/tests/dedicated_worker.rs b/tests/dedicated_worker.rs
@@ -0,0 +1,5 @@
+wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_dedicated_worker);
+
+pub mod tests;
+#[allow(unused_imports)]
+use tests::prelude;
diff --git a/tests/shared_worker.rs b/tests/shared_worker.rs
@@ -0,0 +1,5 @@
+wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_shared_worker);
+
+pub mod tests;
+#[allow(unused_imports)]
+use tests::prelude;
diff --git a/test/src/database/delete_and_list.rs → tests/tests/database/delete_and_list.rs b/test/src/database/delete_and_list.rs → tests/tests/database/delete_and_list.rs
diff --git a/test/src/database/delete_obj_store.rs → tests/tests/database/delete_obj_store.rs b/test/src/database/delete_obj_store.rs → tests/tests/database/delete_obj_store.rs
diff --git a/test/src/database/mod.rs → tests/tests/database/mod.rs b/test/src/database/mod.rs → tests/tests/database/mod.rs
diff --git a/test/src/database/obj_store_create.rs → tests/tests/database/obj_store_create.rs b/test/src/database/obj_store_create.rs → tests/tests/database/obj_store_create.rs
diff --git a/test/src/database/open.rs → tests/tests/database/open.rs b/test/src/database/open.rs → tests/tests/database/open.rs
@@ -1,7 +1,7 @@
 use super::random_db_versions;
 use crate::prelude::*;
 use idb_fut::database::Database;
-use idb_fut::error::{JSError, OpenDbError};
+use idb_fut::error::{Error, JSError, OpenDbError};
 use tokio::sync::oneshot;
 use wasm_bindgen_futures::spawn_local;
 

diff --git a/test/src/database/transaction.rs → tests/tests/database/transaction.rs b/test/src/database/transaction.rs → tests/tests/database/transaction.rs
diff --git a/test/src/database/versionchange.rs → tests/tests/database/versionchange.rs b/test/src/database/versionchange.rs → tests/tests/database/versionchange.rs
@@ -35,7 +35,7 @@ pub async fn stream() {
 }
 
 mod helpers {
-    use idb_fut::database::Database;
+    use indexed_db_futures::database::Database;
     use wasm_bindgen_futures::spawn_local;
 
     pub fn open_v2(db_name: String, version: u8) {

diff --git a/test/src/date.rs → tests/tests/date.rs b/test/src/date.rs → tests/tests/date.rs
@@ -2,6 +2,7 @@ use crate::prelude::*;
 use idb_fut::date::*;
 
 #[wasm_bindgen_test]
+#[cfg(feature = "serde")]
 pub async fn serialisation() {
     // Strip nanos
     let now = {

diff --git a/test/src/index/create.rs → tests/tests/index/create.rs b/test/src/index/create.rs → tests/tests/index/create.rs
diff --git a/test/src/index/mod.rs → tests/tests/index/mod.rs b/test/src/index/mod.rs → tests/tests/index/mod.rs
diff --git a/test/src/index/query_source.rs → tests/tests/index/query_source.rs b/test/src/index/query_source.rs → tests/tests/index/query_source.rs
diff --git a/test/src/index/query_source/cursor.rs → tests/tests/index/query_source/cursor.rs b/test/src/index/query_source/cursor.rs → tests/tests/index/query_source/cursor.rs
diff --git a/test/src/key_path.rs → tests/tests/key_path.rs b/test/src/key_path.rs → tests/tests/key_path.rs