Skip to content

Commit 57e9a6f

Browse files
committed
Put first_file_from_config_with_origin test with related ones
This moves the `first_file_from_config_with_origin` test into the nested `exe_info` module, because like the other functions tested there, `first_file_from_config_with_origin` is a helper function for `EXE_INFO` that is separate largely to facilitate testing.
1 parent 7cd20bb commit 57e9a6f

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

gix-path/src/env/git/tests.rs

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -555,37 +555,37 @@ mod exe_info {
555555
"Should find no config path if the config would be local even in a `/tmp`-like dir (suppressed system config)"
556556
);
557557
}
558-
}
559558

560-
#[test]
561-
fn first_file_from_config_with_origin() {
562-
let macos =
563-
"file:/Applications/Xcode.app/Contents/Developer/usr/share/git-core/gitconfig\0credential.helper\0file:/Users/byron/.gitconfig\0push.default\0";
564-
let win_msys = "file:C:/git-sdk-64/etc/gitconfig\0core.symlinks\0file:C:/git-sdk-64/etc/gitconfig\0core.autocrlf\0";
565-
let win_cmd =
566-
"file:C:/Program Files/Git/etc/gitconfig\0diff.astextplain.textconv\0file:C:/Program Files/Git/etc/gitconfig\0filter.lfs.clean\0";
567-
let win_msys_old =
568-
"file:C:\\ProgramData/Git/config\0diff.astextplain.textconv\0file:C:\\ProgramData/Git/config\0filter.lfs.clean\0";
569-
let linux = "file:/home/parallels/.gitconfig\0core.excludesfile\0";
570-
let bogus = "something unexpected";
571-
let empty = "";
572-
573-
for (source, expected) in [
574-
(
575-
macos,
576-
Some("/Applications/Xcode.app/Contents/Developer/usr/share/git-core/gitconfig"),
577-
),
578-
(win_msys, Some("C:/git-sdk-64/etc/gitconfig")),
579-
(win_msys_old, Some("C:\\ProgramData/Git/config")),
580-
(win_cmd, Some("C:/Program Files/Git/etc/gitconfig")),
581-
(linux, Some("/home/parallels/.gitconfig")),
582-
(bogus, None),
583-
(empty, None),
584-
] {
585-
assert_eq!(
586-
super::first_file_from_config_with_origin(source.into()),
587-
expected.map(Into::into)
588-
);
559+
#[test]
560+
fn first_file_from_config_with_origin() {
561+
let macos =
562+
"file:/Applications/Xcode.app/Contents/Developer/usr/share/git-core/gitconfig\0credential.helper\0file:/Users/byron/.gitconfig\0push.default\0";
563+
let win_msys = "file:C:/git-sdk-64/etc/gitconfig\0core.symlinks\0file:C:/git-sdk-64/etc/gitconfig\0core.autocrlf\0";
564+
let win_cmd =
565+
"file:C:/Program Files/Git/etc/gitconfig\0diff.astextplain.textconv\0file:C:/Program Files/Git/etc/gitconfig\0filter.lfs.clean\0";
566+
let win_msys_old =
567+
"file:C:\\ProgramData/Git/config\0diff.astextplain.textconv\0file:C:\\ProgramData/Git/config\0filter.lfs.clean\0";
568+
let linux = "file:/home/parallels/.gitconfig\0core.excludesfile\0";
569+
let bogus = "something unexpected";
570+
let empty = "";
571+
572+
for (source, expected) in [
573+
(
574+
macos,
575+
Some("/Applications/Xcode.app/Contents/Developer/usr/share/git-core/gitconfig"),
576+
),
577+
(win_msys, Some("C:/git-sdk-64/etc/gitconfig")),
578+
(win_msys_old, Some("C:\\ProgramData/Git/config")),
579+
(win_cmd, Some("C:/Program Files/Git/etc/gitconfig")),
580+
(linux, Some("/home/parallels/.gitconfig")),
581+
(bogus, None),
582+
(empty, None),
583+
] {
584+
assert_eq!(
585+
crate::env::git::first_file_from_config_with_origin(source.into()),
586+
expected.map(Into::into)
587+
);
588+
}
589589
}
590590
}
591591

0 commit comments

Comments
 (0)