From 5ea5590673bff20d96097b37cc6e2177e9c69348 Mon Sep 17 00:00:00 2001
From: bflatastic <bombayapirat@gmail.com>
Date: Sat, 17 Oct 2026 15:58:24 +0700
Subject: [PATCH] #680: move the page clipboard test to its own module, check
 the error id

---
 crates/engine/src/lib.rs                  |  2 ++
 crates/engine/src/page_clipboard_tests.rs | 36 +++++++++++++++++++++++
 crates/engine/src/tests.rs                | 17 -----------
 3 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 crates/engine/src/page_clipboard_tests.rs

diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs
index 6e0e8b125..9f00467a7 100644
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@ -1592,6 +1592,8 @@ mod open_issues_tests;
 #[cfg(test)]
 mod outline_options_tests;
 #[cfg(test)]
+mod page_clipboard_tests;
+#[cfg(test)]
 mod page_copy_navigation_tests;
 #[cfg(test)]
 mod page_target_tests;
diff --git a/crates/engine/src/page_clipboard_tests.rs b/crates/engine/src/page_clipboard_tests.rs
new file mode 100644
index 000000000..79ff74199
--- /dev/null
+++ b/crates/engine/src/page_clipboard_tests.rs
@@ -0,0 +1,36 @@
+//! `edit.copy` / `edit.cut` skip pages (they aren't layers and can't be pasted), and refuse a
+//! selection of only pages under their own command id.
+
+use serde_json::json;
+
+use crate::{EngineError, Session};
+
+#[test]
+fn copy_and_cut_ignore_pages_so_paste_keeps_the_document_valid() {
+    for cmd in ["edit.copy", "edit.cut"] {
+        let mut s = Session::new();
+        let page = s.page().unwrap();
+        s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+        match s.execute(cmd, &json!({"ids": [page.0]})) {
+            Err(EngineError::Disabled(id, _)) => assert_eq!(id, cmd),
+            r => panic!("{cmd} on a page: {r:?}"),
+        }
+        let _ = s.execute("edit.paste", &json!({}));
+        let doc = s.doc().unwrap();
+        assert!(doc.validate().is_empty(), "{cmd}: {:?}", doc.validate());
+        assert!(doc.node(page).is_some(), "{cmd} removed the page");
+    }
+}
+
+#[test]
+fn cut_of_a_page_and_a_layer_moves_only_the_layer() {
+    let mut s = Session::new();
+    let page = s.page().unwrap();
+    let r = s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+    let rect = crate::params::id_of(&r["id"]).unwrap();
+    s.execute("edit.cut", &json!({"ids": [page.0, rect.0]})).unwrap();
+    assert!(s.doc().unwrap().node(page).is_some());
+    assert!(s.doc().unwrap().node(rect).is_none());
+    s.execute("edit.paste", &json!({})).unwrap();
+    assert!(s.doc().unwrap().validate().is_empty());
+}
diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs
index 6010559e7..dbf432d41 100644
--- a/crates/engine/src/tests.rs
+++ b/crates/engine/src/tests.rs
@@ -621,20 +621,3 @@ fn find_replace_changing_only_the_case_replaces_every_occurrence() {
     assert_eq!(s.doc().unwrap().node(t).unwrap().kind.text().unwrap().characters, "FigCraft and FigCraft, FigCraft");
     assert_eq!(s.doc().unwrap().node(f).unwrap().name, "FigCraft / FigCraft");
 }
-
-#[test]
-fn copy_and_cut_ignore_pages_so_paste_keeps_the_document_valid() {
-    for cmd in ["edit.copy", "edit.cut"] {
-        let mut s = sess();
-        let page = s.page().unwrap();
-        s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
-        let r = s.execute(cmd, &json!({"ids": [page.0]}));
-        if let Ok(v) = &r {
-            assert!(v.get("deleted").is_none_or(|d| d == &json!([])), "{cmd} reported the page as deleted: {v}");
-        }
-        let _ = s.execute("edit.paste", &json!({}));
-        let doc = s.doc().unwrap();
-        assert!(doc.validate().is_empty(), "{cmd}: {:?}", doc.validate());
-        assert!(doc.node(page).is_some(), "{cmd} removed the page");
-    }
-}