yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaning up tests and useless TruncateByWords functions

Browse Source
This commit is contained in:
Robert
2017-09-06 11:17:06 +02:00
parent b2798e38f7
commit b1358936b4
2 changed files with 10 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
View File

@@ -95,72 +95,37 @@ namespace Umbraco.Tests.FrontEnd
}
[Test]
public void Truncate_By_Words_TagsAsContentOff()
public void Truncate_By_Words_TagsAsContent()
{
var text = "Hello world, this is some text <a href='blah'>with a link</a>";
var helper = new UmbracoHelper();
var result = helper.TruncateByWords(text, 4, true, false).ToString();
var result = helper.TruncateByWords(text, 4).ToString();
Assert.AreEqual("Hello world, this is&hellip;", result);
}
[Test]
public void Truncate_By_Words_With_Tag_TagsAsContentOff()
public void Truncate_By_Words_With_Tag_TagsAsContent()
{
var text = "Hello world, <b>this</b> is some text <a href='blah'>with a link</a>";
var helper = new UmbracoHelper();
var result = helper.TruncateByWords(text, 4, true, false).ToString();
var result = helper.TruncateByWords(text, 4).ToString();
Assert.AreEqual("Hello world, <b>this</b> is&hellip;", result);
}
[Test]
public void Truncate_By_Words_Mid_Tag_TagsAsContentOff()
public void Truncate_By_Words_Mid_Tag_TagsAsContent()
{
var text = "Hello world, this is some text <a href='blah'>with a link</a>";
var helper = new UmbracoHelper();
var result = helper.TruncateByWords(text, 7, true, false).ToString();
Assert.AreEqual("Hello world, this is some text <a href='blah'>with&hellip;</a>", result);
}
[Test]
public void Truncate_By_Words_TagsAsContentOn()
{
var text = "Hello world, this is some text <a href='blah'>with a link</a>";
var helper = new UmbracoHelper();
var result = helper.TruncateByWords(text, 4, true, true).ToString();
Assert.AreEqual("Hello world, this is&hellip;", result);
}
[Test]
public void Truncate_By_Words_With_Tag_TagsAsContentOn()
{
var text = "Hello world, <b>this</b> is some text <a href='blah'>with a link</a>";
var helper = new UmbracoHelper();
var result = helper.TruncateByWords(text, 4, true, true).ToString();
Assert.AreEqual("Hello world, <b>this</b> is&hellip;", result);
}
[Test]
public void Truncate_By_Words_Mid_Tag_TagsAsContentOn()
{
var text = "Hello world, this is some text <a href='blah'>with a link</a>";
var helper = new UmbracoHelper();
var result = helper.TruncateByWords(text, 7, true, true).ToString();
var result = helper.TruncateByWords(text, 7).ToString();
Assert.AreEqual("Hello world, this is some text <a href='blah'>with&hellip;</a>", result);
}

28
src/Umbraco.Web/UmbracoHelper.cs
View File

@@ -1466,7 +1466,7 @@ namespace Umbraco.Web
/// </summary>
public IHtmlString TruncateByWords(string html, int words)
{
int length = _stringUtilities.WordsToLength(html, words, false);
int length = _stringUtilities.WordsToLength(html, words);
return Truncate(html, length, true, false);
}
@@ -1476,19 +1476,9 @@ namespace Umbraco.Web
/// </summary>
public IHtmlString TruncateByWords(string html, int words, bool addElipsis)
{
int length = _stringUtilities.WordsToLength(html, words, false);
int length = _stringUtilities.WordsToLength(html, words);
return Truncate(html, length, addElipsis, false);
}
/// <summary>
/// Truncates a string to a given amount of words, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them
/// </summary>
public IHtmlString TruncateByWords(string html, int words, bool addElipsis, bool treatTagsAsContent)
{
int length =_stringUtilities.WordsToLength(html, words, treatTagsAsContent);
return Truncate(html, length, addElipsis, treatTagsAsContent);
}
/// <summary>
@@ -1496,7 +1486,7 @@ namespace Umbraco.Web
/// </summary>
public IHtmlString TruncateByWords(IHtmlString html, int words)
{
int length = _stringUtilities.WordsToLength(html.ToHtmlString(), words, false);
int length = _stringUtilities.WordsToLength(html.ToHtmlString(), words);
return Truncate(html, length, true, false);
}
@@ -1506,19 +1496,9 @@ namespace Umbraco.Web
/// </summary>
public IHtmlString TruncateByWords(IHtmlString html, int words, bool addElipsis)
{
int length = _stringUtilities.WordsToLength(html.ToHtmlString(), words, false);
int length = _stringUtilities.WordsToLength(html.ToHtmlString(), words);
return Truncate(html, length, addElipsis, false);
}
/// <summary>
/// Truncates a string to a given amount of words, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them
/// </summary>
public IHtmlString TruncateByWords(IHtmlString html, int words, bool addElipsis, bool treatTagsAsContent)
{
int length = _stringUtilities.WordsToLength(html.ToHtmlString(), words, treatTagsAsContent);
return Truncate(html, length, addElipsis, treatTagsAsContent);
}
#endregion
#endregion