Test download of CSS from link tags

martinnormark · martinnormark · commit 443159031235 · 2015-12-17T00:00:12.000+01:00
Wraps up #72
diff --git a/PreMailer.Net/PreMailer.Net.Tests/LinkTagCssSourceTests.cs b/PreMailer.Net/PreMailer.Net.Tests/LinkTagCssSourceTests.cs
@@ -12,6 +12,11 @@ public class LinkTagCssSourceTests
 	{
 		private readonly Mock<IWebDownloader> _webDownloader = new Mock<IWebDownloader>();
 
+		public LinkTagCssSourceTests()
+		{
+			WebDownloader.SharedDownloader = _webDownloader.Object;
+		}
+
 		[TestMethod]
 		public void ImplementsInterface()
 		{
@@ -56,7 +61,7 @@ public void GetCSS_AbsoluteUrlInHref_CallsWebDownloader_WithSpecifiedPath()
 		private LinkTagCssSource CreateSUT(string baseUrl = "http://a.com", string path = "a.css")
 		{
 			var node = CQ.CreateFragment(String.Format("<link href=\"{0}\" />", path));
-			var sut = new LinkTagCssSource(node.FirstElement(), new Uri(baseUrl), webDownloader: _webDownloader.Object);
+			var sut = new LinkTagCssSource(node.FirstElement(), new Uri(baseUrl));
 
 			return sut;
 		}
diff --git a/PreMailer.Net/PreMailer.Net.Tests/PreMailerTests.cs b/PreMailer.Net/PreMailer.Net.Tests/PreMailerTests.cs
@@ -1,5 +1,7 @@
 ﻿using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using PreMailer.Net.Downloaders;
+using Moq;
 
 namespace PreMailer.Net.Tests
 {
@@ -281,5 +283,54 @@ public void AddAnalyticsTags_AddsTagsAndExcludesDomain()
 				.MoveCssInline();
 			Assert.IsTrue(expected == premailedOutput.Html);
 		}
+
+		[TestMethod]
+		public void ContainsLinkCssElement_DownloadsCss()
+		{
+			var mockDownloader = new Mock<IWebDownloader>();
+			mockDownloader.Setup(d => d.DownloadString(It.IsAny<Uri>())).Returns(".a { display: block; }");
+			WebDownloader.SharedDownloader = mockDownloader.Object;
+
+			Uri baseUri = new Uri("http://a.com");
+			Uri fullUrl = new Uri(baseUri, "b.css");
+			string input = String.Format("<html><head><link href=\"{0}\"></link></head><body><div id=\"high-imp\" class=\"test\">test</div></body></html>", fullUrl);
+
+			PreMailer sut = new PreMailer(input, baseUri);
+			sut.MoveCssInline();
+
+			mockDownloader.Verify(d => d.DownloadString(fullUrl));
+		}
+
+		[TestMethod]
+		public void ContainsLinkCssElement_NotCssFile_DoNotDownload()
+		{
+			var mockDownloader = new Mock<IWebDownloader>();
+			mockDownloader.Setup(d => d.DownloadString(It.IsAny<Uri>())).Returns(".a { display: block; }");
+			WebDownloader.SharedDownloader = mockDownloader.Object;
+
+			Uri baseUri = new Uri("http://a.com");
+			Uri fullUrl = new Uri(baseUri, "b.bs");
+			string input = String.Format("<html><head><link href=\"{0}\"></link></head><body><div id=\"high-imp\" class=\"test\">test</div></body></html>", fullUrl);
+
+			PreMailer sut = new PreMailer(input, baseUri);
+			sut.MoveCssInline();
+
+			mockDownloader.Verify(d => d.DownloadString(It.IsAny<Uri>()), Times.Never());
+		}
+
+		[TestMethod]
+		public void ContainsLinkCssElement_DownloadsCss_InlinesContent()
+		{
+			var mockDownloader = new Mock<IWebDownloader>();
+			mockDownloader.Setup(d => d.DownloadString(It.IsAny<Uri>())).Returns(".test { width: 150px; }");
+			WebDownloader.SharedDownloader = mockDownloader.Object;
+			
+			string input = "<html><head><link href=\"http://a.com/b.css\"></link></head><body><div class=\"test\">test</div></body></html>";
+
+			PreMailer sut = new PreMailer(input, new Uri("http://a.com"));
+			var premailedOutput = sut.MoveCssInline();
+
+			Assert.IsTrue(premailedOutput.Html.Contains("<div class=\"test\" style=\"width: 150px\">"));
+		}
 	}
 }
diff --git a/PreMailer.Net/PreMailer.Net/Downloaders/WebDownloader.cs b/PreMailer.Net/PreMailer.Net/Downloaders/WebDownloader.cs
@@ -4,8 +4,27 @@
 
 namespace PreMailer.Net.Downloaders
 {
-	internal class WebDownloader : IWebDownloader
+	public class WebDownloader : IWebDownloader
 	{
+		private static IWebDownloader _sharedDownloader;
+
+		public static IWebDownloader SharedDownloader
+		{
+			get
+			{
+				if (_sharedDownloader == null)
+				{
+					_sharedDownloader = new WebDownloader();
+				}
+
+				return _sharedDownloader;
+			}
+			set
+			{
+				_sharedDownloader = value;
+			}
+		}
+
 		public string DownloadString(Uri uri)
 		{
 			var request = WebRequest.Create(uri);
diff --git a/PreMailer.Net/PreMailer.Net/Sources/LinkTagCssSource.cs b/PreMailer.Net/PreMailer.Net/Sources/LinkTagCssSource.cs
@@ -7,14 +7,11 @@ namespace PreMailer.Net.Sources
 {
 	public class LinkTagCssSource : ICssSource
 	{
-		private readonly IWebDownloader _webDownloader;
 		private Uri _downloadUri;
 		private string _cssContents;
 
-		public LinkTagCssSource(IDomObject node, Uri baseUri, IWebDownloader webDownloader = null)
+		public LinkTagCssSource(IDomObject node, Uri baseUri)
 		{
-			_webDownloader = webDownloader ?? new WebDownloader();
-
 			// There must be an href
 			var href = node.Attributes.First(a => a.Key.Equals("href", StringComparison.OrdinalIgnoreCase)).Value;
 
@@ -28,7 +25,7 @@ public string GetCss()
 		{
 			if (_cssContents == null)
 			{
-				_cssContents = _webDownloader.DownloadString(_downloadUri);
+				_cssContents = WebDownloader.SharedDownloader.DownloadString(_downloadUri);
 			}
 
 			return _cssContents;

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,11 @@ public class LinkTagCssSourceTests`
`12`	`12`	`{`
`13`	`13`	`private readonly Mock<IWebDownloader> _webDownloader = new Mock<IWebDownloader>();`
`14`	`14`
	`15`	`+ public LinkTagCssSourceTests()`
	`16`	`+ {`
	`17`	`+ WebDownloader.SharedDownloader = _webDownloader.Object;`
	`18`	`+ }`
	`19`	`+`
`15`	`20`	`[TestMethod]`
`16`	`21`	`public void ImplementsInterface()`
`17`	`22`	`{`
`@@ -56,7 +61,7 @@ public void GetCSS_AbsoluteUrlInHref_CallsWebDownloader_WithSpecifiedPath()`
`56`	`61`	`private LinkTagCssSource CreateSUT(string baseUrl = "http://a.com", string path = "a.css")`
`57`	`62`	`{`
`58`	`63`	`var node = CQ.CreateFragment(String.Format("<link href=\"{0}\" />", path));`
`59`		`- var sut = new LinkTagCssSource(node.FirstElement(), new Uri(baseUrl), webDownloader: _webDownloader.Object);`
	`64`	`+ var sut = new LinkTagCssSource(node.FirstElement(), new Uri(baseUrl));`
`60`	`65`
`61`	`66`	`return sut;`
`62`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,11 @@ namespace PreMailer.Net.Sources`
`7`	`7`	`{`
`8`	`8`	`public class LinkTagCssSource : ICssSource`
`9`	`9`	`{`
`10`		`- private readonly IWebDownloader _webDownloader;`
`11`	`10`	`private Uri _downloadUri;`
`12`	`11`	`private string _cssContents;`
`13`	`12`
`14`		`- public LinkTagCssSource(IDomObject node, Uri baseUri, IWebDownloader webDownloader = null)`
	`13`	`+ public LinkTagCssSource(IDomObject node, Uri baseUri)`
`15`	`14`	`{`
`16`		`- _webDownloader = webDownloader ?? new WebDownloader();`
`17`		`-`
`18`	`15`	`// There must be an href`
`19`	`16`	`var href = node.Attributes.First(a => a.Key.Equals("href", StringComparison.OrdinalIgnoreCase)).Value;`
`20`	`17`
`@@ -28,7 +25,7 @@ public string GetCss()`
`28`	`25`	`{`
`29`	`26`	`if (_cssContents == null)`
`30`	`27`	`{`
`31`		`- _cssContents = _webDownloader.DownloadString(_downloadUri);`
	`28`	`+ _cssContents = WebDownloader.SharedDownloader.DownloadString(_downloadUri);`
`32`	`29`	`}`
`33`	`30`
`34`	`31`	`return _cssContents;`