yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,969 Commits 4 Branches 7 Tags
507facbdaac59bbf7cdfa8bbca6a9f6bf8789804
Commit Graph

69 Commits

Author SHA1 Message Date
Paul Johnson
a99f625f6a Netcore: Alternate approach for MSDI refactor (#9247) 
* Doesn't make much sense to have Concrete on IRegister, only on IFactory

* Handle FilesTreeController requires IFileSystem of type PhysicalFileSystem

* Handle registration of default MediaFileSystem without using RegisterUniqueFor

* Remove RegisterFor / RegisterUniqueFor from IRegister

* Switch over from LightInject to wrappers around MSDI

* Made mapper dependencies more explicit

* Remove registration for AngularJsonMediaTypeFormatter

It's dependencies aren't registered so container validation fails

* Resolve lifetime issue for EnsureValidSessionId by service locating

else resolve scoped in singleton

* Make registration more explicit for backoffice UserManager

* Make install step registrations more explicit

* Disable service provider validation so site can launch

Maybe this is a problem maybe not, we build about 8000 service providers so maybe everything is fine later...

* Further cleanup of IFactory interface

* Further cleanup of IRegister interface

* Revert "Make registration more explicit for backoffice UserManager"

This reverts commit 7215fe836103c597cd0873c66737a79b91ed4c49.

* Resolve issue where NewInstallStep would fail to reset password for "SuperUser"

Before MSDI, somehow BackOfficeIdentityOptions would be configured with token provider map from IdentityBuilder.AddDefaultTokenProviders.
After switchover those config actions are lost.

Subclass IdentityBuilder to ensure BackOfficeIdentityOptions doesn't miss config setup upstream.

* Initialize current.

* Add todo to turn container validation back on.

* Migrated ScopeFileSystemsTests to integration tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Resolve issue where MediaFileSystem was skipping ShadowFileSystem

* Attempt to fix ScopeFileSystemsTests on azure devops

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Be interesting to know what the actual full path is in pipeline.

* Clarify intent of CreateMediaTest

Doesn't help resolve weird UnauthorizedAccessException but it cuts so much cognitive overhead for the future.

* Use ILoggerfactory rather than mock for the manually constructed file PhysicalFileSystem

* Maybe resolve failing test on azure pipeline.

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-26 11:47:14 +01:00
Bjarke Berg
5ecc2676e3 Migrated ThreadSafetyServiceTest.cs 2020-10-21 13:54:22 +02:00
Bjarke Berg
d74ec6e130 Changed default test setting to Boot=false 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-16 07:08:50 +02:00
Bjarke Berg
76f87a1243 Clean up 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-14 08:30:45 +02:00
Andy Butland
ef962b6934 Migrated ContentServiceTests. 2020-10-11 22:31:54 +02:00
Andy Butland
a331e6db30 Removed Mocked entity static helpers from new test projects, so they are only used for legacy tests. 
Created equivalent methods as static builder methods, that use the builders to construct the model objects.
 2020-10-07 11:28:09 +02:00
Bjarke Berg
3551d6e65e Clean up and fixed todos 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-06 21:23:15 +02:00
Bjarke Berg
18828951a6 Clean up 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-06 20:04:13 +02:00
Bjarke Berg
baf2aaecab Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Tests.Integration/Packaging/CreatedPackagesRepositoryTests.cs
#	src/Umbraco.Tests.Integration/Services/CachedDataTypeServiceTests.cs
#	src/Umbraco.Tests.Integration/Services/DataTypeServiceTests.cs
#	src/Umbraco.Tests.Integration/Services/MacroServiceTests.cs
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/LocalizedTextServiceTests.cs
 2020-10-06 18:49:03 +02:00
Bjarke Berg
170aaa47a9 Changed the way we setup logging in integration tests, to respect the test option attribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-06 18:43:07 +02:00
Mole
c7aad452ee Clean 2020-10-06 14:16:29 +02:00
Mole
7a8a7104c7 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
 2020-10-06 08:13:29 +02:00
Bjarke Berg
471903b793 Introduced NoopServerMessenger for integration tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-05 16:59:26 +02:00
Mole
696c65222f Fix migration and clear caches 2020-10-05 15:04:41 +02:00
Mole
dd2ff6602e Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/8518-migrate-tests 2020-10-05 13:34:00 +02:00
Mole
c97375d478 Migrate ContentServicePublishBranchTests 2020-10-05 13:33:39 +02:00
Bjarke Berg
375a85903f Changed the UmbracoIntegrationTest setup to be sync, to avoid issue with AsyncLocal 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-05 10:02:11 +02:00
Mole
8404ae63c0 Change HasSchema to CanAttachSchema in LocalDbTestDatabase 
It's more indicative of what it's actually checking for.
 2020-10-05 08:13:52 +02:00
Mole
ca2ec63dd6 Re-configure current factory in NewSchemaPerFixture like in NewSchemaPerTest 2020-10-02 14:35:24 +02:00
Mole
e4dd5abd3e Fix NewSchemaPerFixture 
I don't know if this is a hacky fix, someone might have to take a look at it
 2020-10-02 14:16:36 +02:00
Mole
cbdb96dfe6 Add SignalR in integration tests 2020-09-30 14:27:18 +02:00
Mole
0e737c0903 Use a SiriLogger that logs to console in UmbracoIntegrationTest 
AFAIK ConsoleLoggerFactory gets disposed when host is disposed causing all tests but the ones from the first test fixture to fail. As far as I'm aware it's not possible to make it not dispose ConsoleLoggerFactory, however it is possible with Sirilog
 2020-09-23 15:37:19 +02:00
Mole
75608919cd Merge pull request #8925 from umbraco/netcore/feature/use-serilog-to-log-all-messages 
Netcore: Use serilog to log all messages and use appsettings as config
 2020-09-23 09:37:43 +02:00
Bjarke Berg
f413f279eb Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
#	src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
#	src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
#	src/Umbraco.Tests.Integration/Persistence/Repositories/TemplateRepositoryTest.cs
#	src/Umbraco.Tests.Integration/RuntimeTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs
#	src/Umbraco.Tests/Components/ComponentTests.cs
#	src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
#	src/Umbraco.Tests/Models/VariationTests.cs
#	src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs
#	src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs
#	src/Umbraco.Tests/Published/ConvertersTests.cs
#	src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
#	src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
#	src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs
#	src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
#	src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
#	src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
#	src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
#	src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
#	src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
 2020-09-23 07:59:10 +02:00
Bjarke Berg
25c7418d66 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-validation 
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs
#	src/Umbraco.Tests/Models/MediaXmlTest.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
#	src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
 2020-09-22 20:25:28 +02:00
Mole
438515fa66 Merge Netcore: Use serilog to log all messages and use appsettings as config into Netcore/feature/migrate logging 2020-09-22 15:09:16 +02:00
Mole
c0616d516a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging 
# Conflicts:
#	src/Umbraco.Infrastructure/Scheduling/ScheduledPublishing.cs
#	src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
#	src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MacrosController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PackageInstallController.cs
#	src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Filters/ContentModelValidator.cs
#	src/Umbraco.Web.BackOffice/Filters/ContentSaveModelValidator.cs
#	src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs
#	src/Umbraco.Web.BackOffice/Filters/MediaItemSaveValidationAttribute.cs
#	src/Umbraco.Web.BackOffice/Filters/MediaSaveModelValidator.cs
#	src/Umbraco.Web.BackOffice/Filters/MemberSaveModelValidator.cs
#	src/Umbraco.Web.BackOffice/Filters/MemberSaveValidationAttribute.cs
#	src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
#	src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs
#	src/Umbraco.Web.Common/Install/InstallController.cs
 2020-09-22 13:44:22 +02:00
Mole
b7cbbf8c28 Use ConfigureLogging instead of trying to add logging manually 2020-09-22 13:00:39 +02:00
Mole
dae7f0a1a7 Register logging ASAP in UmbracoIntegrationTest pretty much everything needs it 2020-09-22 10:15:45 +02:00
Bjarke Berg
96facc4d35 Netcore: Introduce BackofficeSecurityAccessor (#8871) 
* Introduced IWebSecurityAccessor

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Fixed tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Renamed WebSecurity to BackofficeSecurity and all related names

* Fixes typos

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-09-22 10:01:00 +02:00
Andy Butland
1bd22d72c2 Removed configuration model builders. 2020-09-21 21:06:24 +02:00
Mole
d61b9f54fa Merge options 2020-09-18 12:53:06 +02:00
berg
f11391961f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/use-serilog-to-log-all-messages 
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web/UmbracoApplicationBase.cs
 2020-09-18 08:31:09 +02:00
Nikolaj
c89659c597 Use MS ILogger in database stuff 2020-09-17 12:52:25 +02:00
Nikolaj
ecb4831855 Apply repository related fixes to tests 2020-09-17 10:35:11 +02:00
Bjarke Berg
7d3bc9be1c Moved serilog config to appsettings and configured it to also catch MS logging messages. 
Added Console log for Development
 2020-09-17 09:01:10 +02:00
Nikolaj
633d42039e Fix a whole bunch of other errors 2020-09-15 15:14:44 +02:00
Nikolaj
0238d6eb02 Start using LoggerFactory 2020-09-15 12:40:35 +02:00
Nikolaj
90a16f49c7 Fix up some tests 2020-09-15 10:03:56 +02:00
Nikolaj
b8c60d1666 Refactor Fatal with simple message 2020-09-14 11:23:17 +02:00
Bjarke Berg
2eee6d7386 Removed some of the old legacy configs 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-11 21:13:18 +02:00
Bjarke Berg
e079bd5a50 Cleanup usages of Configs 2020-09-08 13:03:43 +02:00
Bjarke Berg
c8669b18c2 Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-04 14:30:48 +02:00
Shannon
7c78b5b34f Updates CoreRuntime with better dependencies so we can disable caches, fixes integration test to run multiple callbacks registered for TearDown, ensure we TearDown the runtime. 2020-09-04 00:27:43 +10:00
Shannon
f84a93ae20 Adds IUmbracoBuilder to build the config so it's easier to split apart, ensures background tasks don't run in integration tests, uses a custom CoreRuntime to ensure we use SimpleMainDom, re-wires the UmbracoWebApplicationFactory so that duplicate Hosts are not running at the same time, fixes issues with overriding/shadowing, uses RAMDirectory in lucene for tests, fixes CoreRuntime's events that we're moved incorrectly and not backwards compat, adds new real non static events which we can use in integration tests to install the DB before the runtime state is calculated 2020-09-02 18:10:29 +10:00
Andy Butland
adf687579c Restored Umbraco.Tests.IntegrationTests (some failures remaining) 2020-08-24 12:34:37 +02:00
Bjarke Berg
aac8cd5423 Clean up + migrated AuditServiceTests 2020-07-01 17:42:39 +02:00
Bjarke Berg
7b546e6cee Attempts to fix issue 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-30 20:11:39 +02:00
Bjarke Berg
3a33e7bf29 Migrated ControllerContentTests.. Right now the test fails, but the test is correct 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-17 16:39:28 +02:00
Bjarke Berg
835b04273f Migrated remaining *TreeController's 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-10 19:22:25 +02:00