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

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-files-after-umbraco-context-abstractions

Browse Source 
# Conflicts:
#	src/Umbraco.Abstractions/PublishedContentExtensions.cs
#	src/Umbraco.Abstractions/Routing/AliasUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/DefaultMediaUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/UrlProvider.cs
#	src/Umbraco.Abstractions/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
#	src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
#	src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
#	src/Umbraco.Tests/Routing/UrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
#	src/Umbraco.Tests/TestHelpers/TestHelper.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
#	src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
#	src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/UmbracoContext.cs
#	src/Umbraco.Web/UmbracoContextFactory.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
This commit is contained in:
Bjarke Berg
2020-02-17 12:45:37 +01:00
parent e7e4dc8441 2b8be2cf00
commit aeca49dddb
62 changed files with 222 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Tests/Web/WebExtensionMethodTests.cs
View File

@@ -35,7 +35,8 @@ namespace Umbraco.Tests.Web
new WebSecurity(httpContextAccessor, Current.Services.UserService, TestObjects.GetGlobalSettings(), IOHelper),
TestObjects.GetGlobalSettings(),
new TestVariationContextAccessor(),
IOHelper);
IOHelper,
UriUtility);
var r1 = new RouteData();
r1.DataTokens.Add(Core.Constants.Web.UmbracoContextDataToken, umbCtx);
@@ -54,7 +55,8 @@ namespace Umbraco.Tests.Web
new WebSecurity(httpContextAccessor, Current.Services.UserService, TestObjects.GetGlobalSettings(), IOHelper),
TestObjects.GetGlobalSettings(),
new TestVariationContextAccessor(),
IOHelper);
IOHelper,
UriUtility);
var r1 = new RouteData();
r1.DataTokens.Add(Core.Constants.Web.UmbracoContextDataToken, umbCtx);
@@ -83,7 +85,8 @@ namespace Umbraco.Tests.Web
new WebSecurity(httpContextAccessor, Current.Services.UserService, TestObjects.GetGlobalSettings(), IOHelper),
TestObjects.GetGlobalSettings(),
new TestVariationContextAccessor(),
IOHelper);
IOHelper,
UriUtility);
var httpContext = Mock.Of<HttpContextBase>();