Fix CI test failure on main (nu-json) (#13374)

Conflict resulting from #13329 and #13326
This commit is contained in:
Stefan Holderbach 2024-07-14 10:37:57 +02:00 committed by GitHub
parent cf4864a9cd
commit 3d1145e759
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 8 deletions

View File

@ -19,7 +19,7 @@ fn txt(text: &str) -> String {
}
fn hjson_expectations() -> PathBuf {
nu_test_support::fs::assets().join("nu_json")
nu_test_support::fs::assets().join("nu_json").into()
}
fn get_test_content(name: &str) -> io::Result<String> {

View File

@ -102,13 +102,12 @@ pub fn fixtures() -> AbsolutePathBuf {
path
}
// FIXME: re-enable nu_json tests
// pub fn assets() -> AbsolutePathBuf {
// let mut path = root();
// path.push("tests");
// path.push("assets");
// path
// }
pub fn assets() -> AbsolutePathBuf {
let mut path = root();
path.push("tests");
path.push("assets");
path
}
pub fn in_directory(path: impl AsRef<nu_path::Path>) -> AbsolutePathBuf {
root().join(path)