diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs index b6d6d7ce27..5aae1dbd4a 100644 --- a/src/Umbraco.Core/StringExtensions.cs +++ b/src/Umbraco.Core/StringExtensions.cs @@ -41,6 +41,16 @@ namespace Umbraco.Core ToCSharpEscapeChars[escape[0]] = escape[1]; } + /// + /// Removes new lines and tabs + /// + /// + /// + internal static string StripWhitespace(this string txt) + { + return Regex.Replace(txt, @"\s", string.Empty); + } + internal static string StripFileExtension(this string fileName) { //filenames cannot contain line breaks diff --git a/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs b/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs index 22991d605a..aa238760ce 100644 --- a/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs +++ b/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs @@ -1,5 +1,6 @@ using System.Linq; using NUnit.Framework; +using Umbraco.Core; using Umbraco.Web.UI.JavaScript; namespace Umbraco.Tests.Web.AngularIntegration @@ -29,7 +30,7 @@ namespace Umbraco.Tests.Web.AngularIntegration angular.bootstrap(document, ['umbraco']); }); -});", result); +});".StripWhitespace(), result.StripWhitespace()); } } } diff --git a/src/Umbraco.Tests/Web/AngularIntegration/ServerVariablesParserTests.cs b/src/Umbraco.Tests/Web/AngularIntegration/ServerVariablesParserTests.cs index b0fb91ab98..e078be033e 100644 --- a/src/Umbraco.Tests/Web/AngularIntegration/ServerVariablesParserTests.cs +++ b/src/Umbraco.Tests/Web/AngularIntegration/ServerVariablesParserTests.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using NUnit.Framework; using Umbraco.Web.UI.JavaScript; +using Umbraco.Core; namespace Umbraco.Tests.Web.AngularIntegration { @@ -19,7 +20,7 @@ namespace Umbraco.Tests.Web.AngularIntegration d.Add("test4", "Test 4"); d.Add("test5", "Test 5"); - var output = ServerVariablesParser.Parse(d); + var output = ServerVariablesParser.Parse(d).StripWhitespace(); Assert.IsTrue(output.Contains(@"Umbraco.Sys.ServerVariables = { ""test1"": ""Test 1"", @@ -27,7 +28,7 @@ namespace Umbraco.Tests.Web.AngularIntegration ""test3"": ""Test 3"", ""test4"": ""Test 4"", ""test5"": ""Test 5"" -} ;")); +} ;".StripWhitespace())); } } } \ No newline at end of file