Skip to content

tests: run insta --force-update-snapshots #5888

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
ilyagr merged 1 commit into from
Mar 6, 2025
Merged

tests: run insta --force-update-snapshots #5888

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
2 changes: 1 addition & 1 deletion cli/src/git_util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ mod tests {
};
// First output is after the initial delay
assert_snapshot!(update(crate::progress::INITIAL_DELAY - Duration::from_millis(1), 0.1), @"");
assert_snapshot!(update(Duration::from_millis(1), 0.10), @"[?25l\r 10% [█▊ ]");
assert_snapshot!(update(Duration::from_millis(1), 0.10), @"\u{1b}[?25l\r 10% [█▊ ]\u{1b}[K");
// No updates for the next 30 milliseconds
assert_snapshot!(update(Duration::from_millis(10), 0.11), @"");
assert_snapshot!(update(Duration::from_millis(10), 0.12), @"");
Expand Down
20 changes: 10 additions & 10 deletions cli/src/merge_tools/builtin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ mod tests {
ConflictMarkerStyle::Diff,
)
.unwrap();
insta::assert_debug_snapshot!(files, @r###"
insta::assert_debug_snapshot!(files, @r#"
[
File {
old_path: None,
Expand Down Expand Up @@ -816,7 +816,7 @@ mod tests {
],
},
]
"###);
"#);

let no_changes_tree_id = apply_diff_builtin(
store,
Expand Down Expand Up @@ -865,7 +865,7 @@ mod tests {
ConflictMarkerStyle::Diff,
)
.unwrap();
insta::assert_debug_snapshot!(files, @r###"
insta::assert_debug_snapshot!(files, @r#"
[
File {
old_path: None,
Expand All @@ -888,7 +888,7 @@ mod tests {
],
},
]
"###);
"#);
let no_changes_tree_id = apply_diff_builtin(
store,
&left_tree,
Expand Down Expand Up @@ -936,7 +936,7 @@ mod tests {
ConflictMarkerStyle::Diff,
)
.unwrap();
insta::assert_debug_snapshot!(files, @r###"
insta::assert_debug_snapshot!(files, @r#"
[
File {
old_path: None,
Expand All @@ -959,7 +959,7 @@ mod tests {
],
},
]
"###);
"#);
let no_changes_tree_id = apply_diff_builtin(
store,
&left_tree,
Expand Down Expand Up @@ -1008,7 +1008,7 @@ mod tests {
ConflictMarkerStyle::Diff,
)
.unwrap();
insta::assert_debug_snapshot!(files, @r###"
insta::assert_debug_snapshot!(files, @r#"
[
File {
old_path: None,
Expand All @@ -1031,7 +1031,7 @@ mod tests {
],
},
]
"###);
"#);
let no_changes_tree_id = apply_diff_builtin(
store,
&left_tree,
Expand Down Expand Up @@ -1098,7 +1098,7 @@ mod tests {
.unwrap();
let merge_result = files::merge(&content);
let sections = make_merge_sections(merge_result).unwrap();
insta::assert_debug_snapshot!(sections, @r###"
insta::assert_debug_snapshot!(sections, @r#"
[
Changed {
lines: [
Expand Down Expand Up @@ -1146,6 +1146,6 @@ mod tests {
],
},
]
"###);
"#);
}
}
12 changes: 6 additions & 6 deletions cli/src/merge_tools/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,11 +703,11 @@ mod tests {
insta::assert_debug_snapshot!(get(":builtin", "").unwrap(), @"Builtin");

// Just program name
insta::assert_debug_snapshot!(get("my diff", "").unwrap_err(), @r###"
insta::assert_debug_snapshot!(get("my diff", "").unwrap_err(), @r#"
MergeArgsNotConfigured {
tool_name: "my diff",
}
"###);
"#);

// Pick from merge-tools
insta::assert_debug_snapshot!(get(
Expand Down Expand Up @@ -763,11 +763,11 @@ mod tests {
insta::assert_debug_snapshot!(get("").unwrap(), @"Builtin");

// Just program name
insta::assert_debug_snapshot!(get(r#"ui.merge-editor = "my-merge""#).unwrap_err(), @r###"
insta::assert_debug_snapshot!(get(r#"ui.merge-editor = "my-merge""#).unwrap_err(), @r#"
MergeArgsNotConfigured {
tool_name: "my-merge",
}
"###);
"#);

// String args
insta::assert_debug_snapshot!(
Expand Down Expand Up @@ -871,11 +871,11 @@ mod tests {

// List args should never be a merge-tools key
insta::assert_debug_snapshot!(
get(r#"ui.merge-editor = ["meld"]"#).unwrap_err(), @r###"
get(r#"ui.merge-editor = ["meld"]"#).unwrap_err(), @r#"
MergeArgsNotConfigured {
tool_name: "meld",
}
"###);
"#);

// Invalid type
assert!(get(r#"ui.merge-editor.k = 0"#).is_err());
Expand Down
Loading