Commit Graph

35819 Commits

Author SHA1 Message Date
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
Mole
e0386ab0e6 Fix ContentServiceEventTests by clearing scoped events 2020-10-08 13:40:16 +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
d81dda1909 Fixed further failing tests. 2020-10-07 18:00:25 +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
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
Bjarke Berg
a3b32db41c Merge pull request #8892 from umbraco/netcore/feature/migrate-logging
Netcore: Migrate to use MS ILogger<T>
2020-10-07 06:44:55 +02: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
413b410bfb use mocks in unit test instead of real console logger
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-06 20:10:54 +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
Bjarke Berg
f1936869ea Merge pull request #9086 from umbraco/netcore/feature/8518-migrate-tests
NetCore: Migrate tests
2020-10-06 18:42:25 +02:00
Mole
9f05ae7792 Don't save macro twice 2020-10-06 15:22:47 +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
Bjarke Berg
a97ebc1f86 Merge pull request #9085 from AndyButland/feature/7898-services-integration-tests-migration-2
NetCore: Migrate further integration tests
2020-10-06 15:06:47 +02:00
Mole
e6fcfb09bd Fix commented out test 2020-10-06 14:49:11 +02:00
Mole
b28d45cde5 Use same pattern for getting Services in all tests 2020-10-06 14:41:10 +02:00
Mole
b233caf9b7 Use EntityService instead of var service in EntityServiceTests
It's more descriptive
2020-10-06 14:35:51 +02:00
Mole
2d785adfe6 Don't get IDataTypeService twice 2020-10-06 14:22:16 +02:00
Bjarke Berg
33acc05efd Added errors
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-06 14:21:41 +02:00
Mole
c7aad452ee Clean 2020-10-06 14:16:29 +02:00
Mole
32b43feac4 Remove unused imports 2020-10-06 13:45:21 +02:00
Andy Butland
8e48f2cc31 Further updates from PR comments and additional use of test model builders. 2020-10-06 13:24:32 +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
0e5c013c36 Updated from PR review. 2020-10-06 12:43:24 +02:00
Bjarke Berg
849e7179f7 Clean up
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-06 12:41:13 +02:00
Andy Butland
11dc3459bc Further update to user service and controller tests to use test builders. 2020-10-06 12:02:29 +02:00
Bjarke Berg
a56e3615d1 Merge remote-tracking branch 'origin/netcore/feature/migrate-logging' into netcore/feature/migrate-logging 2020-10-06 11:41:52 +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
Andy Butland
30e49ac548 Fix after rebase. 2020-10-06 08:28:02 +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
Andy Butland
6736860f4b Removed duplicate depenency registration. 2020-10-05 21:46:53 +02:00
Andy Butland
30b0f142eb Migrated various service tests into the new integration or unit tests projects as appropriate. 2020-10-05 21:46:53 +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