fixed up tests

Author: sashetophizika

src/daemon.rs

@@ -7,8 +7,8 @@ use crate::DEFAULT_SOCKET;
 use crate::HYPRSCRATCH_DIR;
 use hyprland::data::{Client, Clients};
 use hyprland::dispatch::*;
-use hyprland::prelude::*;
 use hyprland::error::HyprError;
+use hyprland::prelude::*;
 use hyprland::Result;
 use std::fs::{create_dir, remove_file};
 use std::io::prelude::*;
@@ -476,9 +476,9 @@ mod tests {
                 "test_nonfloating".to_string(),
             ],
             commands: [
-                "[size 30% 30%; move 60% 0] kitty --title test_sticky".to_string(),
-                "[workspace special:test_special; size 30% 30%; move 30% 0] kitty --title test_special".to_string(),
-                "[size 30% 30%; move 0 0] kitty --title test_normal".to_string(),
+                "[float; size 30% 30%; move 60% 0] kitty --title test_sticky".to_string(),
+                "[float; size 30% 30%; move 0 0] kitty --title test_normal".to_string(),
+                "[float; workspace special:test_special; size 30% 30%; move 30% 0] kitty --title test_special".to_string(),
                 "kitty --title test_nonfloating".to_string(),
             ],
             expected_workspace: [
@@ -519,9 +519,9 @@ mod tests {
             ],
             commands: [
                 "kitty --title test_nonfloating".to_string(),
-                "[size 30% 30%; move 60% 0] kitty --title test_sticky".to_string(),
-                "[size 30% 30%; move 30% 0] kitty --title test_shiny".to_string(),
-                "[size 30% 30%; move 0 0] kitty --title test_normal".to_string(),
+                "[float; size 30% 30%; move 60% 0] kitty --title test_sticky".to_string(),
+                "[float; size 30% 30%; move 30% 0] kitty --title test_shiny".to_string(),
+                "[float; size 30% 30%; move 0 0] kitty --title test_normal".to_string(),
             ],
             expected_workspace: [
                 active_workspace.name.clone(),
@@ -565,10 +565,10 @@ mod tests {
                 "test_ephemeral".to_string(),
             ],
             commands: [
-                "[size 30% 30%; move 60% 0] kitty --title test_sticky".to_string(),
-                "[size 30% 30%; move 30% 0] kitty --title test_pin".to_string(),
-                "[size 30% 30%; move 0 0] kitty --title test_normal".to_string(),
-                "[size 30% 30%; move 0 30%] kitty --title test_ephemeral".to_string(),
+                "[float; size 30% 30%; move 60% 0] kitty --title test_sticky".to_string(),
+                "[float; pin; size 30% 30%; move 30% 0] kitty --title test_pin".to_string(),
+                "[float; size 30% 30%; move 0 0] kitty --title test_normal".to_string(),
+                "[float; size 30% 30%; move 0 30%] kitty --title test_ephemeral".to_string(),
             ],
             expected_workspace: [
                 active_workspace.name.clone(),

src/scratchpad.rs

@@ -556,7 +556,7 @@ mod tests {
         let resources = [TestResources::new("tiled"), TestResources::new("floating")];
         let mut scratchpad = [
             resources[0].into_scratchpad("tiled"),
-            resources[0].into_scratchpad(""),
+            resources[1].into_scratchpad(""),
         ];
 
         resources.iter().for_each(|r| r.assert_not_present());