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

Fixing tests, fixes PublishingStrategy to hvae the scope provider passed in

Browse Source
This commit is contained in:
Shannon
2017-02-07 14:40:45 +11:00
parent 3fa7c4d7ef
commit e58d9a9535
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Core/Publishing/PublishingStrategy.cs
View File

@@ -31,7 +31,17 @@ namespace Umbraco.Core.Publishing
{
if (eventMessagesFactory == null) throw new ArgumentNullException("eventMessagesFactory");
if (logger == null) throw new ArgumentNullException("logger");
_scopeProvider = new ScopeProvider(new DefaultDatabaseFactory(Constants.System.UmbracoConnectionName, LoggerResolver.Current.Logger));
_scopeProvider = new ScopeProvider(new DefaultDatabaseFactory(Constants.System.UmbracoConnectionName, logger));
_eventMessagesFactory = eventMessagesFactory;
_logger = logger;
}
[EditorBrowsable(EditorBrowsableState.Never)]
public PublishingStrategy(IScopeProvider scopeProvider, IEventMessagesFactory eventMessagesFactory, ILogger logger)
{
if (eventMessagesFactory == null) throw new ArgumentNullException("eventMessagesFactory");
if (logger == null) throw new ArgumentNullException("logger");
_scopeProvider = scopeProvider;
_eventMessagesFactory = eventMessagesFactory;
_logger = logger;
}

2
src/Umbraco.Core/Services/ContentService.cs
View File

@@ -48,7 +48,7 @@ namespace Umbraco.Core.Services
{
if (dataTypeService == null) throw new ArgumentNullException("dataTypeService");
if (userService == null) throw new ArgumentNullException("userService");
_publishingStrategy = new PublishingStrategy(eventMessagesFactory, logger);
_publishingStrategy = new PublishingStrategy(UowProvider.ScopeProvider, eventMessagesFactory, logger);
_dataTypeService = dataTypeService;
_userService = userService;
}

9
src/Umbraco.Tests/Publishing/PublishingStrategyTests.cs
View File

@@ -17,6 +17,7 @@ using umbraco.interfaces;
using System.Linq;
using Moq;
using Umbraco.Core.Persistence.UnitOfWork;
using Umbraco.Core.Scoping;
namespace Umbraco.Tests.Publishing
{
@@ -70,7 +71,7 @@ namespace Umbraco.Tests.Publishing
ServiceContext.ContentTypeService.GetContentType("umbTextpage"), "Sub Sub Sub", mandatorContent.Id);
ServiceContext.ContentService.Save(subContent, 0);
IPublishingStrategy2 strategy = new PublishingStrategy(new TransientMessagesFactory(), Logger);
IPublishingStrategy2 strategy = new PublishingStrategy(DatabaseContext.ScopeProvider, new TransientMessagesFactory(), Logger);
//publish root and nodes at it's children level
var listToPublish = ServiceContext.ContentService.GetDescendants(_homePage.Id).Concat(new[] { _homePage });
@@ -97,7 +98,7 @@ namespace Umbraco.Tests.Publishing
{
CreateTestData();
IPublishingStrategy2 strategy = new PublishingStrategy(new TransientMessagesFactory(), Logger);
IPublishingStrategy2 strategy = new PublishingStrategy(DatabaseContext.ScopeProvider, new TransientMessagesFactory(), Logger);
PublishingStrategy.Publishing +=PublishingStrategyPublishing;
@@ -124,7 +125,7 @@ namespace Umbraco.Tests.Publishing
{
CreateTestData();
IPublishingStrategy2 strategy = new PublishingStrategy(new TransientMessagesFactory(), Logger);
IPublishingStrategy2 strategy = new PublishingStrategy(DatabaseContext.ScopeProvider, new TransientMessagesFactory(), Logger);
//publish root and nodes at it's children level
var result1 = strategy.Publish(_unitOfWork, _homePage, 0);
@@ -151,7 +152,7 @@ namespace Umbraco.Tests.Publishing
{
CreateTestData();
IPublishingStrategy2 strategy = new PublishingStrategy(new TransientMessagesFactory(), Logger);
IPublishingStrategy2 strategy = new PublishingStrategy(DatabaseContext.ScopeProvider, new TransientMessagesFactory(), Logger);
//publish root and nodes at it's children level
var result1 = strategy.Publish(_unitOfWork, _homePage, 0);