extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-22 08:23:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-json/tests/main.rs
View File

@ -19,7 +19,7 @@ fn txt(text: &str) -> String {
} }
fn hjson_expectations() -> PathBuf { 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> { fn get_test_content(name: &str) -> io::Result<String> {

13
crates/nu-test-support/src/fs.rs
View File

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