Merge branch origin/temp8 into temp8-di2690

This commit is contained in:
Stephan
2018-12-21 10:58:38 +01:00
126 changed files with 1327 additions and 978 deletions

View File

@@ -79,7 +79,7 @@ namespace Umbraco.Tests.Web.Controllers
});
var textService = new Mock<ILocalizedTextService>();
textService.Setup(x => x.Localize(It.IsAny<string>(), It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns("");
textService.Setup(x => x.Localize(It.IsAny<string>(), It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns("text");
Composition.RegisterUnique(f => Mock.Of<IContentService>());
Composition.RegisterUnique(f => userServiceMock.Object);