Fix StandaloneTests

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -39,6 +39,8 @@
                 <dependency id="Serilog.Formatting.Compact.Reader" version="[1.0.3,1.999999)" />
                 <dependency id="Serilog.Settings.AppSettings" version="[2.2.2,2.999999)" />
                 <dependency id="Serilog.Sinks.File" version="[4.0.0,4.999999)" />
+                <dependency id="Serilog.Sinks.Map" version="[1.0.0,1.999999)" />
+                <dependency id="Serilog.Sinks.Async" version="[1.3.0,1.999999)" />
                 <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
                 <dependency id="NPoco" version="[3.9.4,3.999999)" />
             </group>

src/Umbraco.Tests/Runtimes/StandaloneTests.cs

@@ -29,6 +29,7 @@ using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Cache;
+using Umbraco.Web.Macros;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Runtime;
@@ -81,7 +82,7 @@ namespace Umbraco.Tests.Runtimes
 
             var composerTypes = typeLoader.GetTypes<IComposer>() // all of them
                 .Where(x => !x.FullName.StartsWith("Umbraco.Tests.")) // exclude test components
-                .Where(x => x != typeof(WebInitialComposer)); // exclude web runtime
+                .Where(x => x != typeof(WebInitialComposer) && x != typeof(WebFinalComposer)); // exclude web runtime
             var composers = new Composers(composition, composerTypes, profilingLogger);
             composers.Compose();
 
@@ -101,6 +102,8 @@ namespace Umbraco.Tests.Runtimes
             composition.RegisterUnique<IDistributedCacheBinder, DistributedCacheBinder>();
             composition.RegisterUnique<IExamineManager>(f => ExamineManager.Instance);
             composition.RegisterUnique<IUmbracoContextFactory, UmbracoContextFactory>();
+            composition.RegisterUnique<IMacroRenderer, MacroRenderer>();
+            composition.RegisterUnique<MediaUrlProviderCollection>(_ => new MediaUrlProviderCollection(Enumerable.Empty<IMediaUrlProvider>()));
 
             // initialize some components only/individually
             composition.WithCollectionBuilder<ComponentCollectionBuilder>()
@@ -124,14 +127,15 @@ namespace Umbraco.Tests.Runtimes
             if (true || runtimeState.Level == RuntimeLevel.Install)
             {
                 var path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-                var file = Path.Combine(path, "Umbraco.sdf");
+                var file = databaseFactory.Configured ? Path.Combine(path, "UmbracoNPocoTests.sdf") : Path.Combine(path, "Umbraco.sdf");
                 if (File.Exists(file))
                     File.Delete(file);
 
                 // create the database file
                 // databaseBuilder.ConfigureEmbeddedDatabaseConnection() can do it too,
                 // but then it wants to write the connection string to web.config = bad
-                using (var engine = new SqlCeEngine("Data Source=|DataDirectory|\\Umbraco.sdf;Flush Interval=1;"))
+                var connectionString = databaseFactory.Configured ? databaseFactory.ConnectionString : "Data Source=|DataDirectory|\\Umbraco.sdf;Flush Interval=1;";
+                using (var engine = new SqlCeEngine(connectionString))
                 {
                     engine.CreateDatabase();
                 }
@@ -140,7 +144,8 @@ namespace Umbraco.Tests.Runtimes
                 //databaseFactory.Configure(DatabaseBuilder.EmbeddedDatabaseConnectionString, Constants.DbProviderNames.SqlCe);
                 //databaseBuilder.CreateDatabaseSchemaAndData();
 
-                databaseFactory.Configure(DatabaseBuilder.EmbeddedDatabaseConnectionString, Constants.DbProviderNames.SqlCe);
+                if (!databaseFactory.Configured)
+                    databaseFactory.Configure(DatabaseBuilder.EmbeddedDatabaseConnectionString, Constants.DbProviderNames.SqlCe);
 
                 var scopeProvider = factory.GetInstance<IScopeProvider>();
                 using (var scope = scopeProvider.CreateScope())
@@ -154,6 +159,8 @@ namespace Umbraco.Tests.Runtimes
             // done installing
             runtimeState.Level = RuntimeLevel.Run;
 
+            components.Initialize();
+
             // instantiate to register events
             // should be done by Initialize?
             // should we invoke Initialize?

src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js

@@ -61,9 +61,9 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * @name umbraco.services.clipboardService#copy
     * @methodOf umbraco.services.clipboardService
     *
-    * @param type {string} umbraco A string defining the type of data to storing, example: 'elementType', 'contentNode'
-    * @param alias {string} umbraco A string defining the alias of the data to store, example: 'product'
-    * @param data {object} umbraco A object containing the properties to be saved.
+    * @param {string} type A string defining the type of data to storing, example: 'elementType', 'contentNode'
+    * @param {string} alias A string defining the alias of the data to store, example: 'product'
+    * @param {object} data A object containing the properties to be saved.
     *
     * @description
     * Saves a single JS-object with a type and alias to the clipboard.
@@ -114,8 +114,8 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * @name umbraco.services.supportsCopy#hasEntriesOfType
     * @methodOf umbraco.services.clipboardService
     *
-    * @param type {string} umbraco A string defining the type of data test for.
-    * @param aliases {string} umbraco A array of strings providing the alias of the data you want to test for.
+    * @param {string} type A string defining the type of data test for.
+    * @param {string} aliases A array of strings providing the alias of the data you want to test for.
     *
     * @description
     * Determines whether the current clipboard has entries that match a given type and one of the aliases.
@@ -134,8 +134,8 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * @name umbraco.services.supportsCopy#retriveEntriesOfType
     * @methodOf umbraco.services.clipboardService
     *
-    * @param type {string} umbraco A string defining the type of data to recive.
-    * @param aliases {string} umbraco A array of strings providing the alias of the data you want to recive.
+    * @param {string} type A string defining the type of data to recive.
+    * @param {string} aliases A array of strings providing the alias of the data you want to recive.
     * 
     * @description
     * Returns an array of entries matching the given type and one of the provided aliases.
@@ -159,8 +159,8 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * @name umbraco.services.supportsCopy#retriveEntriesOfType
     * @methodOf umbraco.services.clipboardService
     *
-    * @param type {string} umbraco A string defining the type of data to recive.
-    * @param aliases {string} umbraco A array of strings providing the alias of the data you want to recive.
+    * @param {string} type A string defining the type of data to recive.
+    * @param {string} aliases A array of strings providing the alias of the data you want to recive.
     * 
     * @description
     * Returns an array of data of entries matching the given type and one of the provided aliases.
@@ -174,8 +174,8 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     * @name umbraco.services.supportsCopy#retriveEntriesOfType
     * @methodOf umbraco.services.clipboardService
     *
-    * @param type {string} umbraco A string defining the type of data to remove.
-    * @param aliases {string} umbraco A array of strings providing the alias of the data you want to remove.
+    * @param {string} type A string defining the type of data to remove.
+    * @param {string} aliases A array of strings providing the alias of the data you want to remove.
     * 
     * @description
     * Removes entries matching the given type and one of the provided aliases.

src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html

@@ -30,7 +30,7 @@
         </li>
     </ul>
 
-    <div class="umb-overlay__section-header" ng-if="::(model.pasteItems | filter:searchTerm).length > 0">
+    <div class="umb-overlay__section-header" ng-if="model.pasteItems.length > 0 && (model.availableItems | filter:searchTerm).length > 0">
         <h5><localize key="content_createEmpty">Create new</localize></h5>
     </div>