Fix tab config test with desktop-notifications feature (osa1#408)

Also updates CI configs. Fixes osa1#407.
nthnd · Jul 18, 2023 · aaac385 · aaac385
1 parent e0565ec
commit aaac385
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,14 +34,14 @@ jobs:
       - name: Build
         run: cargo build
 
-      - name: Run tests
+      - name: Test
         run: cargo test --all
 
       - name: Build examples and benches
         run: cargo build --examples --benches
 
   Linux_native_tls_notif:
-    name: '[Linux, native TLS + notifications] Build'
+    name: '[Linux, native TLS + notifications] Build and test'
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -57,14 +57,18 @@ jobs:
             toolchain: stable
             override: true
 
-      - name: Build with rustls and dbus
+      - name: Build
         run: |
-          cd crates/tiny
           cargo build --no-default-features \
             --features "tls-native desktop-notifications"
 
-  OSX_default:
-    name: '[OSX, default] Build and test'
+      - name: Test
+        run: |
+          cargo test --no-default-features \
+            --features "tls-native desktop-notifications"
+
+  macOS_default:
+    name: '[macOS, default] Build and test'
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
@@ -75,17 +79,17 @@ jobs:
             toolchain: stable
             override: true
 
-      - name: Build tiny
+      - name: Build
         run: cargo build
 
-      - name: Run tests
+      - name: Test
         run: cargo test
 
       - name: Build examples and benches
         run: cargo build --examples --benches
 
-  OSX_native_tls_notif:
-    name: '[OSX, native TLS + notifications] Build'
+  macOS_native_tls_notif:
+    name: '[macOS, native TLS + notifications] Build and test'
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
@@ -98,6 +102,10 @@ jobs:
 
       - name: Build
         run: |
-          cd crates/tiny
           cargo build --no-default-features \
             --features "tls-native desktop-notifications"
+
+      - name: Test
+        run: |
+          cargo test --no-default-features \
+            --features "tls-native desktop-notifications"
diff --git a/crates/libtiny_tui/src/tests/config.rs b/crates/libtiny_tui/src/tests/config.rs
@@ -70,8 +70,8 @@ fn parsing_tab_configs() {
     assert_eq!(
         tab_configs.get("server2", None),
         Some(TabConfig {
-            ignore: Some(true),                // configured
-            notify: Some(Notifier::default())  // overwritten by defaults
+            ignore: Some(true),          // configured
+            notify: Some(Notifier::Off)  // overwritten by defaults
         })
     );