fix: tests

reown-com · Apr 16, 2024 · ff4b6a9 · ff4b6a9
1 parent b5f74d0
commit ff4b6a9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,7 +75,7 @@ jobs:
             rustc: stable
           - name: "Clippy all features"
             cmd: clippy
-            args: --all-features --tests -- -D warnings
+            args: --all-features --all-targets -- -D warnings
             cache: {}
             rustc: stable
           - name: "Formatting"

diff --git a/justfile b/justfile
@@ -7,10 +7,10 @@ devloop: unit fmt-imports
 test := ""
 
 test:
-  RUST_BACKTRACE=1 cargo test --lib --bins -- {{test}}
+  RUST_BACKTRACE=1 cargo test --all-targets -- {{test}}
 
 test-all:
-  RUST_BACKTRACE=1 cargo test --all-features --lib --bins -- {{test}}
+  RUST_BACKTRACE=1 cargo test --all-features --all-targets -- {{test}}
 
 clippy:
   #!/bin/bash

diff --git a/src/config.rs b/src/config.rs
@@ -130,14 +130,10 @@ impl Config {
             supported.push(ProviderKind::ApnsSandbox);
         }
 
-        if self.fcm_api_key.is_some() {
+        if self.fcm_api_key.is_some() || self.fcm_v1_credentials.is_some() {
             supported.push(ProviderKind::Fcm);
         }
 
-        if self.fcm_v1_credentials.is_some() {
-            supported.push(ProviderKind::FcmV1);
-        }
-
         // Only available in debug/testing
         #[cfg(any(debug_assertions, test))]
         supported.push(ProviderKind::Noop);

diff --git a/tests/functional/multitenant/mod.rs b/tests/functional/multitenant/mod.rs
@@ -3,6 +3,7 @@ use {crate::context::EchoServerContext, serde::Serialize, test_context::test_con
 
 mod apns;
 mod fcm;
+mod fcm_v1;
 mod tenancy;
 
 /// Struct to hold claims for JWT validation