mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-31 16:33:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

test_git_import_export.rs: rename test and modernize terminology

Browse source
This commit is contained in:
Ilya Grigoriev 2023-06-19 16:30:47 -07:00
parent 24ea8478cb
commit 08d147be32
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/test_git_import_export.rs
View file

@ -90,7 +90,7 @@ fn test_git_export_conflicting_git_refs() {
} }
#[test] #[test]
fn test_git_import_remote_only_branch() { fn test_git_fetch_remote_only_branch() {
let test_env = TestEnvironment::default(); let test_env = TestEnvironment::default();
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]); test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
let repo_path = test_env.env_root().join("repo"); let repo_path = test_env.env_root().join("repo");
@ -111,8 +111,7 @@ fn test_git_import_remote_only_branch() {
&repo_path, &repo_path,
&["git", "remote", "add", "origin", "../git-repo"], &["git", "remote", "add", "origin", "../git-repo"],
); );
// Create a commit and a branch in the git repo
// Import using default config
git_repo git_repo
.commit( .commit(
Some("refs/heads/feature1"), Some("refs/heads/feature1"),
@ -123,12 +122,13 @@ fn test_git_import_remote_only_branch() {
&[], &[],
) )
.unwrap(); .unwrap();
// Fetch normally
test_env.jj_cmd_success(&repo_path, &["git", "fetch", "--remote=origin"]); test_env.jj_cmd_success(&repo_path, &["git", "fetch", "--remote=origin"]);
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"
feature1: 9f01a0e04879 message feature1: 9f01a0e04879 message
"###); "###);
// Import using git.auto_local_branch = false
git_repo git_repo
.commit( .commit(
Some("refs/heads/feature2"), Some("refs/heads/feature2"),
@ -139,6 +139,8 @@ fn test_git_import_remote_only_branch() {
&[], &[],
) )
.unwrap(); .unwrap();
// Fetch using git.auto_local_branch = false
test_env.add_config("git.auto-local-branch = false"); test_env.add_config("git.auto-local-branch = false");
test_env.jj_cmd_success(&repo_path, &["git", "fetch", "--remote=origin"]); test_env.jj_cmd_success(&repo_path, &["git", "fetch", "--remote=origin"]);
insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###" insta::assert_snapshot!(get_branch_output(&test_env, &repo_path), @r###"