Fixes up all the tests for now - we can revisit more tests to test with the different config options

Author: Warren Buckley

Our.Umbraco.TagHelpers.Tests/InlineSvgTagHelperTests.cs

@@ -21,6 +21,7 @@ public class InlineSvgTagHelperTests
     {
         private TagHelperContext _context = null!;
         private TagHelperOutput _output = null!;
+        private IOptions<OurUmbracoTagHelpersConfiguration> _settings = null!;
 
         [SetUp]
         public void Setup()
@@ -37,11 +38,7 @@ public void Setup()
                 content.SetContent("Something else");
                 return Task.FromResult<TagHelperContent>(content);
             });
-        }
 
-        [Test]
-        public void NoOutputIfNoMediaOrFileSet()
-        {
             var settings = new OurUmbracoTagHelpersConfiguration()
             {
                 OurSVG =
@@ -51,9 +48,15 @@ public void NoOutputIfNoMediaOrFileSet()
                     CacheMinutes = 180
                 }
             };
-            IOptions<OurUmbracoTagHelpersConfiguration> tagHelperSettings = Options.Create(settings);
-       
-            var tagHelper = new InlineSvgTagHelper(null, null, null, tagHelperSettings, null);
+            _settings = Options.Create(settings);
+
+        }
+
+        [Test]
+        public void NoOutputIfNoMediaOrFileSet()
+        {
+                    
+            var tagHelper = new InlineSvgTagHelper(null, null, null, _settings, null);
 
             tagHelper.Process(_context, _output);
 
@@ -64,7 +67,7 @@ public void NoOutputIfNoMediaOrFileSet()
         public void NoOutputIfBothMediaAndFileSet()
         {
             var umbContent = Mock.Of<IPublishedContent>(c => c.ContentType.ItemType == PublishedItemType.Media);
-            var tagHelper = new InlineSvgTagHelper(null, null, null, null, null)
+            var tagHelper = new InlineSvgTagHelper(null, null, null, _settings, null)
             {
                 FileSource = "test.svg",
                 MediaItem = umbContent
@@ -78,7 +81,7 @@ public void NoOutputIfBothMediaAndFileSet()
         [Test]
         public void NoOutputIfFileNotSvg()
         {
-            var tagHelper = new InlineSvgTagHelper(null, null, null, null, null)
+            var tagHelper = new InlineSvgTagHelper(null, null, null, _settings, null)
             {
                 FileSource = "test.notsvg"
             };
@@ -94,7 +97,7 @@ public void NoOutputIfFileNotFound()
             var fileProvider = new Mock<IFileProvider>();
             fileProvider.Setup(p => p.GetFileInfo(It.IsAny<string>())).Returns(Mock.Of<IFileInfo>(f => !f.Exists));
             var hostEnv = Mock.Of<IWebHostEnvironment>(e => e.WebRootFileProvider == fileProvider.Object);
-            var tagHelper = new InlineSvgTagHelper(null, hostEnv, null, null, null)
+            var tagHelper = new InlineSvgTagHelper(null, hostEnv, null, _settings, null)
             {
                 FileSource = "test.svg"
             };
@@ -110,7 +113,7 @@ public void ExpectedOutputIfValidFile()
             var fileProvider = new Mock<IFileProvider>();
             fileProvider.Setup(p => p.GetFileInfo(It.IsAny<string>())).Returns(Mock.Of<IFileInfo>(f => f.Exists && f.CreateReadStream() == new MemoryStream(Encoding.UTF8.GetBytes("test svg"))));
             var hostEnv = Mock.Of<IWebHostEnvironment>(e => e.WebRootFileProvider == fileProvider.Object);
-            var tagHelper = new InlineSvgTagHelper(null, hostEnv, null, null, null)
+            var tagHelper = new InlineSvgTagHelper(null, hostEnv, null, _settings, null)
             {
                 FileSource = "test.svg"
             };
@@ -128,7 +131,7 @@ public void NoOutputIfMediaUrlNull()
         {
             var urlProvider = new Mock<IPublishedUrlProvider>();
             urlProvider.Setup(p => p.GetMediaUrl(It.IsAny<IPublishedContent>(), It.IsAny<UrlMode>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns((string)null!);
-            var tagHelper = new InlineSvgTagHelper(null, null, urlProvider.Object, null, null)
+            var tagHelper = new InlineSvgTagHelper(null, null, urlProvider.Object, _settings, null)
             {
                 MediaItem = Mock.Of<IPublishedContent>(c => c.ContentType.ItemType == PublishedItemType.Media)
             };
@@ -144,7 +147,7 @@ public void NoOutputIfMediaNotSvg()
             var umbContent = Mock.Of<IPublishedContent>(c => c.ContentType.ItemType == PublishedItemType.Media);
             var urlProvider = new Mock<IPublishedUrlProvider>();
             urlProvider.Setup(p => p.GetMediaUrl(umbContent, It.IsAny<UrlMode>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns("test.notsvg");
-            var tagHelper = new InlineSvgTagHelper(null, null, urlProvider.Object, null, null)
+            var tagHelper = new InlineSvgTagHelper(null, null, urlProvider.Object, _settings, null)
             {
                 MediaItem = umbContent
             };
@@ -164,8 +167,8 @@ public void NoOutputIfMediaNotFound()
             var tagHelper = new InlineSvgTagHelper(
                 new MediaFileManager(fileSystem, null, null, null, null, Mock.Of<IOptions<ContentSettings>>()),
                 null,
-                urlProvider.Object, 
-                null, 
+                urlProvider.Object,
+                _settings, 
                 null)
             {
                 MediaItem = umbContent
@@ -186,8 +189,8 @@ public void ExpectedOutputIfValidMedia()
             var tagHelper = new InlineSvgTagHelper(
                 new MediaFileManager(fileSystem, null, null, null, null, Mock.Of<IOptions<ContentSettings>>()),
                 null,
-                urlProvider.Object, 
-                null, 
+                urlProvider.Object,
+                _settings, 
                 null)
             {
                 MediaItem = umbContent
@@ -209,7 +212,7 @@ public void SanitizesJavascript()
                 .Setup(p => p.GetFileInfo(It.IsAny<string>()))
                 .Returns(Mock.Of<IFileInfo>(f => f.Exists && f.CreateReadStream() == new MemoryStream(Encoding.UTF8.GetBytes("<a xlink:href=\"javascript:alert('test');\">Click here</a><script attr=\"test\">test</script>end"))));
             var hostEnv = Mock.Of<IWebHostEnvironment>(e => e.WebRootFileProvider == fileProvider.Object);
-            var tagHelper = new InlineSvgTagHelper(null, hostEnv, null, null, null)
+            var tagHelper = new InlineSvgTagHelper(null, hostEnv, null, _settings, null)
             {
                 FileSource = "test.svg"
             };