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

Fixing tests - ValueListPreValueEditor

Browse Source
This commit is contained in:
Stephan
2016-04-20 14:06:13 +02:00
parent b04e070757
commit 7e8b4d13a7
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs
View File

@@ -1,10 +1,21 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
using System.Linq;
using Moq;
using NUnit.Framework;
using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Models;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.SqlSyntax;
using Umbraco.Core.Persistence.UnitOfWork;
using Umbraco.Core.Profiling;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Publishing;
using Umbraco.Core.Services;
using Umbraco.Core.Strings;
using Umbraco.Web.PropertyEditors;
namespace Umbraco.Tests.PropertyEditors
@@ -88,6 +99,22 @@ namespace Umbraco.Tests.PropertyEditors
[Test]
public void DropDownPreValueEditor_Format_Data_For_Editor()
{
// editor wants ApplicationContext.Current.Services.TextService
// (that should be fixed with proper injection)
var logger = Mock.Of<ILogger>();
var textService = new Mock<ILocalizedTextService>();
textService.Setup(x => x.Localize(It.IsAny<string>(), It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns("blah");
var appContext = new ApplicationContext(
new DatabaseContext(Mock.Of<IDatabaseFactory>(), logger, new SqlSyntaxProviders(Enumerable.Empty<ISqlSyntaxProvider>())),
new ServiceContext(
localizedTextService: textService.Object
),
Mock.Of<CacheHelper>(),
new ProfilingLogger(logger, Mock.Of<IProfiler>()))
{
IsReady = true
};
ApplicationContext.Current = appContext;
var defaultVals = new Dictionary<string, object>();
var persisted = new PreValueCollection(new Dictionary<string, PreValue>

2
src/Umbraco.Web/PropertyEditors/ValueListPreValueEditor.cs
View File

@@ -46,7 +46,7 @@ namespace Umbraco.Web.PropertyEditors
//It's also important to note that by default the dropdown angular controller is expecting the
// config options to come in with a property called 'items'
Key = "items",
Name = ApplicationContext.Current.Services.TextService.Localize("editdatatype/addPrevalue"),
Name = ApplicationContext.Current.Services.TextService.Localize("editdatatype/addPrevalue"), // todo: inject
View = "multivalues"
}
};