Rename WrapToRead/WrapToWrite to explicit Scope* methods; fix navigation test scope

WrapToRead/WrapToWrite implicitly injected Paths.WorkingDirectoryRoot into every
scope, which was a wrong assumption when the inner FS contained files outside
the working directory (e.g. navigation tests with MockFS at /checkouts/...).

New explicit API in FileSystemFactory:
- ScopeCurrentWorkingDirectory(inner) — scopes to WorkingDirectoryRoot + ApplicationData
- ScopeCurrentWorkingDirectory(inner, extensionRoots) — adds detection-rules roots
- ScopeCurrentWorkingDirectoryForWrite(inner) — write variant (no .git)
- ScopeSourceDirectory(inner, sourceRoot) — scopes to an explicit root + ApplicationData
- ScopeSourceDirectoryForWrite(inner, sourceRoot) — write variant

All production options fields renamed: ReadOptions → WorkingDirectoryReadOptions,
WriteOptions → WorkingDirectoryWriteOptions (makes scope intent visible in code).

DocumentationSetFile.LoadAndResolve: replace the InvalidOperationException cast guard
with FileSystemFactory.ScopeSourceDirectory(fs, directory.FullName) so callers with
unscoped IFileSystem/IDirectoryInfo (e.g. from a raw MockFileSystem) are automatically
given the tightest correct scope.

Navigation.Tests/Assembler: change ScopeCurrentWorkingDirectory(fileSystem) →
ScopeSourceDirectory(fileSystem, "/checkouts") for all tests that use
SiteNavigationTestFixture (MockFS rooted at /checkouts/current/...).

TestDocumentationSetContext: use ScopeSourceDirectory(fileSystem, sourceDirectory.FullName)
and ScopeSourceDirectoryForWrite(fileSystem, outputDirectory.FullName) so each test gets
a scope precisely matching its mock FS tree.

Fix 3 semantic bugs where WriteFileSystem was assigned ScopeCurrentWorkingDirectory
instead of ScopeCurrentWorkingDirectoryForWrite:
- CodexNavigationTestBase, GroupNavigationTests, CrossLinkRegistryTests

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>

Author: Mpdreamz

src/Elastic.Documentation.Configuration/FileSystemFactory.cs

@@ -13,7 +13,7 @@ public static class FileSystemFactory
 	// Read options: workspace + app data, all confirmed hidden names allowed.
 	// Includes .git (GitCheckoutInformation reads it) and .artifacts/.doc.state
 	// (incremental build reads existing output state).
-	private static readonly ScopedFileSystemOptions ReadOptions = new(
+	private static readonly ScopedFileSystemOptions WorkingDirectoryReadOptions = new(
 		[Paths.WorkingDirectoryRoot.FullName, Paths.ApplicationData.FullName])
 	{
 		AllowedHiddenFolderNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".git", ".artifacts" },
@@ -23,7 +23,7 @@ public static class FileSystemFactory
 	// Write options: same scope roots but no .git — nothing in the build output
 	// pipeline should ever write into the git repository metadata.
 	// Temp is allowed because deploy operations (e.g. S3 sync) stage files there.
-	private static readonly ScopedFileSystemOptions WriteOptions = new(
+	private static readonly ScopedFileSystemOptions WorkingDirectoryWriteOptions = new(
 		[Paths.WorkingDirectoryRoot.FullName, Paths.ApplicationData.FullName])
 	{
 		AllowedHiddenFolderNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".artifacts" },
@@ -44,14 +44,14 @@ public static class FileSystemFactory
 	/// (read by <c>GitCheckoutInformation</c>), <c>.artifacts</c> and <c>.doc.state</c>
 	/// (read for incremental build state).
 	/// </summary>
-	public static ScopedFileSystem RealRead { get; } = new ScopedFileSystem(new FileSystem(), ReadOptions);
+	public static ScopedFileSystem RealRead { get; } = new ScopedFileSystem(new FileSystem(), WorkingDirectoryReadOptions);
 
 	/// <summary>
 	/// A pre-allocated <see cref="ScopedFileSystem"/> for writing build output.
 	/// Same scope as <see cref="RealRead"/> but without <c>.git</c> access —
 	/// nothing in the output pipeline should write into git repository metadata.
 	/// </summary>
-	public static ScopedFileSystem RealWrite { get; } = new ScopedFileSystem(new FileSystem(), WriteOptions);
+	public static ScopedFileSystem RealWrite { get; } = new ScopedFileSystem(new FileSystem(), WorkingDirectoryWriteOptions);
 
 	/// <summary>
 	/// A pre-allocated <see cref="ScopedFileSystem"/> scoped only to the per-user
@@ -63,30 +63,36 @@ public static class FileSystemFactory
 
 	/// <summary>
 	/// Creates a new <see cref="ScopedFileSystem"/> wrapping a fresh <see cref="MockFileSystem"/>,
-	/// using the read workspace options. Each call returns a new independent in-memory file system.
+	/// using the working-directory read options. Each call returns a new independent in-memory file system.
 	/// </summary>
-	public static ScopedFileSystem InMemory() => new(new MockFileSystem(), ReadOptions);
+	public static ScopedFileSystem InMemory() => new(new MockFileSystem(), WorkingDirectoryReadOptions);
 
-	/// <summary>Wraps <paramref name="inner"/> with read workspace options (.git allowed).</summary>
-	public static ScopedFileSystem WrapToRead(IFileSystem inner) =>
-		new(inner, ReadOptions);
+	/// <summary>
+	/// Scopes <paramref name="inner"/> to <see cref="Paths.WorkingDirectoryRoot"/> and
+	/// <see cref="Paths.ApplicationData"/> for reading. Use when the inner FS contains files
+	/// that live within the current working-directory tree (e.g. a test <c>MockFileSystem</c>
+	/// seeded with workspace-relative paths).
+	/// </summary>
+	public static ScopedFileSystem ScopeCurrentWorkingDirectory(IFileSystem inner) =>
+		new(inner, WorkingDirectoryReadOptions);
 
 	/// <summary>
-	/// Wraps <paramref name="inner"/> with read workspace options extended by
-	/// <paramref name="extensionRoots"/> (e.g. detection-rules folders declared via
+	/// Scopes <paramref name="inner"/> to <see cref="Paths.WorkingDirectoryRoot"/> and
+	/// <see cref="Paths.ApplicationData"/> for reading, extended by <paramref name="extensionRoots"/>
+	/// (e.g. detection-rules folders declared via
 	/// <see cref="IDocsBuilderExtension.ExternalScopeRoots"/>).
 	/// </summary>
-	public static ScopedFileSystem WrapToRead(IFileSystem inner, IEnumerable<string>? extensionRoots)
+	public static ScopedFileSystem ScopeCurrentWorkingDirectory(IFileSystem inner, IEnumerable<string>? extensionRoots)
 	{
 		if (extensionRoots is null)
-			return WrapToRead(inner);
+			return ScopeCurrentWorkingDirectory(inner);
 
 		var roots = new[] { Paths.WorkingDirectoryRoot.FullName, Paths.ApplicationData.FullName }
 			.Concat(extensionRoots)
 			.Distinct(StringComparer.OrdinalIgnoreCase)
 			.ToArray();
 		if (roots.Length == 2)
-			return WrapToRead(inner);
+			return ScopeCurrentWorkingDirectory(inner);
 
 		return new ScopedFileSystem(inner, new ScopedFileSystemOptions(roots)
 		{
@@ -95,14 +101,48 @@ public static ScopedFileSystem WrapToRead(IFileSystem inner, IEnumerable<string>
 		});
 	}
 
-	/// <summary>Wraps <paramref name="inner"/> with write workspace options (.git not allowed).</summary>
-	public static ScopedFileSystem WrapToWrite(IFileSystem inner) =>
-		new(inner, WriteOptions);
+	/// <summary>
+	/// Scopes <paramref name="inner"/> to <see cref="Paths.WorkingDirectoryRoot"/> and
+	/// <see cref="Paths.ApplicationData"/> for writing (.git not allowed). Use when
+	/// the inner FS writes into the working-directory tree.
+	/// </summary>
+	public static ScopedFileSystem ScopeCurrentWorkingDirectoryForWrite(IFileSystem inner) =>
+		new(inner, WorkingDirectoryWriteOptions);
+
+	/// <summary>
+	/// Scopes <paramref name="inner"/> to an explicit <paramref name="sourceRoot"/> and
+	/// <see cref="Paths.ApplicationData"/> for reading. Use when the files to be read live under
+	/// a specific known root that is not <see cref="Paths.WorkingDirectoryRoot"/> — for example
+	/// test fixtures with assembler-checkout paths or service code operating on a given directory.
+	/// </summary>
+	public static ScopedFileSystem ScopeSourceDirectory(IFileSystem inner, string sourceRoot) =>
+		new(inner, new ScopedFileSystemOptions([sourceRoot, Paths.ApplicationData.FullName])
+		{
+			AllowedHiddenFolderNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".git", ".artifacts" },
+			AllowedHiddenFileNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".git", ".doc.state" }
+		});
+
+	/// <summary>
+	/// Scopes <paramref name="inner"/> to an explicit <paramref name="sourceRoot"/> and
+	/// <see cref="Paths.ApplicationData"/> for writing (.git not allowed). Write variant
+	/// of <see cref="ScopeSourceDirectory(IFileSystem, string)"/>.
+	/// </summary>
+	public static ScopedFileSystem ScopeSourceDirectoryForWrite(IFileSystem inner, string sourceRoot) =>
+		new(inner, new ScopedFileSystemOptions([sourceRoot, Paths.ApplicationData.FullName])
+		{
+			AllowedHiddenFolderNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".artifacts" },
+			AllowedHiddenFileNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".doc.state" },
+			AllowedSpecialFolders = AllowedSpecialFolder.Temp
+		});
 
 	/// <summary>
 	/// Creates a read <see cref="ScopedFileSystem"/> scoped to the git root of
 	/// <paramref name="path"/>. Falls back to <see cref="RealRead"/> when <paramref name="path"/>
 	/// is <see langword="null"/>. Use in commands that accept an explicit <c>--path</c> argument.
+	/// <para>
+	/// Suitable for command-layer code. Service-layer tests use <see cref="InMemory()"/> directly
+	/// and do not exercise this method.
+	/// </para>
 	/// </summary>
 	public static ScopedFileSystem RealForPath(string? path)
 	{
@@ -144,5 +184,4 @@ public static ScopedFileSystem RealForPathWrite(string? path, string? output = n
 			AllowedHiddenFileNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".doc.state" }
 		});
 	}
-
 }

src/Elastic.Documentation.Configuration/Toc/DocumentationSetFile.cs

@@ -99,8 +99,7 @@ public static DocumentationSetFile LoadMetadata(IFileInfo file)
 	/// </summary>
 	public static DocumentationSetFile LoadAndResolve(IDiagnosticsCollector collector, IFileInfo docsetPath, ScopedFileSystem? fileSystem = null, HashSet<HintType>? noSuppress = null)
 	{
-		fileSystem ??= docsetPath.FileSystem as ScopedFileSystem
-			?? throw new InvalidOperationException($"Expected {nameof(ScopedFileSystem)} on {nameof(docsetPath)}");
+		fileSystem ??= FileSystemFactory.ScopeSourceDirectory(docsetPath.FileSystem, docsetPath.Directory!.FullName);
 		// Validate that the docset.yml is not a symlink (security: prevents path traversal attacks)
 		EnsureNotSymlink(docsetPath);
 		var yaml = fileSystem.File.ReadAllText(docsetPath.FullName);
@@ -122,8 +121,7 @@ public static DocumentationSetFile LoadAndResolve(IDiagnosticsCollector collecto
 	/// </summary>
 	public static DocumentationSetFile LoadAndResolve(IDiagnosticsCollector collector, string yaml, IDirectoryInfo sourceDirectory, ScopedFileSystem? fileSystem = null, HashSet<HintType>? noSuppress = null)
 	{
-		fileSystem ??= sourceDirectory.FileSystem as ScopedFileSystem
-			?? throw new InvalidOperationException($"Expected {nameof(ScopedFileSystem)} on {nameof(sourceDirectory)}");
+		fileSystem ??= FileSystemFactory.ScopeSourceDirectory(sourceDirectory.FileSystem, sourceDirectory.FullName);
 		var docSet = Deserialize(yaml);
 		var docsetPath = fileSystem.Path.Join(sourceDirectory.FullName, "docset.yml").OptionalWindowsReplace();
 		docSet.SuppressDiagnostics.ExceptWith(noSuppress ?? []);

tests-integration/Elastic.Assembler.IntegrationTests/AssemblerConfigurationTests.cs

@@ -29,7 +29,7 @@ public PublicOnlyAssemblerConfigurationTests()
 		var configurationFileProvider = new ConfigurationFileProvider(NullLoggerFactory.Instance, FileSystem, skipPrivateRepositories: true);
 		var configurationContext = TestHelpers.CreateConfigurationContext(FileSystem, configurationFileProvider: configurationFileProvider);
 		var config = AssemblyConfiguration.Create(configurationContext.ConfigurationFileProvider);
-		var scopedFs = FileSystemFactory.WrapToRead(FileSystem);
+		var scopedFs = FileSystemFactory.ScopeCurrentWorkingDirectory(FileSystem);
 		Context = new AssembleContext(config, configurationContext, "dev", Collector, scopedFs, scopedFs, CheckoutDirectory.FullName, null);
 	}
 
@@ -66,7 +66,7 @@ public AssemblerConfigurationTests(DocumentationFixture fixture, ITestOutputHelp
 		Collector = new DiagnosticsCollector([]);
 		var configurationContext = TestHelpers.CreateConfigurationContext(FileSystem);
 		var config = AssemblyConfiguration.Create(configurationContext.ConfigurationFileProvider);
-		var scopedFs = FileSystemFactory.WrapToRead(FileSystem);
+		var scopedFs = FileSystemFactory.ScopeCurrentWorkingDirectory(FileSystem);
 		Context = new AssembleContext(config, configurationContext, "dev", Collector, scopedFs, scopedFs, CheckoutDirectory.FullName, null);
 	}
 

tests-integration/Elastic.Assembler.IntegrationTests/DocsSyncTests.cs

@@ -45,8 +45,8 @@ public async Task TestPlan()
 
 		var configurationContext = TestHelpers.CreateConfigurationContext(fileSystem);
 		var config = AssemblyConfiguration.Create(configurationContext.ConfigurationFileProvider);
-		var scopedFs = FileSystemFactory.WrapToRead(fileSystem);
-		var scopedWriteFs = FileSystemFactory.WrapToWrite(fileSystem);
+		var scopedFs = FileSystemFactory.ScopeCurrentWorkingDirectory(fileSystem);
+		var scopedWriteFs = FileSystemFactory.ScopeCurrentWorkingDirectoryForWrite(fileSystem);
 		var context = new AssembleContext(config, configurationContext, "dev", collector, scopedFs, scopedWriteFs, null, Path.Join(Paths.WorkingDirectoryRoot.FullName, ".artifacts", "assembly"));
 		A.CallTo(() => mockS3Client.ListObjectsV2Async(A<ListObjectsV2Request>._, A<Cancel>._))
 			.Returns(new ListObjectsV2Response
@@ -188,8 +188,8 @@ bool valid
 
 		var configurationContext = TestHelpers.CreateConfigurationContext(fileSystem);
 		var config = AssemblyConfiguration.Create(configurationContext.ConfigurationFileProvider);
-		var scopedFs2 = FileSystemFactory.WrapToRead(fileSystem);
-		var scopedWriteFs2 = FileSystemFactory.WrapToWrite(fileSystem);
+		var scopedFs2 = FileSystemFactory.ScopeCurrentWorkingDirectory(fileSystem);
+		var scopedWriteFs2 = FileSystemFactory.ScopeCurrentWorkingDirectoryForWrite(fileSystem);
 		var context = new AssembleContext(config, configurationContext, "dev", collector, scopedFs2, scopedWriteFs2, null, Path.Join(Paths.WorkingDirectoryRoot.FullName, ".artifacts", "assembly"));
 
 		var s3Objects = new List<S3Object>();
@@ -240,8 +240,8 @@ public async Task TestApply()
 		var configurationContext = TestHelpers.CreateConfigurationContext(fileSystem);
 		var config = AssemblyConfiguration.Create(configurationContext.ConfigurationFileProvider);
 		var checkoutDirectory = Path.Join(Paths.WorkingDirectoryRoot.FullName, ".artifacts", "assembly");
-		var scopedFs3 = FileSystemFactory.WrapToRead(fileSystem);
-		var scopedWriteFs3 = FileSystemFactory.WrapToWrite(fileSystem);
+		var scopedFs3 = FileSystemFactory.ScopeCurrentWorkingDirectory(fileSystem);
+		var scopedWriteFs3 = FileSystemFactory.ScopeCurrentWorkingDirectoryForWrite(fileSystem);
 		var context = new AssembleContext(config, configurationContext, "dev", collector, scopedFs3, scopedWriteFs3, null, checkoutDirectory);
 		var plan = new SyncPlan
 		{

tests-integration/Elastic.Assembler.IntegrationTests/NavigationBuildingTests.cs

@@ -47,7 +47,7 @@ public async Task AssertRealNavigation()
 		var assemblyConfiguration = AssemblyConfiguration.Create(configurationContext.ConfigurationFileProvider);
 		var collector = new TestDiagnosticsCollector(TestContext.Current.TestOutputHelper);
 		var fs = new FileSystem();
-		var assembleContext = new AssembleContext(assemblyConfiguration, configurationContext, "dev", collector, FileSystemFactory.WrapToRead(fs), FileSystemFactory.WrapToRead(new MockFileSystem()), null, null);
+		var assembleContext = new AssembleContext(assemblyConfiguration, configurationContext, "dev", collector, FileSystemFactory.ScopeCurrentWorkingDirectory(fs), FileSystemFactory.ScopeCurrentWorkingDirectory(new MockFileSystem()), null, null);
 		var logFactory = new TestLoggerFactory(TestContext.Current.TestOutputHelper);
 		var cloner = new AssemblerRepositorySourcer(logFactory, assembleContext);
 		var checkoutResult = cloner.GetAll();

tests-integration/Elastic.Assembler.IntegrationTests/NavigationRootTests.cs

@@ -47,7 +47,7 @@ public async Task AssertRealNavigation()
 		var assemblyConfiguration = AssemblyConfiguration.Create(configurationContext.ConfigurationFileProvider);
 		var collector = new TestDiagnosticsCollector(TestContext.Current.TestOutputHelper);
 		var fs = new FileSystem();
-		var assembleContext = new AssembleContext(assemblyConfiguration, configurationContext, "dev", collector, FileSystemFactory.WrapToRead(fs), FileSystemFactory.WrapToRead(new MockFileSystem()), null, null);
+		var assembleContext = new AssembleContext(assemblyConfiguration, configurationContext, "dev", collector, FileSystemFactory.ScopeCurrentWorkingDirectory(fs), FileSystemFactory.ScopeCurrentWorkingDirectory(new MockFileSystem()), null, null);
 		var logFactory = new TestLoggerFactory(TestContext.Current.TestOutputHelper);
 		var cloner = new AssemblerRepositorySourcer(logFactory, assembleContext);
 		var checkoutResult = cloner.GetAll();

tests-integration/Elastic.Assembler.IntegrationTests/SiteNavigationTests.cs

@@ -44,7 +44,7 @@ public SiteNavigationTests(DocumentationFixture fixture, ITestOutputHelper outpu
 		Collector = new DiagnosticsCollector([]);
 		var configurationContext = TestHelpers.CreateConfigurationContext(FileSystem);
 		var config = AssemblyConfiguration.Create(configurationContext.ConfigurationFileProvider);
-		var scopedFs = FileSystemFactory.WrapToRead(FileSystem);
+		var scopedFs = FileSystemFactory.ScopeCurrentWorkingDirectory(FileSystem);
 		Context = new AssembleContext(config, configurationContext, "dev", Collector, scopedFs, scopedFs, CheckoutDirectory.FullName, null);
 	}
 
@@ -98,7 +98,7 @@ public async Task ReadAllPathPrefixes()
 		var fileSystem = new FileSystem();
 		var configurationContext = TestHelpers.CreateConfigurationContext(fileSystem);
 		var config = AssemblyConfiguration.Create(configurationContext.ConfigurationFileProvider);
-		var scopedFileSystem = FileSystemFactory.WrapToRead(fileSystem);
+		var scopedFileSystem = FileSystemFactory.ScopeCurrentWorkingDirectory(fileSystem);
 		var context = new AssembleContext(config, configurationContext, "dev", collector, scopedFileSystem, scopedFileSystem, null, null);
 
 		var navigationFileInfo = configurationContext.ConfigurationFileProvider.NavigationFile;
@@ -191,7 +191,7 @@ public async Task UriResolving()
 		var fs = new FileSystem();
 		var configurationContext = TestHelpers.CreateConfigurationContext(fs);
 		var config = AssemblyConfiguration.Create(configurationContext.ConfigurationFileProvider);
-		var scopedFs = FileSystemFactory.WrapToRead(fs);
+		var scopedFs = FileSystemFactory.ScopeCurrentWorkingDirectory(fs);
 		var assembleContext = new AssembleContext(config, configurationContext, "prod", collector, scopedFs, scopedFs, null, null);
 		var repos = assembleContext.Configuration.AvailableRepositories
 			.Where(kv => !kv.Value.Skip)

tests/Elastic.Changelog.Tests/Changelogs/BundleChangelogsTests.cs

@@ -3282,7 +3282,7 @@ public async Task BundleChangelogs_WithProfileMode_MissingConfig_ReturnsErrorWit
 			currentDirectory: "/empty-project"
 		);
 		cwdFs.Directory.CreateDirectory("/empty-project");
-		var service = new ChangelogBundlingService(LoggerFactory, ConfigurationContext, FileSystemFactory.WrapToRead(cwdFs));
+		var service = new ChangelogBundlingService(LoggerFactory, ConfigurationContext, FileSystemFactory.ScopeCurrentWorkingDirectory(cwdFs));
 
 		var input = new BundleChangelogsArguments
 		{
@@ -3342,7 +3342,7 @@ public async Task BundleChangelogs_WithProfileMode_ConfigAtCurrentDir_LoadsSucce
 			""";
 		await cwdFs.File.WriteAllTextAsync(Path.Join(root, "changelogs/1755268130-feature.yaml"), changelogContent, TestContext.Current.CancellationToken);
 
-		var service = new ChangelogBundlingService(LoggerFactory, ConfigurationContext, FileSystemFactory.WrapToRead(cwdFs));
+		var service = new ChangelogBundlingService(LoggerFactory, ConfigurationContext, FileSystemFactory.ScopeCurrentWorkingDirectory(cwdFs));
 
 		var input = new BundleChangelogsArguments
 		{
@@ -3402,7 +3402,7 @@ public async Task BundleChangelogs_WithProfileMode_ConfigAtDocsSubdir_LoadsSucce
 			""";
 		await cwdFs.File.WriteAllTextAsync(Path.Join(root, "changelogs/1755268130-feature.yaml"), changelogContent, TestContext.Current.CancellationToken);
 
-		var service = new ChangelogBundlingService(LoggerFactory, ConfigurationContext, FileSystemFactory.WrapToRead(cwdFs));
+		var service = new ChangelogBundlingService(LoggerFactory, ConfigurationContext, FileSystemFactory.ScopeCurrentWorkingDirectory(cwdFs));
 
 		var input = new BundleChangelogsArguments
 		{

tests/Elastic.Changelog.Tests/Changelogs/ChangelogRemoveTests.cs

@@ -617,7 +617,7 @@ public async Task Remove_WithProfileMode_MissingConfig_ReturnsErrorWithAdvice()
 			currentDirectory: "/empty-project"
 		);
 		cwdFs.Directory.CreateDirectory("/empty-project");
-		var service = new ChangelogRemoveService(LoggerFactory, ConfigurationContext, FileSystemFactory.WrapToRead(cwdFs));
+		var service = new ChangelogRemoveService(LoggerFactory, ConfigurationContext, FileSystemFactory.ScopeCurrentWorkingDirectory(cwdFs));
 
 		var input = new ChangelogRemoveArguments
 		{

tests/Elastic.Changelog.Tests/Changelogs/ChangelogTestBase.cs

@@ -29,7 +29,7 @@ protected ChangelogTestBase(ITestOutputHelper output)
 	{
 		Output = output;
 		var mockFileSystem = new MockFileSystem(new MockFileSystemOptions { CurrentDirectory = Paths.WorkingDirectoryRoot.FullName });
-		FileSystem = FileSystemFactory.WrapToRead(mockFileSystem);
+		FileSystem = FileSystemFactory.ScopeCurrentWorkingDirectory(mockFileSystem);
 		Collector = new TestDiagnosticsCollector(output);
 		LoggerFactory = new TestLoggerFactory(output);