Commit Graph

233 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
Mole
9f05ae7792 Don't save macro twice 2020-10-06 15:22:47 +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
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
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
Andy Butland
0e5c013c36 Updated from PR review. 2020-10-06 12:43:24 +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
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
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
Mole
ff2528bb06 Migrate MacroServiceTests 2020-10-05 11:51:07 +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
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
Elitsa Marinovska
e1170b8f12 Migrates more service tests and other required implementation changes 2020-10-04 21:19:40 +02:00
Mole
7ad3cfc403 Migrate KeyValueServiceTests 2020-10-02 14:52:48 +02:00
Mole
07d943e37a Migrate FileServiceTests 2020-10-02 14:46:14 +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
8c5e348437 Move CachedDataTypeServiceTests 2020-10-02 14:15:46 +02:00
Mole
89d2668b8f Move ConsentServiceTests & CreatedPackagesRepositoryTests
I need to figure out why hostBuilder.StartAsync(); hangs
2020-10-02 12:00:13 +02:00
Mole
6dc52b9461 Migrate DataTypeServiceTests 2020-10-01 15:10:42 +02:00
Elitsa Marinovska
e8e965c46a Makes required services private and available to all test methods 2020-10-01 14:47:34 +02:00
Elitsa Marinovska
8dfa73be4c Migrating TagServiceTests 2020-10-01 14:23:17 +02:00
Bjarke Berg
3607dd14f1 Clean up + Removed old SignalR code
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-01 07:09:54 +02:00
Bjarke Berg
aa3049fded Migrated more tests + Aligned IHostingEnvironment.ToAbsolute implementation with expectations from old tests 2020-09-30 14:54:53 +02:00
Mole
cbdb96dfe6 Add SignalR in integration tests 2020-09-30 14:27:18 +02:00
Bjarke Berg
81e2ebda96 Cleanup
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-29 10:42:06 +02:00
Bjarke Berg
8dc1c9768c Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
2020-09-29 08:58:24 +02:00
Bjarke Berg
d74e18a15d Migrated SectionServiceTests to integration tests
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-29 08:14:27 +02:00
Bjarke Berg
2779b19737 Fixed test
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-09-24 10:13:22 +02:00
Bjarke Berg
35443f0e71 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
2020-09-24 08:24:35 +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
8258178c5a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging
# Conflicts:
#	src/Umbraco.Infrastructure/Media/UploadAutoFillProperties.cs
#	src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
#	src/Umbraco.Tests/Models/MediaXmlTest.cs
#	src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
2020-09-23 13:32:49 +02:00
Bjarke Berg
0d731e7a40 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	build/build-bootstrap.ps1
#	src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
#	src/Umbraco.Infrastructure/Compose/PublicAccessComponent.cs
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Web/Compose/BackOfficeUserAuditEventsComponent.cs
#	src/Umbraco.Web/Logging/WebProfilerComponent.cs
2020-09-23 13:28:36 +02:00
Mole
3d52949938 Merge pull request #8944 from umbraco/netcore/bugfix/8856-user_culture_not_used_everywhere
Netcore: Bugfix for user culture not used everywhere
2020-09-23 09:58:30 +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