feat: Testing events utils (#864)

marc2332 · Sep 11, 2024 · 2295d6b · 2295d6b
1 parent a53e134
commit 2295d6b
Show file tree

Hide file tree

Showing 32 changed files with 124 additions and 545 deletions.
diff --git a/crates/components/src/accordion.rs b/crates/components/src/accordion.rs
@@ -176,19 +176,12 @@ mod test {
         let content = root.get(0).get(1).get(0);
         let label = content.get(0);
         utils.wait_for_update().await;
-        utils.wait_for_update().await;
 
         // Accordion is closed, therefore label is hidden.
         assert!(!label.is_visible());
 
         // Click on the accordion
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (5., 5.).into(),
-            button: Some(MouseButton::Left),
-        });
-
-        utils.wait_for_update().await;
+        utils.click_cursor((5., 5.)).await;
 
         // State somewhere in the middle
         sleep(Duration::from_millis(70)).await;

diff --git a/crates/components/src/button.rs b/crates/components/src/button.rs
@@ -224,13 +224,7 @@ mod test {
 
         assert_eq!(label.get(0).text(), Some("false"));
 
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (15.0, 15.0).into(),
-            button: Some(MouseButton::Left),
-        });
-
-        utils.wait_for_update().await;
+        utils.click_cursor((15.0, 15.0)).await;
 
         assert_eq!(label.get(0).text(), Some("true"));
 

diff --git a/crates/components/src/checkbox.rs b/crates/components/src/checkbox.rs
@@ -176,39 +176,21 @@ mod test {
         assert!(root.get(1).get(0).get(0).get(0).is_placeholder());
         assert!(root.get(2).get(0).get(0).get(0).is_placeholder());
 
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (20.0, 50.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
+        utils.click_cursor((20., 50.)).await;
 
         assert!(root.get(0).get(0).get(0).get(0).is_placeholder());
         assert!(root.get(1).get(0).get(0).get(0).is_element());
         assert!(root.get(2).get(0).get(0).get(0).is_placeholder());
 
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (10.0, 90.0).into(),
-            button: Some(MouseButton::Left),
-        });
+        utils.click_cursor((10., 90.)).await;
         utils.wait_for_update().await;
 
         assert!(root.get(0).get(0).get(0).get(0).is_placeholder());
         assert!(root.get(1).get(0).get(0).get(0).is_element());
         assert!(root.get(2).get(0).get(0).get(0).is_element());
 
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (10.0, 10.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (10.0, 50.0).into(),
-            button: Some(MouseButton::Left),
-        });
+        utils.click_cursor((10., 10.)).await;
+        utils.click_cursor((10., 50.)).await;
         utils.wait_for_update().await;
 
         assert!(root.get(0).get(0).get(0).get(0).is_element());

diff --git a/crates/components/src/cursor_area.rs b/crates/components/src/cursor_area.rs
@@ -97,35 +97,17 @@ mod test {
         // Initial cursor
         assert_eq!(utils.cursor_icon(), CursorIcon::default());
 
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::MouseOver,
-            cursor: (100., 100.).into(),
-            button: Some(MouseButton::Left),
-        });
-
-        utils.wait_for_update().await;
+        utils.move_cursor((100., 100.)).await;
 
         // Cursor after hovering the first half
         assert_eq!(utils.cursor_icon(), CursorIcon::Progress);
 
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::MouseOver,
-            cursor: (100., 300.).into(),
-            button: Some(MouseButton::Left),
-        });
-
-        utils.wait_for_update().await;
+        utils.move_cursor((100., 300.)).await;
 
         // Cursor after hovering the second half
         assert_eq!(utils.cursor_icon(), CursorIcon::Pointer);
 
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::MouseOver,
-            cursor: (-1., -1.).into(),
-            button: Some(MouseButton::Left),
-        });
-
-        utils.wait_for_update().await;
+        utils.move_cursor((-1., -1.)).await;
 
         // Cursor after leaving the window
         assert_eq!(utils.cursor_icon(), CursorIcon::default());

diff --git a/crates/components/src/drag_drop.rs b/crates/components/src/drag_drop.rs
@@ -188,21 +188,9 @@ mod test {
 
         utils.wait_for_update().await;
 
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::MouseOver,
-            cursor: (5.0, 5.0).into(),
-            button: Some(MouseButton::Left),
-        });
-
-        utils.wait_for_update().await;
+        utils.move_cursor((5., 5.)).await;
 
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::MouseOver,
-            cursor: (5.0, 300.0).into(),
-            button: Some(MouseButton::Left),
-        });
-
-        utils.wait_for_update().await;
+        utils.move_cursor((5., 300.)).await;
 
         assert_eq!(root.get(0).get(0).get(0).get(0).text(), Some("Moving"));
 

diff --git a/crates/components/src/dropdown.rs b/crates/components/src/dropdown.rs
@@ -364,42 +364,23 @@ mod test {
         assert_eq!(label.get(0).text(), Some("Value A"));
 
         // Open the dropdown
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (15.0, 15.0).into(),
-            button: Some(MouseButton::Left),
-        });
+        utils.click_cursor((15., 15.)).await;
         utils.wait_for_update().await;
 
         // Now that the dropwdown is opened, there are more nodes in the layout
         assert!(utils.sdom().get().layout().size() > start_size);
 
         // Close the dropdown by clicking outside of it
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (200.0, 200.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
+        utils.click_cursor((200., 200.)).await;
 
         // Now the layout size is like in the begining
         assert_eq!(utils.sdom().get().layout().size(), start_size);
 
         // Open the dropdown again
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (15.0, 15.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
+        utils.click_cursor((15., 15.)).await;
 
         // Click on the second option
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (45.0, 100.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
+        utils.click_cursor((45., 100.)).await;
         utils.wait_for_update().await;
         utils.wait_for_update().await;
 

diff --git a/crates/components/src/link.rs b/crates/components/src/link.rs
@@ -273,32 +273,19 @@ mod test {
 
         let mut utils = launch_test(link_app);
 
-        utils.wait_for_update().await;
-        utils.wait_for_update().await;
-
         // Check route is Home
         assert_eq!(utils.root().get(2).get(0).text(), Some("Home"));
 
         // Go to the "Somewhere" route
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (5., 60.).into(),
-            button: Some(MouseButton::Left),
-        });
-
-        utils.wait_for_update().await;
-        utils.wait_for_update().await;
+        utils.click_cursor((5., 60.)).await;
 
         // Check route is Somewhere
         assert_eq!(utils.root().get(2).get(0).text(), Some("Somewhere"));
 
         // Go to the "Home" route again
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (5., 5.).into(),
-            button: Some(MouseButton::Left),
-        });
+        utils.click_cursor((5., 5.)).await;
 
-        utils.wait_for_update().await;
+        // Check route is Home
+        assert_eq!(utils.root().get(2).get(0).text(), Some("Home"));
     }
 }
diff --git a/crates/components/src/menu.rs b/crates/components/src/menu.rs
@@ -381,12 +381,7 @@ mod test {
         assert_eq!(utils.sdom().get().layout().size(), 5);
 
         // Open the Menu
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (15.0, 15.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
+        utils.click_cursor((15., 15.)).await;
 
         // Check the `Open` button exists
         assert_eq!(
@@ -405,34 +400,18 @@ mod test {
         assert!(utils.sdom().get().layout().size() > start_size);
 
         // Close the Menu
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (15.0, 60.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
+        utils.click_cursor((15., 60.)).await;
 
         assert_eq!(utils.sdom().get().layout().size(), start_size);
 
         // Open the Menu again
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (15.0, 15.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
-        utils.wait_for_update().await;
+        utils.click_cursor((15., 15.)).await;
 
         let one_submenu_opened = utils.sdom().get().layout().size();
         assert!(one_submenu_opened > start_size);
 
         // Open the SubMenu
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::MouseOver,
-            cursor: (15.0, 130.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
+        utils.move_cursor((15., 130.)).await;
 
         // Check the `Option 1` button exists
         assert_eq!(
@@ -455,22 +434,12 @@ mod test {
         assert!(utils.sdom().get().layout().size() > one_submenu_opened);
 
         // Stop showing the submenu
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::MouseOver,
-            cursor: (15.0, 90.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
+        utils.move_cursor((15., 90.)).await;
 
         assert_eq!(utils.sdom().get().layout().size(), one_submenu_opened);
 
         // Click somewhere also so all the menus hide
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (333.0, 333.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
+        utils.click_cursor((333., 333.)).await;
 
         assert_eq!(utils.sdom().get().layout().size(), start_size);
     }

diff --git a/crates/components/src/native_router.rs b/crates/components/src/native_router.rs
@@ -114,13 +114,7 @@ mod test {
 
         assert_eq!(utils.root().get(0).get(1).get(0).text(), Some("A"));
 
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (5.0, 5.0).into(),
-            button: Some(MouseButton::Left),
-        });
-
-        utils.wait_for_update().await;
+        utils.click_cursor((5., 5.)).await;
 
         assert_eq!(utils.root().get(0).get(1).get(0).text(), Some("B"));
 
@@ -129,7 +123,6 @@ mod test {
             cursor: (5.0, 5.0).into(),
             button: Some(MouseButton::Back),
         });
-
         utils.wait_for_update().await;
 
         assert_eq!(utils.root().get(0).get(1).get(0).text(), Some("A"));
@@ -139,7 +132,6 @@ mod test {
             cursor: (5.0, 5.0).into(),
             button: Some(MouseButton::Forward),
         });
-
         utils.wait_for_update().await;
 
         assert_eq!(utils.root().get(0).get(1).get(0).text(), Some("B"));

diff --git a/crates/components/src/popup.rs b/crates/components/src/popup.rs
@@ -216,33 +216,18 @@ mod test {
         assert_eq!(utils.sdom().get().layout().size(), 4);
 
         // Open the popup
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (15.0, 15.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
+        utils.click_cursor((15., 15.)).await;
 
         // Check the popup is opened
         assert_eq!(utils.sdom().get().layout().size(), 10);
 
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (395.0, 180.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
+        utils.click_cursor((395., 180.)).await;
 
         // Check the popup is closed
         assert_eq!(utils.sdom().get().layout().size(), 4);
 
         // Open the popup
-        utils.push_event(PlatformEvent::Mouse {
-            name: EventName::Click,
-            cursor: (15.0, 15.0).into(),
-            button: Some(MouseButton::Left),
-        });
-        utils.wait_for_update().await;
+        utils.click_cursor((15., 15.)).await;
 
         // Send a random keydown event
         utils.push_event(PlatformEvent::Keyboard {