commite0aa430d4cAuthor: Paul Johnson <pmj@umbraco.com> Date: Thu May 19 10:00:57 2022 +0100 Fix typo in pipeline yaml commit2ec450f2d6Author: Paul Johnson <pmj@umbraco.com> Date: Thu May 19 09:14:47 2022 +0100 Fix yaml conditions commitc2d548039aAuthor: Paul Johnson <pmj@umbraco.com> Date: Thu May 19 09:02:50 2022 +0100 Azure pipeline refactor (#12428) * Skip symbols for Umbraco.Templates * Resolve some test issues + Fixed whitespace dependant tests to pass regardless of build OS vs run OS. + Snap dictionary tests were failing when Configuration was release + Removed hardcoded baseUrl from one of the acceptance tests * Move docfx setup to ./build and fix * Update UI docs title * Added dockerfile that can be used when running the acceptance tests. * Take explicit dependency on System.Security.Cryptography.Pkcs * Refactor ci/cd pipeline commitee8359af75Author: Mole <nikolajlauridsen@protonmail.ch> Date: Thu May 19 09:57:21 2022 +0200 V10: Reintroduce appsettings-schema.json (#12416) * Reintroduce language files tests (#12367) * Reintroducing language files tests * Fix casing * Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj * Remove Umbraco.Templates from VerifyNuGet step * Remove duplicate and unnecessary properties * Generate json schema on build * Add targets file * Gitignore auto generated appsettings schema * Fix build not copying file * Use the new path in appsettings * Update copy message * Build json schema as release * Update json schema options Otherwise just running the project will put the file in the wrong place * Generate schema if it doesn't exist in Web.Ui * Update json schema options Otherwise just running the project will put the file in the wrong place Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: Ronald Barendse <ronald@barend.se> commitdd617ede80Author: Ronald Barendse <ronald@barend.se> Date: Thu May 19 09:51:11 2022 +0200 v10: Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj (#12413) * Reintroduce language files tests (#12367) * Reintroducing language files tests * Fix casing * Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj * Remove Umbraco.Templates from VerifyNuGet step * Remove duplicate and unnecessary properties Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> commitb83216876fAuthor: Ronald Barendse <ronald@barend.se> Date: Thu May 19 08:36:04 2022 +0200 v10: Project template database/connection string improvements (#12407) * Add new connection-string-provider-name parameter * Use template value forms to correctly encode JSON values * Add new development-database-type parameter * Update package template and fix App_Plugins directory rename * Remove conflicting short parameter name * Lowercase framework parameter to align with MS templates * Cleanup default template settings * Write unattended install parameters when either connection string or development database is set * Include RootNamespace in UmbracoPackage template * Update Umbraco specific gitignore rules * Revert "Lowercase framework parameter to align with MS templates" This reverts commit 22de389272a7e119df569ec2e54190265f6d0ae0. * Add exclude-gitignore parameter * Update template schemas * Add minimal-gitignore parameter commite40049dcf1Author: Mole <nikolajlauridsen@protonmail.ch> Date: Wed May 18 15:22:51 2022 +0200 Fix domain for invariant content nodes (#12405) Co-authored-by: Elitsa Marinovska <elm@umbraco.dk> commita3692b887aAuthor: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Date: Mon May 9 11:42:10 2022 +0200 Use SnippetCollection to when working with snippets (#12355) * Introducing a new Snippet type * Adding a SnippetCollection and SnippetCollectionBuilder * Using snippetCollection to get the snippets instead of fileService * Fixed fetching the correct content * Make ISnippet non-discoverable * Split the SnippetCollection into PartialViewSnippetCollection and PartialViewMacroSnippetCollection * Update CodeFileController to use the 2 snippet collections * Display the names with Empty.cshtml on top * Remove merging embedded snippets with custom snippets from ~\Umbraco.Web.UI\umbraco\PartialViewMacros\Templates folder for the Partial View Collection * Fix naming * Fix another naming * Cleanup + Use base items Co-authored-by: Bjarke Berg <mail@bergmania.dk> (cherry picked from commit9326cc5fc6) commit4f48a4937bAuthor: patrickdemooij9 <patrickdemooij98@hotmail.com> Date: Fri Oct 8 11:18:00 2021 +0200 Cherry picked from4c08b44684commit4fdbfee597Author: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com> Date: Wed May 11 00:51:37 2022 +0200 Show nicer overlay when clicking block card for deleted element type (#12140) * Show nicer overlay when clicking block card for deleted element type * Cleanup * Remove stop-scrolling container * Use flex-start instead on start * Remove legacy flexbox fallback * Remove unnecessary hack * Use standard gap property instead * Localization of message * Fix translation * End sentence with a dot (cherry picked from commitebb1dc21a9) commit3856bf8288Author: Henk Jan Pluim <henkjan.pluim@greenchoice.nl> Date: Mon Apr 25 10:02:06 2022 +0200 #fix 12254 return emptyresult (cherry picked from commit7993d19c1b) commit7087c3d9f6Author: Ronald Barendse <ronald@barend.se> Date: Tue May 17 12:59:01 2022 +0200 v10: Use ForceCreateDatabase during unattended install and extend GetUmbracoConnectionString extension methods (#12397) * Add extension methods to get the Umbraco connection string/provider name from configuration * Added tests for configuration extension methods. * Fix issue with InstallMissingDatabase and ForceCreateDatabase * Fix comments * Revert casing change in GenerateConnectionString * Re-add AddOptions (without config binding) to fix test * Update src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs Co-authored-by: Ronald Barendse <ronald@barend.se> * Update src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs * Update src/Umbraco.Infrastructure/Runtime/RuntimeState.cs * Whitespace and documentation updates * Add DatabaseProviderMetadataExtensions * Filter before ordering * Replace DataDirectory placeholder when setting connection string Co-authored-by: Andy Butland <abutland73@gmail.com> Co-authored-by: Bjarke Berg <mail@bergmania.dk> (cherry picked from commit8e6e262c7f) commite90bf26577Author: Ronald Barendse <ronald@barend.se> Date: Tue May 17 07:33:54 2022 +0200 v10: Support System.Data.SqlClient provider name (#12408) * Add support for System.Data.SqlClient provider name * Only update connection string when required (cherry picked from commite82bcb1b76) commitfd0637c96dAuthor: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Date: Mon May 16 14:23:59 2022 +0200 Reintroduce language files tests (#12367) * Reintroducing language files tests * Fix casing * Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> (cherry picked from commit2ed71a64ec)
220 lines
6.7 KiB
C#
220 lines
6.7 KiB
C#
// Copyright (c) Umbraco.
|
|
// See LICENSE for more details.
|
|
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core.Strings.Css;
|
|
using Umbraco.Cms.Tests.Common.Extensions;
|
|
using Umbraco.Extensions;
|
|
|
|
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper
|
|
{
|
|
[TestFixture]
|
|
public class StylesheetHelperTests
|
|
{
|
|
[Test]
|
|
public void Replace_Rule()
|
|
{
|
|
string css = @"body {font-family:Arial;}/** Umb_Name: Test1 */ p { font-size: 1em; } /** umb_name: Test2 */ li {padding:0px;} table {margin:0;}";
|
|
IEnumerable<StylesheetRule> results = StylesheetHelper.ParseRules(css);
|
|
|
|
string result = StylesheetHelper.ReplaceRule(css, results.First().Name, new StylesheetRule()
|
|
{
|
|
Name = "My new rule",
|
|
Selector = "p",
|
|
Styles = "font-size:1em; color:blue;"
|
|
});
|
|
|
|
Assert.AreEqual(
|
|
@"body {font-family:Arial;}/**umb_name:My new rule*/
|
|
p{font-size:1em; color:blue;} /** umb_name: Test2 */ li {padding:0px;} table {margin:0;}".StripWhitespace(), result.StripWhitespace());
|
|
}
|
|
|
|
[Test]
|
|
public void Append_Rule()
|
|
{
|
|
string css = @"body {font-family:Arial;}/** Umb_Name: Test1 */ p { font-size: 1em; } /** umb_name: Test2 */ li {padding:0px;} table {margin:0;}";
|
|
|
|
string result = StylesheetHelper.AppendRule(css, new StylesheetRule()
|
|
{
|
|
Name = "My new rule",
|
|
Selector = "p",
|
|
Styles = "font-size:1em; color:blue;"
|
|
});
|
|
|
|
Assert.AreEqual(
|
|
@"body {font-family:Arial;}/** Umb_Name: Test1 */ p { font-size: 1em; } /** umb_name: Test2 */ li {padding:0px;} table {margin:0;}
|
|
|
|
/**umb_name:My new rule*/
|
|
p{font-size:1em; color:blue;}".StripWhitespace(), result.StripWhitespace());
|
|
}
|
|
|
|
[Test]
|
|
public void Duplicate_Names()
|
|
{
|
|
string css = @"/** Umb_Name: Test */ p { font-size: 1em; } /** umb_name: Test */ li {padding:0px;}";
|
|
IEnumerable<StylesheetRule> results = StylesheetHelper.ParseRules(css);
|
|
Assert.AreEqual(1, results.Count());
|
|
}
|
|
|
|
// Standard rule stle
|
|
[TestCase("Test", "p", "font-size: 1em;", @"/**
|
|
Umb_Name: Test
|
|
*/
|
|
p {
|
|
font-size: 1em;
|
|
}")]
|
|
// All on one line, different casing
|
|
[TestCase("Test", "p", "font-size: 1em;", @"/** Umb_Name: Test */ p { font-size: 1em; }")]
|
|
// styles on several lines
|
|
[TestCase("Test", "p", @"font-size: 1em;
|
|
color:red; font-weight:bold;
|
|
|
|
text-align:left;", @"/** umb_name: Test */ p { font-size: 1em;
|
|
color:red; font-weight:bold;
|
|
|
|
text-align:left;
|
|
|
|
}")]
|
|
// All on one line with no spaces
|
|
[TestCase("Test", "p", "font-size: 1em;", @"/**UMB_NAME:Test*/p{font-size: 1em;}")]
|
|
// Has a name with spaces
|
|
[TestCase("Hello world", "p", "font-size: 1em;", @"/**UMB_NAME:Hello world */p{font-size: 1em;}")]
|
|
// Every part on a new line
|
|
[TestCase("Test", "p", "font-size: 1em;", @"/**
|
|
umb_name:
|
|
Test
|
|
*/
|
|
p
|
|
{
|
|
font-size: 1em;
|
|
}")]
|
|
public void ParseRules_Parses(string name, string selector, string styles, string css)
|
|
{
|
|
// Act
|
|
IEnumerable<StylesheetRule> results = StylesheetHelper.ParseRules(css);
|
|
|
|
// Assert
|
|
Assert.AreEqual(1, results.Count());
|
|
|
|
// Assert.IsTrue(results.First().RuleId.Value.Value.ToString() == file.Id.Value.Value + "/" + name);
|
|
Assert.AreEqual(name, results.First().Name);
|
|
Assert.AreEqual(selector, results.First().Selector);
|
|
Assert.AreEqual(styles.StripWhitespace(), results.First().Styles.StripWhitespace());
|
|
}
|
|
|
|
// No Name: keyword
|
|
[TestCase(@"/** Test2 */
|
|
p
|
|
{
|
|
font-size: 1em;
|
|
}")]
|
|
|
|
// Has a Name: keyword, but applies to 2 rules, so shouldn't parse
|
|
[TestCase(@"/** umb_name: Test2 */
|
|
p, h2
|
|
{
|
|
font-size: 1em;
|
|
}")]
|
|
|
|
// Has it's name wrapping over two lines
|
|
[TestCase("/** umb_name: Test\r\n2 */ p { font-size: 1em; }")]
|
|
[TestCase("/** umb_name: Test\n2 */ p { font-size: 1em; }")]
|
|
|
|
// Only a single asterisk
|
|
[TestCase("/* umb_name: Test */ p { font-size: 1em; }")]
|
|
|
|
// Has a name with spaces over multiple lines
|
|
[TestCase(@"/**UMB_NAME:Hello
|
|
|
|
world */p{font-size: 1em;}")]
|
|
public void ParseRules_DoesntParse(string css)
|
|
{
|
|
// Act
|
|
IEnumerable<StylesheetRule> results = StylesheetHelper.ParseRules(css);
|
|
|
|
// Assert
|
|
Assert.IsTrue(results.Any() == false);
|
|
}
|
|
|
|
[Test]
|
|
public void AppendRules_IsFormatted()
|
|
{
|
|
// base CSS
|
|
string css = Tabbed(
|
|
@"body {
|
|
#font-family:Arial;
|
|
}");
|
|
// add a couple of rules
|
|
string result = StylesheetHelper.AppendRule(css, new StylesheetRule
|
|
{
|
|
Name = "Test",
|
|
Selector = ".test",
|
|
Styles = "font-color: red;margin: 1rem;"
|
|
});
|
|
result = StylesheetHelper.AppendRule(result, new StylesheetRule
|
|
{
|
|
Name = "Test2",
|
|
Selector = ".test2",
|
|
Styles = "font-color: green;"
|
|
});
|
|
|
|
// verify the CSS formatting including the indents
|
|
Assert.AreEqual(
|
|
Tabbed(
|
|
@"body {
|
|
#font-family:Arial;
|
|
}
|
|
|
|
/**umb_name:Test*/
|
|
.test {
|
|
#font-color: red;
|
|
#margin: 1rem;
|
|
}
|
|
|
|
/**umb_name:Test2*/
|
|
.test2 {
|
|
#font-color: green;
|
|
}").NormalizeNewLines(), result.NormalizeNewLines());
|
|
}
|
|
|
|
[Test]
|
|
public void ParseFormattedRules_CanParse()
|
|
{
|
|
// base CSS
|
|
string css = Tabbed(
|
|
@"body {
|
|
#font-family:Arial;
|
|
}
|
|
|
|
/**umb_name:Test*/
|
|
.test {
|
|
#font-color: red;
|
|
#margin: 1rem;
|
|
}
|
|
|
|
/**umb_name:Test2*/
|
|
.test2 {
|
|
#font-color: green;
|
|
}");
|
|
IEnumerable<StylesheetRule> rules = StylesheetHelper.ParseRules(css);
|
|
Assert.AreEqual(2, rules.Count());
|
|
|
|
Assert.AreEqual("Test", rules.First().Name);
|
|
Assert.AreEqual(".test", rules.First().Selector);
|
|
Assert.AreEqual(
|
|
@"font-color: red;
|
|
margin: 1rem;".NormalizeNewLines(), rules.First().Styles.NormalizeNewLines());
|
|
|
|
Assert.AreEqual("Test2", rules.Last().Name);
|
|
Assert.AreEqual(".test2", rules.Last().Selector);
|
|
Assert.AreEqual("font-color: green;", rules.Last().Styles);
|
|
}
|
|
|
|
// can't put tabs in verbatim strings, so this will replace # with \t to test the CSS indents
|
|
// - and it's tabs because the editor uses tabs, not spaces...
|
|
private static string Tabbed(string input) => input.Replace("#", "\t");
|
|
}
|
|
}
|