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

oops fixes build

Browse Source
This commit is contained in:
Shannon
2020-03-13 12:47:09 +11:00
parent 94c9057119
commit 6fafe0408d
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
View File

@@ -69,7 +69,7 @@ namespace Umbraco.Tests.Routing
var umbracoApiControllerTypes = new UmbracoApiControllerTypeCollection(Composition.TypeLoader.GetUmbracoApiControllers());
Composition.RegisterUnique(umbracoApiControllerTypes);
Composition.RegisterUnique<IShortStringHelper>(_ => new DefaultShortStringHelper(SettingsForTests.GenerateMockRequestHandlerSettings()));
Composition.RegisterUnique<IShortStringHelper>(_ => new DefaultShortStringHelper(TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings()));
}
public override void TearDown()

20
src/Umbraco.Tests/Routing/UrlProviderTests.cs
View File

@@ -34,8 +34,8 @@ namespace Umbraco.Tests.Routing
protected override void ComposeSettings()
{
Composition.Configs.Add(SettingsForTests.GenerateMockContentSettings);
Composition.Configs.Add(SettingsForTests.GenerateMockGlobalSettings);
Composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockContentSettings);
Composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockGlobalSettings);
}
/// <summary>
@@ -48,7 +48,7 @@ namespace Umbraco.Tests.Routing
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings.Object);
var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
@@ -123,7 +123,7 @@ namespace Umbraco.Tests.Routing
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings.Object);
@@ -152,7 +152,7 @@ namespace Umbraco.Tests.Routing
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(true);
var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings.Object);
var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
var urlProvider = new DefaultUrlProvider(requestHandlerSettings, Logger, globalSettings.Object,
@@ -171,7 +171,7 @@ namespace Umbraco.Tests.Routing
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
@@ -219,7 +219,7 @@ namespace Umbraco.Tests.Routing
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
var publishedContent = new SolidPublishedContent(contentType) { Id = 1234 };
@@ -275,7 +275,7 @@ namespace Umbraco.Tests.Routing
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
var publishedContent = new SolidPublishedContent(contentType) { Id = 1234 };
@@ -326,7 +326,7 @@ namespace Umbraco.Tests.Routing
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var umbracoContext = GetUmbracoContext("http://example.com/test", 1111, globalSettings: globalSettings.Object);
@@ -347,7 +347,7 @@ namespace Umbraco.Tests.Routing
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var urlProvider = new DefaultUrlProvider(requestHandlerSettings, Logger, globalSettings.Object,
new SiteDomainHelper(), UmbracoContextAccessor, UriUtility);

14
src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
View File

@@ -178,7 +178,7 @@ namespace Umbraco.Tests.Routing
[TestCase(10011, "https://domain1.com", false, "/1001-1/")]
public void Get_Url_SimpleDomain(int nodeId, string currentUrl, bool absolute, string expected)
{
var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -212,7 +212,7 @@ namespace Umbraco.Tests.Routing
[TestCase(10011, "https://domain1.com", false, "http://domain1.com/foo/1001-1/")]
public void Get_Url_SimpleWithSchemeAndPath(int nodeId, string currentUrl, bool absolute, string expected)
{
var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -238,7 +238,7 @@ namespace Umbraco.Tests.Routing
[TestCase(1002, "http://domain1.com", false, "/1002/")]
public void Get_Url_DeepDomain(int nodeId, string currentUrl, bool absolute, string expected)
{
var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -270,7 +270,7 @@ namespace Umbraco.Tests.Routing
[TestCase(100321, "http://domain3.com", false, "/fr/1003-2-1/")]
public void Get_Url_NestedDomains(int nodeId, string currentUrl, bool absolute, string expected)
{
var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -292,7 +292,7 @@ namespace Umbraco.Tests.Routing
[Test]
public void Get_Url_DomainsAndCache()
{
var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -356,7 +356,7 @@ namespace Umbraco.Tests.Routing
[Test]
public void Get_Url_Relative_Or_Absolute()
{
var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -381,7 +381,7 @@ namespace Umbraco.Tests.Routing
[Test]
public void Get_Url_Alternate()
{
var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains

2
src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
View File

@@ -36,7 +36,7 @@ namespace Umbraco.Tests.Routing
var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
SetDomains1();