yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,287 Commits 4 Branches 7 Tags
b0b1de9972f64d7220feaf0a4a34f513fc93317e
Commit Graph

204 Commits

Author SHA1 Message Date
Bjarke Berg
5a4a3c760d Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/net5 2021-01-26 08:09:33 +01:00
Bjarke Berg
c79b31ed2e Changed remaining background jobs to be either hosted services or real fire and forget + Cleanup + moved classes to the legacy test project, that is only needed there. (#9700) 2021-01-25 09:26:38 +01:00
Bjarke Berg
e38972abf0 Updated to net5.0 and updated most nuget packages. Also fixed the nuspec files. + Fix typo Persistance => Persistence. 2021-01-20 21:01:45 +01:00
Bjarke Berg
a54e10bc13 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/merge-v8-18-01-2021 
# Conflicts:
#	.gitignore
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/IO/SystemFiles.cs
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
#	src/Umbraco.Core/RuntimeOptions.cs
#	src/Umbraco.Core/RuntimeState.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComponent.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComposer.cs
#	src/Umbraco.Examine/Umbraco.Examine.csproj
#	src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
#	src/Umbraco.Infrastructure/Install/InstallStepCollection.cs
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
#	src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/TestDatabase.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
#	src/Umbraco.Web.UI.NetCore/Views/Partials/Grid/Editors/TextString.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
#	src/Umbraco.Web/Editors/PreviewController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/JavaScript/PreviewInitialize.js
#	src/Umbraco.Web/Telemetry/TelemetryComponent.cs
#	src/Umbraco.Web/UmbracoApplication.cs
 2021-01-18 16:06:23 +01:00
Bjarke Berg
16ef520e8c Merge remote-tracking branch 'origin/netcore/netcore' into feature/clean-up-umbraco-tests-common 
# Conflicts:
#	src/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs
 2021-01-18 06:44:01 +01:00
Shannon
d1df6c4719 less allocations with AbsolutePathDecoded. removes more aspx checks, adds UmbracoRouteValueTransformerTests, adds interface for IRoutableDocumentFilter 2021-01-13 11:08:48 +11:00
Shannon
534b74dda5 Changes CustomTestSetup to just be a normal method, not sure why it was an action, fixes ContentEventsTests which requires NuCache 2020-12-23 13:57:41 +11:00
Andy Butland
14f81c692c Adhered code to linting rules in Umbraco.Tests.Common. 2020-12-19 08:17:35 +01:00
Nikolaj
7ef6501bb1 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/more-files-from-infrastructure-to-core 
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs
 2020-12-09 08:45:28 +01:00
Bjarke Berg
40a6fa2b89 NetCore: Migrate more tests (#9494) 
* Migrate tests

* Cleanup

* Migrate tests

* post merge fix

Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-12-08 09:19:51 +01:00
Shannon
ea55d2662e no app_data paths, changing to constants, some linting updates 2020-12-08 10:42:26 +11:00
Bjarke Berg
e7d9d38c52 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/more-files-from-infrastructure-to-core 
# Conflicts:
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs
#	src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs
 2020-12-07 12:55:47 +01:00
Bjarke Berg
5dbddfffc5 Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore 
# Conflicts:
#	.gitignore
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
 2020-12-07 12:31:26 +01:00
Andy Butland
ff03cd6a03 Adhered to linting rules in common unit test model builders. 2020-12-05 11:12:55 +01:00
Bjarke Berg
fb18317c0f Moved lots of property editors into core 2020-12-04 19:01:52 +01:00
Andy Butland
45b9f31e44 Added tests for ContentPermissionsResourceHandler and MediaPermissionsResourceHandler. 2020-12-03 08:30:37 +01:00
Andy Butland
e178cd08b7 Added tests for TreeHandler. 2020-12-02 19:51:27 +01:00
Bjarke Berg
59aa4219de Merge remote-tracking branch 'origin/netcore/feature/azure-yaml-pipeline' into netcore/feature/azure-yaml-pipeline 2020-12-02 07:56:01 +01:00
Bjarke Berg
3d82873028 Fix issue with MapPath 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-12-02 07:55:51 +01:00
Bjarke Berg
85df7be7e8 Added TestEnvironment 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-30 08:51:12 +01:00
Benjamin Carleski
d51677d5ed Split IOHelper into platform specific versions 2020-11-18 04:49:03 -08:00
Elitsa Marinovska
dd5f400cf3 Netcore: Migration of Model classes from Umbraco.Infrastructure to Core (#9404) 
* Migrating more model, mapping and tree classes

* Migrating files from Mapping dir without Newtonsoft dependency

* Migrating files from PublishedContent and Editors dirs without Newtonsoft dependency + some more of the same kind

* Migrating DataType class without the usage of Newtonsoft.Json and making the corresponding changes to all classes affected

* Combining 3 ContentExtensions files into 1

* Refactoring from migrating ContentExtensions

* Migrating more classes

* Migrating ContentRepositoryExtensions - combining it with existing file in Umbraco.Core

* removing Newtonsoft json dependency & migrating file. Adding partial migration of ConfigurationEditor, so PropertyTagsExtensions can be migrated

* Migrating ContentTagsExtensions, and refactoring from changes in PropertyTagsExtensions

* Changes that should be reverted once ConfigurationEditor class is fully migrated

* VS couldn't find Composing, so build was failing. Removing the using solves the problem

* Handling a single case for deserializing a subset of an input

* Small changes and added tests to JsonNetSerializer

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

* Migrated ConfigurationEditor

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

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2020-11-17 20:27:10 +01:00
Paul Johnson
4ae329589a NetCore: MSDI refactor remove IFactory & IRegister (#9308) 
* Replace IFactory with IServiceProvider

* Replace IRegister with IServiceCollection

* Fix Rte.cshtml so the view can service locate.

* Replace Composing Lifetime with MSDI ServiceLifetime

* Remove ServiceProvider AddMultipleUnique extension

* Remove Umbraco.Web.Composing.Current.Reset and any calls

* Remove LightInject from net framework projects

* Brought back a helper for setting MediaFileSystem underlying IFileSystem
 2020-10-30 12:16:17 +01:00
Bjarke Berg
4d260b036b Merge branch 'netcore/bugfix/azure-devops-tests' into netcore/netcore 2020-10-27 11:57:38 +01:00
Bjarke Berg
6c2ece0619 Remove build warnings 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-27 11:57:15 +01:00
Paul Johnson
ec66990e72 NetCore: MSDI refactor phase 2 (#9280) 
* Moved adapters from Infra -> Core

* Allow Composition to accept a service collection instead of an IRegister

* Composition no longer takes IRegister as constructor arg

all tests passing

* Composition no longer implements IRegister

* Lose _uniques in Composition

* lose Composition OnCreatingFactory actions

* Clean up UmbracoCoreServiceCollectionExtensions & Composition

Less IFactory

* LightInject gone where TFW == netstandard2.0 || TFW == netcoreapp3.1

* Resolve dead code issues

* Rename IFactory methods to match IServiceProvider so they can be trivially swapped later.

* Rename IFactory methods to match IServiceProvider so they can be trivially swapped later (continued)

Thought the counts were low, it's mostly extension method usage
 2020-10-27 11:53:01 +01:00
Andy Butland
5e70c503cd NetCore: migrated further unit tests (#9211) 
* Moved model unit tests into correct folder and namespace.

* Migrated ContentTests.

* Migrated VariationTests.

* Migrated ImageSharpImageUrlGeneratorTests.

* Fixes to integration tests.

* Unit and integration test updates from PR comments.

* Delete accidentally added log file.
 2020-10-20 14:49:52 +02:00
Mole
e87caac0dd Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/move-tests 
# Conflicts:
#	src/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs
#	src/Umbraco.Tests.Common/TestHelpers/StringNewlineExtensions.cs
#	src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Macros/MacroParserTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Manifest/ManifestContentAppTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs
#	src/Umbraco.Tests/Macros/MacroParserTests.cs
#	src/Umbraco.Tests/Manifest/ManifestContentAppTests.cs
#	src/Umbraco.Tests/Manifest/ManifestParserTests.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
 2020-10-20 08:40:41 +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
231771a10e Migrated ContentServicePerformanceTest 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-14 08:02:43 +02:00
Bjarke Berg
34f6682d88 Merge branch 'netcore/feature/migrate/relation-tests' into feature/migrate-service-integration-tests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RelationRepository.cs
#	src/Umbraco.Tests.Common/Builders/MediaBuilder.cs
#	src/Umbraco.Tests.Integration/Services/RelationServiceTests.cs
 2020-10-12 14:48:52 +02:00
Bjarke Berg
372060a463 Merge remote-tracking branch 'origin/netcore/netcore' into feature/migrate-service-integration-tests 
# Conflicts:
#	src/Umbraco.Tests.Common/Builders/ContentTypeBuilder.cs
 2020-10-12 11:03:42 +02:00
Andy Butland
ef962b6934 Migrated ContentServiceTests. 2020-10-11 22:31:54 +02:00
Bjarke Berg
928f42be2e Updated tests after merge 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-11 21:08:21 +02:00
Andy Butland
31e87c0f31 Migrated ContentServiceTagsTests. 2020-10-11 12:33:27 +02:00
Andy Butland
4565da0010 Migrated MemberServiceTests. 2020-10-11 09:46:48 +02:00
Andy Butland
d3ebeedf72 Migrated MemberTypeServiceTests. 2020-10-11 09:23:17 +02:00
Andy Butland
ea10860101 Migrated ContentTypeServiceTests and RelationServiceTests. 2020-10-11 09:13:31 +02:00
Andy Butland
874e585bfb Migrated EntityXmlSerializerTests. Also aligned namespaces and update LocalizationServiceTests to use test model builders. 2020-10-10 18:25:18 +02:00
Bjarke Berg
2a4439e93a Migrated DocumentRepositoryTest 2020-10-09 13:08:23 +02:00
Bjarke Berg
15897f1736 Migrated ContentTypeRepositoryTest 2020-10-09 11:37:25 +02:00
Mole
2418b616a6 Merge pull request #9102 from AndyButland/feature/7898-services-integration-tests-migration-3 
NetCore: make use of builder classes for model creation in migrated tests
 2020-10-08 17:03:23 +02:00
Bjarke Berg
c7cdfaa775 Update nuget packages 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-08 14:49:24 +02:00
Mole
3c986f403e Remove Entities and Objects from common testshelpers since they don't exist anymore 
And fix a single typo
 2020-10-08 14:36:30 +02:00
Andy Butland
ff65788d38 Corrected comment. 
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2020-10-08 12:04:59 +02:00
Andy Butland
9838dbaf51 Corrected comment. 
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2020-10-08 12:04:40 +02:00
Andy Butland
9fc3546e67 Updated variable name. 
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
 2020-10-08 12:04:21 +02:00
Andy Butland
2925d5e1db Fixed failing tests. 2020-10-07 16:24:36 +02:00
Andy Butland
31b2f1ec4f Combined test user/group test objects created for repository and service tests. 2020-10-07 15:47:26 +02:00
Andy Butland
78c4a17503 Resolved issues after rebase from main branch. 
Fixed failing tests where test model builders showing slightly different behaviour to those used from legacy tests.
 2020-10-07 14:54:14 +02:00