Skip to content

Trim duplicate overlay tests #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yvette-carlisle merged 1 commit into from
May 1, 2026
Merged

Trim duplicate overlay tests #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 19 additions & 45 deletions packages/rsnap-overlay/src/overlay/tests/export_actions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,60 +150,34 @@ fn complete_host_effect_request_runs_overlay_exit_cleanup() {
}

#[test]
fn current_export_image_includes_frozen_brush_strokes() {
fn current_export_image_includes_frozen_brush_strokes_with_selected_color() {
let monitor = tests::test_monitor();
let mut session = OverlaySession::new();

session.state.begin_freeze(monitor);
session
.state
.commit_frozen_final_image(monitor, RgbaImage::from_pixel(8, 8, Rgba([12, 34, 56, 255])));

session.state.frozen_capture_rect = Some(RectPoints::new(0, 0, 8, 8));

tests::promote_session_export_authority_ready(&mut session);

session.toolbar_state.selected_tool = FrozenToolbarTool::Pen;

assert!(session.begin_frozen_brush_stroke(GlobalPoint::new(2, 2)));
assert!(session.update_frozen_brush_stroke(GlobalPoint::new(5, 2)));
assert!(session.finish_frozen_brush_stroke());

let export_image = session.current_export_image().expect("annotated export image");

assert_eq!(export_image.get_pixel(7, 7), &Rgba([12, 34, 56, 255]));
assert_eq!(
export_image.get_pixel(2, 2),
&Rgba(session.toolbar_state.brush_style.color.export_rgba())
);
}

#[test]
fn current_export_image_uses_selected_brush_color() {
let monitor = tests::test_monitor();
let mut session = OverlaySession::new();
for color in [FrozenAnnotationColor::Red, FrozenAnnotationColor::Green] {
let mut session = OverlaySession::new();

session.state.begin_freeze(monitor);
session
.state
.commit_frozen_final_image(monitor, RgbaImage::from_pixel(8, 8, Rgba([12, 34, 56, 255])));
session.state.begin_freeze(monitor);
session.state.commit_frozen_final_image(
monitor,
RgbaImage::from_pixel(8, 8, Rgba([12, 34, 56, 255])),
);

session.state.frozen_capture_rect = Some(RectPoints::new(0, 0, 8, 8));
session.state.frozen_capture_rect = Some(RectPoints::new(0, 0, 8, 8));

tests::promote_session_export_authority_ready(&mut session);
tests::promote_session_export_authority_ready(&mut session);

session.toolbar_state.selected_tool = FrozenToolbarTool::Pen;
session.toolbar_state.brush_style.color = FrozenAnnotationColor::Green;
session.toolbar_state.selected_tool = FrozenToolbarTool::Pen;
session.toolbar_state.brush_style.color = color;

assert!(session.begin_frozen_brush_stroke(GlobalPoint::new(2, 2)));
assert!(session.finish_frozen_brush_stroke());
assert!(session.begin_frozen_brush_stroke(GlobalPoint::new(2, 2)));
assert!(session.update_frozen_brush_stroke(GlobalPoint::new(5, 2)));
assert!(session.finish_frozen_brush_stroke());

let export_image = session.current_export_image().expect("annotated export image");
let export_image = session.current_export_image().expect("annotated export image");

assert_eq!(
export_image.get_pixel(2, 2),
&Rgba(session.toolbar_state.brush_style.color.export_rgba())
);
assert_eq!(export_image.get_pixel(7, 7), &Rgba([12, 34, 56, 255]));
assert_eq!(export_image.get_pixel(2, 2), &Rgba(color.export_rgba()));
}
}

#[test]
Expand Down
109 changes: 38 additions & 71 deletions packages/rsnap-overlay/src/overlay/tests/live_runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1757,28 +1757,17 @@ fn wants_global_frozen_hotkeys_only_in_plain_frozen_mode() {

#[cfg(target_os = "macos")]
#[test]
fn global_escape_hotkey_cancels_live_capture() {
let mut session = OverlaySession::new();

session.state.mode = OverlayMode::Live;

assert!(matches!(
session.handle_global_escape_hotkey(),
OverlayControl::Exit(OverlayExit::Cancelled)
));
}

#[cfg(target_os = "macos")]
#[test]
fn global_escape_hotkey_cancels_frozen_capture() {
let mut session = OverlaySession::new();
fn global_escape_hotkey_cancels_active_capture_modes() {
for mode in [OverlayMode::Live, OverlayMode::Frozen] {
let mut session = OverlaySession::new();

session.state.mode = OverlayMode::Frozen;
session.state.mode = mode;

assert!(matches!(
session.handle_global_escape_hotkey(),
OverlayControl::Exit(OverlayExit::Cancelled)
));
assert!(matches!(
session.handle_global_escape_hotkey(),
OverlayControl::Exit(OverlayExit::Cancelled)
));
}
}

#[cfg(target_os = "macos")]
Expand All @@ -1799,44 +1788,33 @@ fn global_loupe_hotkey_tracks_live_hold_state() {

#[cfg(target_os = "macos")]
#[test]
fn global_frozen_copy_hotkey_queues_copy_without_key_window() {
fn global_frozen_copy_hotkey_queues_copy_unless_text_edit_is_active() {
let monitor = tests::test_monitor();
let mut session = OverlaySession::new();

session.session_active = true;
for (label, active_text_edit, expected_action) in
[("no active text edit", false, Some(PngAction::Copy)), ("active text edit", true, None)]
{
let mut session = OverlaySession::new();

session.state.begin_freeze(monitor);
session.session_active = true;

tests::finish_frozen_ready_state(&mut session, monitor, tests::test_frozen_image());
session.state.begin_freeze(monitor);

assert!(matches!(
session.handle_global_frozen_hotkey(FrozenGlobalHotkey::Copy),
OverlayControl::Continue
));
assert_eq!(session.pending_png_action, Some(PngAction::Copy));
}
tests::finish_frozen_ready_state(&mut session, monitor, tests::test_frozen_image());

#[cfg(target_os = "macos")]
#[test]
fn global_frozen_copy_hotkey_ignores_active_text_edit() {
let monitor = tests::test_monitor();
let mut session = OverlaySession::new();

session.session_active = true;

session.state.begin_freeze(monitor);

tests::finish_frozen_ready_state(&mut session, monitor, tests::test_frozen_image());
if active_text_edit {
session.state.frozen_capture_rect = Some(RectPoints::new(100, 120, 220, 180));
session.toolbar_state.selected_tool = FrozenToolbarTool::Text;

session.state.frozen_capture_rect = Some(RectPoints::new(100, 120, 220, 180));
session.toolbar_state.selected_tool = FrozenToolbarTool::Text;
assert!(session.begin_frozen_text_edit_at(monitor, GlobalPoint::new(140, 160)));
}

assert!(session.begin_frozen_text_edit_at(monitor, GlobalPoint::new(140, 160)));
assert!(matches!(
session.handle_global_frozen_hotkey(FrozenGlobalHotkey::Copy),
OverlayControl::Continue
));
assert_eq!(session.pending_png_action, None);
assert!(matches!(
session.handle_global_frozen_hotkey(FrozenGlobalHotkey::Copy),
OverlayControl::Continue
));
assert_eq!(session.pending_png_action, expected_action, "{label}");
}
}

#[test]
Expand Down Expand Up @@ -2202,29 +2180,18 @@ fn live_hud_rgb_text_uses_fixed_width_placeholders() {
}

#[test]
fn stable_live_loupe_side_prefers_configured_patch_side() {
let mut state = OverlayState::new();
fn stable_live_loupe_side_prefers_configured_patch_side_over_runtime_patch() {
for (patch_width, patch_height) in [(17, 19), (25, 25)] {
let mut state = OverlayState::new();

state.loupe_patch_side_px = 21;
state.loupe = Some(LoupeSample {
center: GlobalPoint::new(100, 120),
patch: RgbaImage::from_pixel(17, 19, image::Rgba([0, 0, 0, 255])),
});

assert_eq!(hud_helpers::stable_live_loupe_side_px(&state), 21);
}

#[test]
fn stable_live_loupe_side_ignores_larger_runtime_patch() {
let mut state = OverlayState::new();

state.loupe_patch_side_px = 21;
state.loupe = Some(LoupeSample {
center: GlobalPoint::new(100, 120),
patch: RgbaImage::from_pixel(25, 25, image::Rgba([0, 0, 0, 255])),
});
state.loupe_patch_side_px = 21;
state.loupe = Some(LoupeSample {
center: GlobalPoint::new(100, 120),
patch: RgbaImage::from_pixel(patch_width, patch_height, image::Rgba([0, 0, 0, 255])),
});

assert_eq!(hud_helpers::stable_live_loupe_side_px(&state), 21);
assert_eq!(hud_helpers::stable_live_loupe_side_px(&state), 21);
}
}

#[test]
Expand Down
Loading
Loading