LinkOrDefault now returns IHtmlString. Replaced calls to <%= with <%: where relevant to this change.

--HG--
branch : dev
This commit is contained in:
Phil Haack
2010-06-09 23:39:02 -07:00
parent 013638aca8
commit 65772415fd
6 changed files with 96 additions and 24 deletions

View File

@@ -35,6 +35,20 @@ namespace Orchard.Tests.Mvc.Html {
Assert.AreEqual(@"<a href=""http://example.com"">&lt;br /&gt;</a>", result.ToString());
}
[Test]
public void LinkHtmlAttributeEncodesHref() {
//arrange
var viewContext = new ViewContext();
var viewDataContainer = new Mock<IViewDataContainer>();
var html = new HtmlHelper(viewContext, viewDataContainer.Object);
//act
var result = html.Link("test", "<br />");
//assert
Assert.AreEqual(@"<a href=""&lt;br />"">test</a>", result.ToString());
}
[Test]
public void LinkHtmlAttributeEncodesAttributes() {
//arrange
@@ -49,6 +63,62 @@ namespace Orchard.Tests.Mvc.Html {
Assert.AreEqual(@"<a href=""http://example.com"" title=""&lt;br />"">linkText</a>", result.ToString());
}
[Test]
public void LinkOrDefaultReturnsIHtmlString() {
//arrange
var viewContext = new ViewContext();
var viewDataContainer = new Mock<IViewDataContainer>();
var html = new HtmlHelper(viewContext, viewDataContainer.Object);
//act
var result = html.LinkOrDefault("test", "http://example.com") as IHtmlString;
//assert
Assert.IsNotNull(result);
}
[Test]
public void LinkOrDefaultHtmlEncodesLinkText() {
//arrange
var viewContext = new ViewContext();
var viewDataContainer = new Mock<IViewDataContainer>();
var html = new HtmlHelper(viewContext, viewDataContainer.Object);
//act
var result = html.LinkOrDefault("<br />", "http://example.com");
//assert
Assert.AreEqual(@"<a href=""http://example.com"">&lt;br /&gt;</a>", result.ToString());
}
[Test]
public void LinkOrDefaultWithoutHrefHtmlEncodesLinkText() {
//arrange
var viewContext = new ViewContext();
var viewDataContainer = new Mock<IViewDataContainer>();
var html = new HtmlHelper(viewContext, viewDataContainer.Object);
//act
var result = html.LinkOrDefault("<br />", null);
//assert
Assert.AreEqual(@"&lt;br /&gt;", result.ToString());
}
[Test]
public void LinkOrDefaultWithHrefHtmlAttributeEncodesHref() {
//arrange
var viewContext = new ViewContext();
var viewDataContainer = new Mock<IViewDataContainer>();
var html = new HtmlHelper(viewContext, viewDataContainer.Object);
//act
var result = html.LinkOrDefault("test", "<br />");
//assert
Assert.AreEqual(@"<a href=""&lt;br />"">test</a>", result.ToString());
}
[Test]
public void SelectOptionHtmlEncodesText() {
//arrange