From 3d1145e75983de00354edda0ea8dfd2629bba06f Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sun, 14 Jul 2024 10:37:57 +0200
Subject: [PATCH] Fix CI test failure on main (nu-json) (#13374)

Conflict resulting from #13329 and #13326
---
 crates/nu-json/tests/main.rs     |  2 +-
 crates/nu-test-support/src/fs.rs | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/crates/nu-json/tests/main.rs b/crates/nu-json/tests/main.rs
index 0ac3e403e2..73c68f3d8e 100644
--- a/crates/nu-json/tests/main.rs
+++ b/crates/nu-json/tests/main.rs
@@ -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> {
diff --git a/crates/nu-test-support/src/fs.rs b/crates/nu-test-support/src/fs.rs
index eb90e16ab2..230e5eafe3 100644
--- a/crates/nu-test-support/src/fs.rs
+++ b/crates/nu-test-support/src/fs.rs
@@ -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)