Commit Graph

35799 Commits

Author SHA1 Message Date
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
Mole
c97375d478 Migrate ContentServicePublishBranchTests 2020-10-05 13:33:39 +02:00
Bjarke Berg
a7c4fa5f2e Merge pull request #9068 from umbraco/netcore/feature/AB8519-umbraco-tests-services-migration
NetCore: Migrating Service tests
2020-10-05 12:50:40 +02:00
Mole
8c9a55b0bc Migrate ContentTypeServiceExtensionsTests 2020-10-05 12:44:42 +02:00
Mole
ff2528bb06 Migrate MacroServiceTests 2020-10-05 11:51:07 +02:00
Mole
d7f0af7d4d Remove empty PackagingServiceTests 2020-10-05 11:38:05 +02:00
Mole
6a9228af11 Migrate PropertyValidationServiceTest 2020-10-05 11:32:03 +02:00
Mole
4293337b81 Migrate LocalizedTextServiceTests 2020-10-05 11:15:45 +02:00
Bjarke Berg
74f7a2784c Handle null user in GetPermissionsForPath
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-05 10:44:28 +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
b181fa0e01 Migrate EntityServiceTests 2020-10-05 09:38:30 +02:00
Bjarke Berg
7700c9f5c7 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB8519-umbraco-tests-services-migration 2020-10-05 08:52:02 +02:00
Bjarke Berg
e4264dbb6f Merge pull request #9008 from umbraco/netcore/bugfix/tours
NetCore: Fix for Back-Office tours
2020-10-05 08:40:27 +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
Bjarke Berg
586c61f282 moved getting-started.json from old to new project
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-05 07:50:55 +02:00
Bjarke Berg
9524aefb90 Delete getting-started.json from new project
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-05 07:49:51 +02:00
Bjarke Berg
5ff9fc64ca Merge remote-tracking branch 'origin/netcore/netcore' into netcore/bugfix/tours 2020-10-05 07:48:32 +02:00
Bjarke Berg
4dc26a9f04 Fix double nuget reference
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-05 07:45:28 +02:00
Elitsa Marinovska
e1170b8f12 Migrates more service tests and other required implementation changes 2020-10-04 21:19:40 +02:00
Elitsa Marinovska
236f93b5ff Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB8519-umbraco-tests-services-migration 2020-10-03 21:27:16 +02:00
Bjarke Berg
b729c44505 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/IconController.cs
#	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/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
2020-10-02 16:43:23 +02:00