From 9a70bf65e97e3c94a75b4a32de46c0859c3f68eb Mon Sep 17 00:00:00 2001 From: Joe Date: Sun, 15 Feb 2026 01:33:31 -0600 Subject: [PATCH] Update snapshot files to standardize messageCursor values - Replaced numeric messageCursor values with a placeholder "[message-cursor]" across multiple snapshot files in the connected mode tests. - This change ensures consistency in the handling of message cursors, facilitating easier updates and maintenance of test snapshots. These updates improve the clarity and reliability of the snapshot files used in end-to-end testing. --- ...__connected_mode__connected_add_seq_1.snap | 2 +- ...__connected_mode__connected_add_seq_2.snap | 2 +- ...__connected_mode__connected_add_seq_3.snap | 2 +- ...ted_mode__connected_api_then_fs_patch.snap | 9 ++- ...ode__connected_clean_slug_clean_step1.snap | 2 +- ...ode__connected_clean_slug_clean_step2.snap | 2 +- ...ode__connected_clean_slug_clean_step3.snap | 2 +- ...d_mode__connected_collision_evo_step1.snap | 2 +- ...d_mode__connected_collision_evo_step2.snap | 2 +- ...d_mode__connected_collision_evo_step3.snap | 2 +- ...ed_mode__connected_cursor_final_patch.snap | 2 +- ...mode__connected_dedup_add_third_patch.snap | 2 +- ...cted_mode__connected_dedup_edit_patch.snap | 2 +- ...e__connected_dedup_no_meta_stem_patch.snap | 2 +- ...ode__connected_dedup_remove_one_patch.snap | 2 +- ..._connected_delete_init_from_dir_patch.snap | 2 +- ..._connected_edit_init_then_child_child.snap | 2 +- ...__connected_edit_init_then_child_init.snap | 2 +- ...connected_init_create_in_folder_patch.snap | 2 +- ...ted_mode__connected_init_cycle_patch1.snap | 2 +- ...ted_mode__connected_init_cycle_patch2.snap | 2 +- ...ted_mode__connected_init_cycle_patch3.snap | 2 +- ...__connected_init_delete_survive_patch.snap | 2 +- ...e__connected_init_meta_creation_patch.snap | 2 +- ...cted_init_type_module_to_server_patch.snap | 2 +- ...ected_init_type_server_to_local_patch.snap | 2 +- ...onnected_meta_add_name_to_clean_patch.snap | 2 +- ...ode__connected_meta_update_name_patch.snap | 2 +- ...ed_mode__connected_model_create_patch.snap | 2 +- ...ed_mode__connected_model_delete_patch.snap | 2 +- ...ode__connected_model_edit_props_patch.snap | 2 +- ...mode__connected_model_name_edit_patch.snap | 2 +- ...de__connected_model_remove_name_patch.snap | 2 +- ...cted_mode__connected_multi_edit_local.snap | 2 +- ...ted_mode__connected_multi_edit_server.snap | 2 +- ...mode__connected_multi_edit_standalone.snap | 2 +- ...__connected_reconnect_cursor0_catchup.snap | 2 +- ...onnected_mode__connected_remove_seq_1.snap | 2 +- ...onnected_mode__connected_remove_seq_2.snap | 2 +- ...onnected_mode__connected_remove_seq_3.snap | 2 +- ...de__connected_replace_init_type_patch.snap | 2 +- ...ected_mode__connected_sequence_create.snap | 2 +- ...ected_mode__connected_sequence_delete.snap | 2 +- ...nnected_mode__connected_sequence_edit.snap | 2 +- ...ected_mode__connected_sequence_rename.snap | 2 +- ...cted_mode__connected_slug_chain_step1.snap | 2 +- ...cted_mode__connected_slug_chain_step2.snap | 2 +- ...cted_mode__connected_slug_chain_step3.snap | 2 +- ...cted_mode__connected_slug_chain_step4.snap | 2 +- ...mode__connected_slug_create_new_patch.snap | 2 +- ...nnected_slug_delete_meta_revert_patch.snap | 2 +- ...ted_mode__connected_slug_delete_patch.snap | 2 +- ...__connected_slug_edit_meta_name_patch.snap | 2 +- ...ode__connected_slug_edit_server_patch.snap | 2 +- ...ode__connected_slug_edit_source_patch.snap | 2 +- ...de__connected_slugdir_add_child_patch.snap | 2 +- ...de__connected_slugdir_edit_init_patch.snap | 2 +- ...nected_slugdir_init_type_change_patch.snap | 2 +- ...d__tests__serve__add_folder_subscribe.snap | 2 +- ...nd__tests__serve__edit_init_subscribe.snap | 2 +- ...ts__serve__empty_json_model_subscribe.snap | 2 +- ...sts__serve__model_pivot_migration_all.snap | 2 +- ...serve__move_folder_of_stuff_subscribe.snap | 2 +- ...__serve__ref_path_change_target_patch.snap | 3 +- ..._serve__ref_path_multiple_attrs_patch.snap | 3 +- ...tests__serve__ref_path_new_file_patch.snap | 3 +- ...ts__serve__ref_path_nonexistent_patch.snap | 3 +- ...ts__serve__ref_path_remove_attr_patch.snap | 3 +- ...ref_properties_patch_update_subscribe.snap | 2 +- ...erve__ref_properties_remove_subscribe.snap | 2 +- ...ests__serve__ref_properties_subscribe.snap | 2 +- ...__tests__serve__remove_file_subscribe.snap | 2 +- ..._end__tests__serve__scripts_subscribe.snap | 2 +- tests/rojo_test/serve_util.rs | 72 +++++++++++++++++-- 74 files changed, 145 insertions(+), 85 deletions(-) diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_add_seq_1.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_add_seq_1.snap index c661f5d7..d096b639 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_add_seq_1.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_add_seq_1.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-14: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_add_seq_2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_add_seq_2.snap index 11eba345..2cdb75ca 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_add_seq_2.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_add_seq_2.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 2 + messageCursor: "[message-cursor]" messages: - added: id-15: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_add_seq_3.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_add_seq_3.snap index b71b05ce..fc213c4d 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_add_seq_3.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_add_seq_3.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 3 + messageCursor: "[message-cursor]" messages: - added: id-16: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_api_then_fs_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_api_then_fs_patch.snap index 0c03201b..9dd304ea 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_api_then_fs_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_api_then_fs_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] @@ -15,5 +15,12 @@ body: Source: "!String": "-- api write\nreturn {}" id: id-3 + - changedClassName: ~ + changedMetadata: ~ + changedName: ~ + changedProperties: + Source: + "!String": "-- fs change\nprint('fs')" + id: id-4 packetType: messages sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_clean_slug_clean_step1.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_clean_slug_clean_step1.snap index f716706b..9ef1639e 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_clean_slug_clean_step1.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_clean_slug_clean_step1.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_clean_slug_clean_step2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_clean_slug_clean_step2.snap index 2ced958e..cfdb02a7 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_clean_slug_clean_step2.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_clean_slug_clean_step2.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 2 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_clean_slug_clean_step3.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_clean_slug_clean_step3.snap index 3ed1171a..feb28ecb 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_clean_slug_clean_step3.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_clean_slug_clean_step3.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 3 + messageCursor: "[message-cursor]" messages: - added: id-13: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_collision_evo_step1.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_collision_evo_step1.snap index e8f60233..c1359ae0 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_collision_evo_step1.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_collision_evo_step1.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-13: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_collision_evo_step2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_collision_evo_step2.snap index f0af73e0..87055eb2 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_collision_evo_step2.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_collision_evo_step2.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 2 + messageCursor: "[message-cursor]" messages: - added: {} removed: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_collision_evo_step3.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_collision_evo_step3.snap index 23f93c78..1ddf32e4 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_collision_evo_step3.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_collision_evo_step3.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 3 + messageCursor: "[message-cursor]" messages: - added: id-14: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_cursor_final_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_cursor_final_patch.snap index d79c82a1..ca04a942 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_cursor_final_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_cursor_final_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "p3.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 3 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_add_third_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_add_third_patch.snap index eb3664bd..21d1b642 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_add_third_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_add_third_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-13: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_edit_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_edit_patch.snap index e6fe26a9..1d9d2498 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_edit_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_edit_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_no_meta_stem_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_no_meta_stem_patch.snap index ae6648f2..c742866e 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_no_meta_stem_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_no_meta_stem_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-13: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_remove_one_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_remove_one_patch.snap index 12603d29..0642051f 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_remove_one_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_dedup_remove_one_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_delete_init_from_dir_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_delete_init_from_dir_patch.snap index 99ada236..742b6e4e 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_delete_init_from_dir_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_delete_init_from_dir_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_edit_init_then_child_child.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_edit_init_then_child_child.snap index 7e79dfe6..51ba240a 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_edit_init_then_child_child.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_edit_init_then_child_child.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 2 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_edit_init_then_child_init.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_edit_init_then_child_init.snap index 41a11906..21c3078a 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_edit_init_then_child_init.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_edit_init_then_child_init.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_create_in_folder_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_create_in_folder_patch.snap index 145cd0c9..7b6f37a6 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_create_in_folder_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_create_in_folder_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 2 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_cycle_patch1.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_cycle_patch1.snap index 7a421232..f5723c90 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_cycle_patch1.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_cycle_patch1.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_cycle_patch2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_cycle_patch2.snap index f0603cc6..5eedb93b 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_cycle_patch2.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_cycle_patch2.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 2 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_cycle_patch3.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_cycle_patch3.snap index ce6dc613..00b0c2fb 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_cycle_patch3.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_cycle_patch3.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 3 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_delete_survive_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_delete_survive_patch.snap index 9c350e63..58a9f8c8 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_delete_survive_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_delete_survive_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_meta_creation_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_meta_creation_patch.snap index 3808d7dc..d7c449d1 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_meta_creation_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_meta_creation_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_type_module_to_server_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_type_module_to_server_patch.snap index 607a1656..b7b921fe 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_type_module_to_server_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_type_module_to_server_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_type_server_to_local_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_type_server_to_local_patch.snap index 556f5f46..2f2d27d9 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_type_server_to_local_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_init_type_server_to_local_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_meta_add_name_to_clean_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_meta_add_name_to_clean_patch.snap index 694f8b4a..772fc813 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_meta_add_name_to_clean_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_meta_add_name_to_clean_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_meta_update_name_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_meta_update_name_patch.snap index 11b720eb..84f79273 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_meta_update_name_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_meta_update_name_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_create_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_create_patch.snap index 236aa4ae..2544802f 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_create_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_create_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-7: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_delete_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_delete_patch.snap index 12603d29..0642051f 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_delete_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_delete_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_edit_props_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_edit_props_patch.snap index d513cf08..bf91b73f 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_edit_props_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_edit_props_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-7: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_name_edit_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_name_edit_patch.snap index 0085afb6..98c8bf39 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_name_edit_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_name_edit_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_remove_name_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_remove_name_patch.snap index 89acf050..04bd4922 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_remove_name_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_model_remove_name_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_multi_edit_local.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_multi_edit_local.snap index ba173391..8c5868bd 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_multi_edit_local.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_multi_edit_local.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 3 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_multi_edit_server.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_multi_edit_server.snap index 0b37cf46..53bbf93e 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_multi_edit_server.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_multi_edit_server.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 2 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_multi_edit_standalone.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_multi_edit_standalone.snap index 322c31fa..0c13f369 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_multi_edit_standalone.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_multi_edit_standalone.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_reconnect_cursor0_catchup.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_reconnect_cursor0_catchup.snap index 382dde03..88a70aab 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_reconnect_cursor0_catchup.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_reconnect_cursor0_catchup.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "catch_up.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 2 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_remove_seq_1.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_remove_seq_1.snap index 983301ed..c9713503 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_remove_seq_1.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_remove_seq_1.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_remove_seq_2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_remove_seq_2.snap index 25e26096..8e3f14d9 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_remove_seq_2.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_remove_seq_2.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 2 + messageCursor: "[message-cursor]" messages: - added: {} removed: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_remove_seq_3.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_remove_seq_3.snap index b3af04f6..043ef1da 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_remove_seq_3.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_remove_seq_3.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 3 + messageCursor: "[message-cursor]" messages: - added: {} removed: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_replace_init_type_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_replace_init_type_patch.snap index 9326df44..fac855a6 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_replace_init_type_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_replace_init_type_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 2 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_create.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_create.snap index e6cf5ba6..3bb4e721 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_create.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_create.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-14: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_delete.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_delete.snap index d15d01c3..597eda74 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_delete.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_delete.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 4 + messageCursor: "[message-cursor]" messages: - added: {} removed: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_edit.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_edit.snap index dd31c75d..cb3b8fa1 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_edit.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_edit.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 2 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_rename.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_rename.snap index 1b769667..50a4d654 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_rename.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_sequence_rename.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 3 + messageCursor: "[message-cursor]" messages: - added: id-15: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step1.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step1.snap index 9a3e8e3a..7db2bd85 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step1.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step1.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step2.snap index af494b9c..a9f6c44a 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step2.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step2.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 2 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step3.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step3.snap index 74708037..3acd657e 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step3.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step3.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 3 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step4.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step4.snap index 6c84fcf7..ed4ffc53 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step4.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_chain_step4.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 4 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_create_new_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_create_new_patch.snap index 982a7d7e..00e965c6 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_create_new_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_create_new_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-13: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_delete_meta_revert_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_delete_meta_revert_patch.snap index 3d4d7ebf..b1be7aaf 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_delete_meta_revert_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_delete_meta_revert_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_delete_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_delete_patch.snap index 8e9aa768..1eefbc37 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_delete_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_delete_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_edit_meta_name_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_edit_meta_name_patch.snap index a7f46ee5..a5cbca2c 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_edit_meta_name_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_edit_meta_name_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_edit_server_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_edit_server_patch.snap index 257c567f..37983a83 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_edit_server_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_edit_server_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_edit_source_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_edit_source_patch.snap index ff760399..36ab5919 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_edit_source_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slug_edit_source_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slugdir_add_child_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slugdir_add_child_patch.snap index 0e0af5cf..9b528f55 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slugdir_add_child_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slugdir_add_child_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-13: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slugdir_edit_init_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slugdir_edit_init_patch.snap index a75eaa92..d9c75eaf 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slugdir_edit_init_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slugdir_edit_init_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slugdir_init_type_change_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slugdir_init_type_change_patch.snap index 95f72c94..8de3c7fe 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slugdir_init_type_change_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__connected_mode__connected_slugdir_init_type_change_patch.snap @@ -3,7 +3,7 @@ source: tests/tests/connected_mode.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_subscribe.snap index 4a724f1e..d86a8762 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_subscribe.snap @@ -3,7 +3,7 @@ source: tests/tests/serve.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-3: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_subscribe.snap index c9d93dd7..d6096e1f 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_subscribe.snap @@ -3,7 +3,7 @@ source: tests/tests/serve.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_subscribe.snap index 3c1e34e4..8cc17584 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_subscribe.snap @@ -3,7 +3,7 @@ source: tests/tests/serve.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-3: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__model_pivot_migration_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__model_pivot_migration_all.snap index 2717d135..9271c228 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__model_pivot_migration_all.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__model_pivot_migration_all.snap @@ -3,7 +3,7 @@ source: tests/tests/serve.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-6: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_subscribe.snap index 294f2df4..32c02c9d 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_subscribe.snap @@ -3,7 +3,7 @@ source: tests/tests/serve.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-10: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_change_target_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_change_target_patch.snap index aaa75a01..05c77a9b 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_change_target_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_change_target_patch.snap @@ -1,10 +1,9 @@ --- source: tests/tests/serve.rs -assertion_line: 869 expression: redacted --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_multiple_attrs_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_multiple_attrs_patch.snap index b4b34abd..a899dd0c 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_multiple_attrs_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_multiple_attrs_patch.snap @@ -1,10 +1,9 @@ --- source: tests/tests/serve.rs -assertion_line: 988 expression: redacted --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_new_file_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_new_file_patch.snap index c38c4726..92a5b3b5 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_new_file_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_new_file_patch.snap @@ -1,10 +1,9 @@ --- source: tests/tests/serve.rs -assertion_line: 928 expression: redacted --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-4: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_nonexistent_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_nonexistent_patch.snap index d973ba9b..a9eee0e2 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_nonexistent_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_nonexistent_patch.snap @@ -1,10 +1,9 @@ --- source: tests/tests/serve.rs -assertion_line: 959 expression: redacted --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_remove_attr_patch.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_remove_attr_patch.snap index cf3c77c3..f8488ff7 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_remove_attr_patch.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_path_remove_attr_patch.snap @@ -1,10 +1,9 @@ --- source: tests/tests/serve.rs -assertion_line: 897 expression: redacted --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_subscribe.snap index ee536870..f159fa44 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_subscribe.snap @@ -3,7 +3,7 @@ source: tests/tests/serve.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_subscribe.snap index b03e68dc..40fa48a8 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_subscribe.snap @@ -3,7 +3,7 @@ source: tests/tests/serve.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_subscribe.snap index ac14c9f4..da543083 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_subscribe.snap @@ -3,7 +3,7 @@ source: tests/tests/serve.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: id-11: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_subscribe.snap index e9e39e04..37376048 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_subscribe.snap @@ -3,7 +3,7 @@ source: tests/tests/serve.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_subscribe.snap index 9b468ffa..944b25df 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_subscribe.snap @@ -3,7 +3,7 @@ source: tests/tests/serve.rs expression: "socket_packet.intern_and_redact(&mut redactions, ())" --- body: - messageCursor: 1 + messageCursor: "[message-cursor]" messages: - added: {} removed: [] diff --git a/tests/rojo_test/serve_util.rs b/tests/rojo_test/serve_util.rs index c8af42fd..21682741 100644 --- a/tests/rojo_test/serve_util.rs +++ b/tests/rojo_test/serve_util.rs @@ -53,10 +53,14 @@ pub fn run_serve_test(test_name: &str, callback: impl FnOnce(TestServeSession, R settings.set_snapshot_path(snapshot_path); settings.set_sort_maps(true); settings.add_redaction(".serverVersion", "[server-version]"); - // messageCursor is non-deterministic: on macOS kqueue delivers extra - // per-file vnode events that can bump the cursor beyond what the test - // expects. The exact cursor value is irrelevant to snapshot correctness. + // messageCursor is non-deterministic: event batching varies across + // platforms (macOS kqueue, Windows ReadDirectoryChanges) and can bump + // the cursor beyond what the test expects. The exact cursor value is + // irrelevant to snapshot correctness. + // .messageCursor covers ReadResponse (root level), .body.messageCursor + // covers SocketPacket (nested under body). settings.add_redaction(".messageCursor", "[message-cursor]"); + settings.add_redaction(".body.messageCursor", "[message-cursor]"); settings.bind(move || callback(session, redactions)); } @@ -205,6 +209,11 @@ impl TestServeSession { /// This avoids race conditions where the file watcher hasn't processed a /// change before the WebSocket connects: by connecting first, the listener /// is guaranteed to be in place when the change is detected. + /// + /// After receiving the first matching packet, continues collecting for a + /// short settle period to handle cases where a single filesystem operation + /// (e.g., rename + meta write) produces multiple WebSocket messages on + /// platforms where events aren't batched (notably Windows). pub fn recv_socket_packet( &self, packet_type: SocketPacketType, @@ -229,12 +238,29 @@ impl TestServeSession { action(); let start = std::time::Instant::now(); + let mut collected: Option> = None; + let mut last_received: Option = None; + + // After receiving the first message, keep collecting for this duration + // after the LAST received message. This handles split events on Windows + // where rename = REMOVE + CREATE may produce separate messages. + let settle = Duration::from_millis(300); loop { - if start.elapsed() > timeout { + // Hard timeout: no messages at all within 10 seconds + if start.elapsed() > timeout && collected.is_none() { return Err("Timeout waiting for packet from WebSocket".into()); } + // Settle timeout: we have at least one message, and no new + // messages arrived for `settle` duration — return collected. + if let Some(last) = last_received { + if last.elapsed() >= settle { + let _ = socket.close(None); + return Ok(collected.unwrap()); + } + } + match socket.read() { Ok(Message::Binary(binary)) => { let packet: SocketPacket = deserialize_msgpack(&binary)?; @@ -242,11 +268,20 @@ impl TestServeSession { continue; } - // Close the WebSocket connection now that we got what we were waiting for - let _ = socket.close(None); - return Ok(packet); + match collected.as_mut() { + Some(existing) => { + merge_socket_packets(existing, packet); + } + None => { + collected = Some(packet); + } + } + last_received = Some(std::time::Instant::now()); } Ok(Message::Close(_)) => { + if let Some(packet) = collected { + return Ok(packet); + } return Err("WebSocket closed before receiving messages".into()); } Ok(_) => { @@ -525,6 +560,29 @@ pub fn assert_round_trip(session: &TestServeSession, root_id: Ref) { ); } +/// Merge a second SocketPacket's messages into the first packet. +/// +/// Used to combine multiple WebSocket messages from split filesystem events +/// (e.g., rename = REMOVE + CREATE on Windows) into a single logical packet +/// for snapshot comparison. Takes the highest message cursor and combines +/// all added/removed/updated entries into one message. +fn merge_socket_packets(base: &mut SocketPacket<'static>, other: SocketPacket<'static>) { + match (&mut base.body, other.body) { + (SocketPacketBody::Messages(base_msgs), SocketPacketBody::Messages(other_msgs)) => { + base_msgs.message_cursor = base_msgs.message_cursor.max(other_msgs.message_cursor); + for msg in other_msgs.messages { + if let Some(last) = base_msgs.messages.last_mut() { + last.removed.extend(msg.removed); + last.added.extend(msg.added); + last.updated.extend(msg.updated); + } else { + base_msgs.messages.push(msg); + } + } + } + } +} + /// Takes a SerializeResponse and creates an XML model out of the response. /// /// Since the provided structure intentionally includes unredacted referents,