yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,606 Commits 4 Branches 7 Tags
8d7ec23f6913f3c1029b272f94de2bce0146ac32
Commit Graph

36606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Søren Kottal
d7bf980f12 Adds icons from App_Plugins/**/Icons/*.svg (#8884) 
(cherry picked from commit 3b551bdc5d)
 2020-10-06 15:09:56 +02:00
Mike Masey
879d54b525 V8/feature/update icon picker to use umb icon (#9063) 
(cherry picked from commit 27751a4ae7)
 2020-10-06 15:09:01 +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
Søren Kottal
3b551bdc5d Adds icons from App_Plugins/**/Icons/*.svg (#8884) 2020-10-06 15:06:03 +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
Mike Masey
27751a4ae7 V8/feature/update icon picker to use umb icon (#9063) 2020-10-06 14:09:35 +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
Sebastiaan Janssen
29a6b7a5c0 Merge branch 'v8/8.8' into v8/8.9 2020-10-06 09:13:54 +02:00
Sebastiaan Janssen
cfd20833c7 Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
 2020-10-06 09:12:35 +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
Brynjólfur Gunnarsson
a5639a70c9 fixed publish variants dialog translation 2020-10-06 07:45:08 +10:00
Bjarne Fyrstenborg
aff046b1a1 Fix void element of umb-checkbox component 2020-10-06 07:43:01 +10: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
Sebastiaan Janssen
e9627f2ee9 Merge branch 'v8/dev' into v8/contrib 2020-10-05 21:12:51 +02:00
Sebastiaan Janssen
ed24a695e4 Merge branch 'v8/8.9' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2020-10-05 20:58:47 +02:00
Sebastiaan Janssen
32878576f9 Merge branch 'v8/8.8' into v8/dev 2020-10-05 20:58:05 +02:00
Sebastiaan Janssen
e41fdc3cce Merge branch 'v8/8.7' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
 2020-10-05 20:57:57 +02:00
Bjarke Berg
ad4834cc68 Updated tour skip-step condition to the new format after introduction of umb-icon 
(cherry picked from commit 1107e5d0fd)
 2020-10-05 20:50:52 +02:00
Ronald Barendse
2bfef74191 Fix casing of 'URL' (#9080) 2020-10-05 20:48:38 +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
Kenn Jacobsen
eaa0a3ba64 Fix broken auto-focus (#9004) 2020-10-05 13:56:57 +01: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