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

5424 Commits

Author SHA1 Message Date
Shannon
1400a02798 Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller 
# Conflicts:
#	src/Umbraco.Core/Constants-Security.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactory.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeUserManager.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.BackOffice/Controllers/DenyLocalLoginAuthorizationAttribute.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web.BackOffice/Services/IconService.cs
#	src/Umbraco.Web.Common/Security/ExternalSignInAutoLinkOptions.cs
#	src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
#	src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.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/Views/AuthorizeUpgrade.cshtml
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
 2020-10-23 10:10:02 +11:00
Shannon
2b1dfc5888 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller 
# Conflicts:
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Mvc/UmbracoController.cs
 2020-10-22 21:16:44 +11:00
Bjarke Berg
5ecc2676e3 Migrated ThreadSafetyServiceTest.cs 2020-10-21 13:54:22 +02:00
Bjarke Berg
7e77feab1e Migrated ContentTypeServiceVariantsTests.cs 2020-10-21 13:47:52 +02:00
Bjarke Berg
2bb3afb69d Merge pull request #9227 from umbraco/netcore/feature/migrate-unit-tests 
Netcore: Migrate rendering related unit tests
 2020-10-21 10:51:12 +02:00
Shannon
d1b35deb43 Migrates remaining backofficecontroller but still a bunch of work to do , streamlines Backoffice to BackOffice (but is that what we want?) 2020-10-21 16:51:00 +11:00
Andy Butland
6e592d6467 NetCore: Reorganised integration tests into project grouped folders and namespaces (#9208) 
* Reorganised integration tests into folders and classes grouping by project.

* Updated namespaces and file locations from PR comments.

* Fix merge conflict

* Cleared content type service events looking to resolve failing integration test on build server.

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-10-20 18:43:03 +02: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
d315d2120e Migrate UmbracoViewPageTests 2020-10-20 13:41:21 +02:00
Mole
568ce57e67 Remove folders that does not exist 2020-10-20 09:34:57 +02:00
Mole
a88243b9ba Try and fix the merge 2020-10-20 09:06:42 +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
Mole
c3e92a91b5 Mingrate RenderModelBinderTests 2020-10-19 14:03:51 +02:00
Bjarke Berg
3d7942bb7c Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/clean-umbraco-web 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-19 08:08:56 +02:00
Bjarke Berg
b27732adc8 Migrated RenderMvcController and RenderIndexActionSelectorAttribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-15 11:42:16 +02:00
Bjarke Berg
e567f25487 Migrated ContentEventsTests.cs 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-14 11:10:02 +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
Andy Butland
31e87c0f31 Migrated ContentServiceTagsTests. 2020-10-11 12:33:27 +02:00
Andy Butland
599c7d6e6b Migrated MediaTypeServiceTests. 2020-10-11 11:53:01 +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
19bf65e08b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate/relation-tests 2020-10-09 18:16:05 +02:00
Bjarke Berg
2a4439e93a Migrated DocumentRepositoryTest 2020-10-09 13:08:23 +02:00
Bjarke Berg
f5437309c4 Migrated DataTypeDefinitionRepositoryTest 2020-10-09 11:50:47 +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
Bjarke Berg
3171cdda70 Migrated RelationServiceTests.cs 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-07 21:01:28 +02:00
Bjarke Berg
e7edbfeaa3 Migrated RelationRepositoryTest.cs + Minimized how many relations we create to test the code. 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-07 20:23:06 +02:00
Bjarke Berg
9feb79eb90 Update nuget packages 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-07 15:12:55 +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
Mole
17c68176e0 Merge pull request #9100 from umbraco/netcore/task/6964-legacy-password-format 
Adds support for the super old password format so we can handle upgrades
 2020-10-07 11:25:51 +02:00
Shannon
ed582eea58 removes test that is testing code that will be deleted 2020-10-07 17:07:20 +11:00
Shannon
eaa295095d Gets password roll forward working 2020-10-07 16:56:48 +11:00
Shannon
e5c272b5d2 Adds support for the super old password format so we can handle upgrades 2020-10-07 15:20:43 +11: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
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
Mole
55a9623c84 Fix csproj after merge 2020-10-06 15:21:27 +02:00
Mole
23aee8bd4e Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/8518-migrate-tests 
# Conflicts:
#	src/Umbraco.Tests.Integration/Services/MacroServiceTests.cs
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
 2020-10-06 15:16:28 +02:00
Mole
65bd5ea3ef Move AngularIntegrationTests 
They all say they belong to Web but their implementations are in Core/Infrastructure/Backoffice, so I assume they belong in the new test suite
 2020-10-06 13:11:44 +02:00
Mole
da5f9e7520 Migrate MacroParserTests 
While the namespace is Umbraco.Web.Macros the implementation is in Umbraco.Infrastructure assembly, so I assume it has been migrated.
 2020-10-06 13:02:29 +02:00
Andy Butland
7461a10c78 Migrated macro service tests to new integration tests project. 2020-10-06 09:54:10 +02:00
Andy Butland
1f83c61043 Aligned service integration tests with naming convention for private variables and use of test model builders. 2020-10-06 09:23:15 +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