diff --git a/src/Umbraco.Infrastructure/Manifest/ExtensionManifestReader.cs b/src/Umbraco.Infrastructure/Manifest/ExtensionManifestReader.cs index 1665f372d3..33d6180fa2 100644 --- a/src/Umbraco.Infrastructure/Manifest/ExtensionManifestReader.cs +++ b/src/Umbraco.Infrastructure/Manifest/ExtensionManifestReader.cs @@ -21,7 +21,7 @@ internal sealed class ExtensionManifestReader : IExtensionManifestReader _logger = logger; } - public async Task> GetManifestsAsync() + public async Task> ReadManifestsAsync() { IFileProvider? manifestFileProvider = _manifestFileProviderFactory.Create(); if (manifestFileProvider is null) diff --git a/src/Umbraco.Infrastructure/Manifest/ExtensionManifestService.cs b/src/Umbraco.Infrastructure/Manifest/ExtensionManifestService.cs index b8ce09884c..19c44dd96f 100644 --- a/src/Umbraco.Infrastructure/Manifest/ExtensionManifestService.cs +++ b/src/Umbraco.Infrastructure/Manifest/ExtensionManifestService.cs @@ -8,5 +8,5 @@ internal sealed class ExtensionManifestService : IExtensionManifestService => _extensionManifestReader = extensionManifestReader; // TODO: cache manifests for the app lifetime - public async Task> GetManifestsAsync() => await _extensionManifestReader.GetManifestsAsync(); + public async Task> GetManifestsAsync() => await _extensionManifestReader.ReadManifestsAsync(); } diff --git a/src/Umbraco.Infrastructure/Manifest/IExtensionManifestReader.cs b/src/Umbraco.Infrastructure/Manifest/IExtensionManifestReader.cs index e3668e912b..4f62434506 100644 --- a/src/Umbraco.Infrastructure/Manifest/IExtensionManifestReader.cs +++ b/src/Umbraco.Infrastructure/Manifest/IExtensionManifestReader.cs @@ -2,5 +2,5 @@ public interface IExtensionManifestReader { - Task> GetManifestsAsync(); + Task> ReadManifestsAsync(); } diff --git a/src/Umbraco.Web.UI.New.Client b/src/Umbraco.Web.UI.New.Client index 1c04f6d204..6a7979d95a 160000 --- a/src/Umbraco.Web.UI.New.Client +++ b/src/Umbraco.Web.UI.New.Client @@ -1 +1 @@ -Subproject commit 1c04f6d204404df4d271ef70c679500b73d439c7 +Subproject commit 6a7979d95a5014543a6dc555cceaaddb43dd35b4 diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ExtensionManifestReaderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ExtensionManifestReaderTests.cs index 1fa766a3c3..862a8ec2a2 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ExtensionManifestReaderTests.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ExtensionManifestReaderTests.cs @@ -35,13 +35,13 @@ public class ExtensionManifestReaderTests } [Test] - public async Task CanGetManifestAtRoot() + public async Task CanReadManifestAtRoot() { _rootDirectoryContentsMock .Setup(f => f.GetEnumerator()) .Returns(new List { CreateExtensionManifestFile() }.GetEnumerator()); - var result = await _reader.GetManifestsAsync(); + var result = await _reader.ReadManifestsAsync(); Assert.AreEqual(1, result.Count()); var first = result.First(); @@ -52,7 +52,7 @@ public class ExtensionManifestReaderTests } [Test] - public async Task CanGetManifestsInRootDirectories() + public async Task CanReadManifestsInRootDirectories() { var directory1 = CreateDirectoryMock("/my-extension", CreateExtensionManifestFile(DefaultManifestContent("Extension One"))); var directory2 = CreateDirectoryMock("/my-other-extension", CreateExtensionManifestFile(DefaultManifestContent("Extension Two"))); @@ -60,14 +60,14 @@ public class ExtensionManifestReaderTests .Setup(f => f.GetEnumerator()) .Returns(new List { directory1, directory2 }.GetEnumerator()); - var result = await _reader.GetManifestsAsync(); + var result = await _reader.ReadManifestsAsync(); Assert.AreEqual(2, result.Count()); Assert.AreEqual("Extension One", result.First().Name); Assert.AreEqual("Extension Two", result.Last().Name); } [Test] - public async Task CanGetManifestsRecursively() + public async Task CanReadManifestsRecursively() { var childFolder = CreateDirectoryMock("/my-parent-folder/my-child-folder", CreateExtensionManifestFile(DefaultManifestContent("Nested Extension"))); var parentFolder = CreateDirectoryMock("/my-parent-folder", childFolder); @@ -76,7 +76,7 @@ public class ExtensionManifestReaderTests .Setup(f => f.GetEnumerator()) .Returns(new List { parentFolder }.GetEnumerator()); - var result = await _reader.GetManifestsAsync(); + var result = await _reader.ReadManifestsAsync(); Assert.AreEqual(1, result.Count()); Assert.AreEqual("Nested Extension", result.First().Name); } @@ -91,7 +91,7 @@ public class ExtensionManifestReaderTests .Setup(f => f.GetEnumerator()) .Returns(new List { emptyFolder, extensionFolder }.GetEnumerator()); - var result = await _reader.GetManifestsAsync(); + var result = await _reader.ReadManifestsAsync(); Assert.AreEqual(1, result.Count()); Assert.AreEqual("My Extension", result.First().Name); } @@ -112,7 +112,7 @@ public class ExtensionManifestReaderTests .Setup(f => f.GetEnumerator()) .Returns(new List { otherFolder, extensionFolder }.GetEnumerator()); - var result = await _reader.GetManifestsAsync(); + var result = await _reader.ReadManifestsAsync(); Assert.AreEqual(1, result.Count()); Assert.AreEqual("My Extension", result.First().Name); } @@ -126,12 +126,12 @@ public class ExtensionManifestReaderTests .Setup(f => f.GetEnumerator()) .Returns(folders.GetEnumerator()); - var result = await _reader.GetManifestsAsync(); + var result = await _reader.ReadManifestsAsync(); Assert.AreEqual(0, result.Count()); } [Test] - public async Task CannotGetManifestWithoutName() + public async Task CannotReadManifestWithoutName() { var content = @"{ ""version"": ""1.2.3"", @@ -147,14 +147,14 @@ public class ExtensionManifestReaderTests .Setup(f => f.GetEnumerator()) .Returns(new List { CreateExtensionManifestFile(content) }.GetEnumerator()); - var result = await _reader.GetManifestsAsync(); + var result = await _reader.ReadManifestsAsync(); Assert.AreEqual(0, result.Count()); EnsureLogErrorWasCalled(); } [Test] - public async Task CannotGetManifestWithoutExtensions() + public async Task CannotReadManifestWithoutExtensions() { var content = @"{ ""name"": ""Something"", @@ -165,7 +165,7 @@ public class ExtensionManifestReaderTests .Setup(f => f.GetEnumerator()) .Returns(new List { CreateExtensionManifestFile(content) }.GetEnumerator()); - var result = await _reader.GetManifestsAsync(); + var result = await _reader.ReadManifestsAsync(); Assert.AreEqual(0, result.Count()); EnsureLogErrorWasCalled(); @@ -173,13 +173,13 @@ public class ExtensionManifestReaderTests [TestCase("This is not JSON")] [TestCase(@"{""name"": ""invalid-json"", ""version"": ")] - public async Task CannotGetInvalidManifest(string content) + public async Task CannotReadInvalidManifest(string content) { _rootDirectoryContentsMock .Setup(f => f.GetEnumerator()) .Returns(new List { CreateExtensionManifestFile(content) }.GetEnumerator()); - var result = await _reader.GetManifestsAsync(); + var result = await _reader.ReadManifestsAsync(); Assert.AreEqual(0, result.Count()); EnsureLogErrorWasCalled();