mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 23:23:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

cleanup: fix formatting (missed in 5721436558)

Browse source
This commit is contained in:
Martin von Zweigbergk 2022-03-07 21:00:05 -08:00 committed by Martin von Zweigbergk
parent e0cd81cab4
commit 3a306e6a23
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/smoke_test.rs
View file

@ -24,10 +24,7 @@ fn smoke_test() {
let repo_path = test_env.env_root().join("repo"); let repo_path = test_env.env_root().join("repo");
// Check the output of `jj status` right after initializing repo // Check the output of `jj status` right after initializing repo
let assert = test_env let assert = test_env.jj_cmd(&repo_path, &["status"]).assert().success();
.jj_cmd(&repo_path, &["status"])
.assert()
.success();
insta::assert_snapshot!(get_stdout_string(&assert), @r###" insta::assert_snapshot!(get_stdout_string(&assert), @r###"
Parent commit: 000000000000 Parent commit: 000000000000
Working copy : 1d1984a23811 Working copy : 1d1984a23811
@ -40,10 +37,7 @@ fn smoke_test() {
std::fs::write(repo_path.join("file3"), "file3").unwrap(); std::fs::write(repo_path.join("file3"), "file3").unwrap();
// The working copy's ID should have changed // The working copy's ID should have changed
let assert = test_env let assert = test_env.jj_cmd(&repo_path, &["status"]).assert().success();
.jj_cmd(&repo_path, &["status"])
.assert()
.success();
let stdout_string = get_stdout_string(&assert); let stdout_string = get_stdout_string(&assert);
insta::assert_snapshot!(stdout_string, @r###" insta::assert_snapshot!(stdout_string, @r###"
Parent commit: 000000000000 Parent commit: 000000000000
@ -70,10 +64,7 @@ fn smoke_test() {
"); ");
// Close the commit // Close the commit
let assert = test_env let assert = test_env.jj_cmd(&repo_path, &["close"]).assert().success();
.jj_cmd(&repo_path, &["close"])
.assert()
.success();
insta::assert_snapshot!(get_stdout_string(&assert), @"Working copy now at: 6ff8a22d8ce1 insta::assert_snapshot!(get_stdout_string(&assert), @"Working copy now at: 6ff8a22d8ce1
"); ");
} }

1
tests/test_global_opts.rs
View file

@ -35,7 +35,6 @@ fn test_no_commit_working_copy() {
o 0000000000000000000000000000000000000000 o 0000000000000000000000000000000000000000
"###); "###);
// Modify the file. With --no-commit-working-copy, we still get the same commit // Modify the file. With --no-commit-working-copy, we still get the same commit
// ID. // ID.
std::fs::write(repo_path.join("file"), "modified").unwrap(); std::fs::write(repo_path.join("file"), "modified").unwrap();