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

Merge branch 'temp8-tree-sections-no-more-xml' into temp8

Browse Source
This commit is contained in:
Stephan
2019-01-18 10:59:04 +01:00
parent cee1171d39 437385fd61
commit 07238b54e1
96 changed files with 927 additions and 3058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Tests/Testing/UmbracoTestBase.cs
View File

@@ -40,6 +40,7 @@ using Umbraco.Web.Composing.Composers;
using Umbraco.Web.ContentApps;
using Current = Umbraco.Core.Composing.Current;
using Umbraco.Web.Routing;
using Umbraco.Web.Trees;
namespace Umbraco.Tests.Testing
{
@@ -216,6 +217,16 @@ namespace Umbraco.Tests.Testing
Composition.WithCollectionBuilder<ContentFinderCollectionBuilder>();
Composition.RegisterUnique<IContentLastChanceFinder, TestLastChanceFinder>();
Composition.RegisterUnique<IVariationContextAccessor, TestVariationContextAccessor>();
// register back office sections in the order we want them rendered
Composition.WithCollectionBuilder<BackOfficeSectionCollectionBuilder>().Append<ContentBackOfficeSection>()
.Append<MediaBackOfficeSection>()
.Append<SettingsBackOfficeSection>()
.Append<PackagesBackOfficeSection>()
.Append<UsersBackOfficeSection>()
.Append<MembersBackOfficeSection>()
.Append<TranslationBackOfficeSection>();
Composition.RegisterUnique<ISectionService, SectionService>();
}
protected virtual void ComposeWtf()
@@ -341,7 +352,7 @@ namespace Umbraco.Tests.Testing
Composition.ComposeServices();
// composition root is doing weird things, fix
Composition.RegisterUnique<IApplicationTreeService, ApplicationTreeService>();
Composition.RegisterUnique<ITreeService, TreeService>();
Composition.RegisterUnique<ISectionService, SectionService>();
// somehow property editor ends up wanting this