From ff47f79c62c3398a1c8c24753dc49e68c9d26cce Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Fri, 14 Feb 2020 17:57:01 -0800 Subject: [PATCH] Fix serverVersion in snapshots failing tests --- rojo-test/serve-test-snapshots/serve_test__add_folder_info.snap | 2 +- rojo-test/serve-test-snapshots/serve_test__edit_init_info.snap | 2 +- rojo-test/serve-test-snapshots/serve_test__empty_info.snap | 2 +- rojo-test/serve-test-snapshots/serve_test__just_txt_info.snap | 2 +- .../serve_test__move_folder_of_stuff_info.snap | 2 +- .../serve-test-snapshots/serve_test__remove_file_info.snap | 2 +- rojo-test/serve-test-snapshots/serve_test__scripts_info.snap | 2 +- rojo-test/src/serve_util.rs | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rojo-test/serve-test-snapshots/serve_test__add_folder_info.snap b/rojo-test/serve-test-snapshots/serve_test__add_folder_info.snap index f826d7e7..ffc35c89 100644 --- a/rojo-test/serve-test-snapshots/serve_test__add_folder_info.snap +++ b/rojo-test/serve-test-snapshots/serve_test__add_folder_info.snap @@ -5,5 +5,5 @@ expression: redactions.redacted_yaml(info) expectedPlaceIds: ~ protocolVersion: 3 rootInstanceId: id-2 -serverVersion: 0.6.0-dev +serverVersion: "[server-version]" sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/serve_test__edit_init_info.snap b/rojo-test/serve-test-snapshots/serve_test__edit_init_info.snap index f826d7e7..ffc35c89 100644 --- a/rojo-test/serve-test-snapshots/serve_test__edit_init_info.snap +++ b/rojo-test/serve-test-snapshots/serve_test__edit_init_info.snap @@ -5,5 +5,5 @@ expression: redactions.redacted_yaml(info) expectedPlaceIds: ~ protocolVersion: 3 rootInstanceId: id-2 -serverVersion: 0.6.0-dev +serverVersion: "[server-version]" sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/serve_test__empty_info.snap b/rojo-test/serve-test-snapshots/serve_test__empty_info.snap index f826d7e7..ffc35c89 100644 --- a/rojo-test/serve-test-snapshots/serve_test__empty_info.snap +++ b/rojo-test/serve-test-snapshots/serve_test__empty_info.snap @@ -5,5 +5,5 @@ expression: redactions.redacted_yaml(info) expectedPlaceIds: ~ protocolVersion: 3 rootInstanceId: id-2 -serverVersion: 0.6.0-dev +serverVersion: "[server-version]" sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/serve_test__just_txt_info.snap b/rojo-test/serve-test-snapshots/serve_test__just_txt_info.snap index f826d7e7..ffc35c89 100644 --- a/rojo-test/serve-test-snapshots/serve_test__just_txt_info.snap +++ b/rojo-test/serve-test-snapshots/serve_test__just_txt_info.snap @@ -5,5 +5,5 @@ expression: redactions.redacted_yaml(info) expectedPlaceIds: ~ protocolVersion: 3 rootInstanceId: id-2 -serverVersion: 0.6.0-dev +serverVersion: "[server-version]" sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_info.snap b/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_info.snap index f826d7e7..ffc35c89 100644 --- a/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_info.snap +++ b/rojo-test/serve-test-snapshots/serve_test__move_folder_of_stuff_info.snap @@ -5,5 +5,5 @@ expression: redactions.redacted_yaml(info) expectedPlaceIds: ~ protocolVersion: 3 rootInstanceId: id-2 -serverVersion: 0.6.0-dev +serverVersion: "[server-version]" sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/serve_test__remove_file_info.snap b/rojo-test/serve-test-snapshots/serve_test__remove_file_info.snap index f826d7e7..ffc35c89 100644 --- a/rojo-test/serve-test-snapshots/serve_test__remove_file_info.snap +++ b/rojo-test/serve-test-snapshots/serve_test__remove_file_info.snap @@ -5,5 +5,5 @@ expression: redactions.redacted_yaml(info) expectedPlaceIds: ~ protocolVersion: 3 rootInstanceId: id-2 -serverVersion: 0.6.0-dev +serverVersion: "[server-version]" sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/serve_test__scripts_info.snap b/rojo-test/serve-test-snapshots/serve_test__scripts_info.snap index f826d7e7..ffc35c89 100644 --- a/rojo-test/serve-test-snapshots/serve_test__scripts_info.snap +++ b/rojo-test/serve-test-snapshots/serve_test__scripts_info.snap @@ -5,5 +5,5 @@ expression: redactions.redacted_yaml(info) expectedPlaceIds: ~ protocolVersion: 3 rootInstanceId: id-2 -serverVersion: 0.6.0-dev +serverVersion: "[server-version]" sessionId: id-1 diff --git a/rojo-test/src/serve_util.rs b/rojo-test/src/serve_util.rs index d31a032d..918f5c32 100644 --- a/rojo-test/src/serve_util.rs +++ b/rojo-test/src/serve_util.rs @@ -41,6 +41,7 @@ pub fn run_serve_test(test_name: &str, callback: impl FnOnce(TestServeSession, R let snapshot_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("serve-test-snapshots"); settings.set_snapshot_path(snapshot_path); settings.set_sort_maps(true); + settings.add_redaction(".serverVersion", "[server-version]"); settings.bind(move || callback(session, redactions)); }