From fb48ecb57fb2cc4fa134463b6312f2c26c28b76f Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Fri, 18 Nov 2022 09:00:43 +0100 Subject: [PATCH] V11: merge dev to contrib (#13438) * V11: add test flakyness reporting (#13386) * update json-models-builders * Add reporting to all before each loops * Add commitId to env for pipelines * Test reports correctly * Bumb testhelper version * Update playwright-testhelpers version * Bumb playwright test-helper version * Bumb playwright-testhelpers version * Add AgentOs to yaml env * Bumb playwright-testhelper version * Try different AgentOS * Revert "Try different AgentOS" This reverts commit fc90620aef7af01ceffcdfbea7c9ef4dd02007f3. * Revert logo test * Add missing semicolons * Update package-lock.json * Add reports to Blocklist tests Co-authored-by: Zeegaan * V10: AllowedUploadFiles appsetting not working (#13408) * Add new Settings * Use new settings instead of old ones * Implement AllowedUploadedFiles value to be copied to AllowedUplayedFileExtensions * Obsolete old settings * Rename DisallowedUploadFileExtensions * Implement same fix for DisallowedUploadFiles * Use new settings for backoffice server variables * Update the correct setting Co-authored-by: Zeegaan * V11: Add compatibility suppressions (#13425) * Add suprressions * Revert "Add suprressions" This reverts commit 1c924ee967375870b6d86be9e9480ced0e22f8c7. * Update CompatibilitySuppressions.xml Co-authored-by: Ronald Barendse * Bump socket.io-parser from 4.0.4 to 4.0.5 in /src/Umbraco.Web.UI.Client Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.0.4 to 4.0.5. - [Release notes](https://github.com/socketio/socket.io-parser/releases) - [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io-parser/compare/4.0.4...4.0.5) --- updated-dependencies: - dependency-name: socket.io-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] * update block grid panel name (#13325) Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> * Bump async from 2.6.3 to 2.6.4 in /src/Umbraco.Web.UI.Client Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump eventsource from 1.1.0 to 1.1.2 in /src/Umbraco.Web.UI.Client Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.1.0 to 1.1.2. - [Release notes](https://github.com/EventSource/eventsource/releases) - [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md) - [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.2) --- updated-dependencies: - dependency-name: eventsource dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump minimist from 1.2.5 to 1.2.7 in /src/Umbraco.Web.UI.Client Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.7. - [Release notes](https://github.com/minimistjs/minimist/releases) - [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md) - [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] * Management API: SearchController improvements (#13420) * remove typo of double PagedViewModel in response * add providerProperties with custom formatter * use a more descriptive variable name * use a more descriptive variable name for property types * generate new schema Co-authored-by: Zeegaan * Bump minimatch from 3.0.4 to 3.1.2 in /src/Umbraco.Web.UI.Client Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: Zeegaan Co-authored-by: Mole Co-authored-by: Ronald Barendse Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Blake Watt Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> --- build/azure-pipelines.yml | 2 + .../Search/SearcherSearchSearchController.cs | 2 +- .../Factories/IndexViewModelFactory.cs | 16 ++++++++ src/Umbraco.Cms.ManagementApi/OpenApi.json | 38 ++++++++----------- .../ViewModels/Search/IndexViewModel.cs | 11 +++++- .../CompatibilitySuppressions.xml | 28 ++++++++++++++ .../ContentSettingsExtensions.cs | 6 +-- .../Configuration/Models/ContentSettings.cs | 13 +++++++ .../UmbracoBuilder.Configuration.cs | 26 +++++++++++++ .../CompatibilitySuppressions.xml | 28 ++++++++++++++ .../Controllers/BackOfficeServerVariables.cs | 4 +- .../package-lock.json | 14 +++---- .../Umbraco.Tests.AcceptanceTest/package.json | 2 +- .../blockListEditorContent.spec.ts | 3 +- .../blockListEditorDataType.spec.ts | 3 +- .../blockListEditorDocument.spec.ts | 3 +- .../tests/DefaultConfig/Branding/logo.spec.ts | 6 +-- .../DefaultConfig/Content/content.spec.ts | 3 +- .../DefaultConfig/Content/recycleBin.spec.ts | 3 +- .../DefaultConfig/Content/routing.spec.ts | 3 +- .../DefaultConfig/DataTypes/dataTypes.spec.ts | 3 +- .../DataTypes/textBoxVariation.spec.ts | 3 +- .../HelpPanel/systemInformation.spec.ts | 3 +- .../DefaultConfig/Languages/languages.spec.ts | 3 +- .../tests/DefaultConfig/Login/login.spec.ts | 7 +++- .../DefaultConfig/Media/mediaFiles.spec.ts | 3 +- .../DefaultConfig/Media/mediaSection.spec.ts | 3 +- .../Members/memberGroups.spec.ts | 3 +- .../DefaultConfig/Members/members.spec.ts | 3 +- .../ModelsBuilder/modelsbuilder.spec.ts | 3 +- .../DefaultConfig/Packages/packages.spec.ts | 3 +- .../DefaultConfig/Settings/dataType.spec.ts | 5 ++- .../Settings/documentTypes.spec.ts | 3 +- .../DefaultConfig/Settings/languages.spec.ts | 3 +- .../DefaultConfig/Settings/macro.spec.ts | 3 +- .../DefaultConfig/Settings/mediaTypes.ts | 3 +- .../Settings/memberTypes.spec.ts | 3 +- .../Settings/partialViewMacroFiles.spec.ts | 3 +- .../Settings/partialViews.spec.ts | 3 +- .../Settings/relationTypes.spec.ts | 3 +- .../DefaultConfig/Settings/scripts.spec.ts | 3 +- .../Settings/stylesheets.spec.ts | 3 +- .../DefaultConfig/Settings/templates.spec.ts | 3 +- .../tests/DefaultConfig/Tabs/tabs.spec.ts | 5 ++- .../tests/DefaultConfig/Tour/tours.spec.ts | 3 +- .../Translation/translation.spec.ts | 6 +-- .../DefaultConfig/Users/userGroups.spec.ts | 3 +- .../tests/DefaultConfig/Users/users.spec.ts | 5 ++- 48 files changed, 228 insertions(+), 83 deletions(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index e2abf8767d..345e3bde88 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -452,6 +452,8 @@ stages: workingDirectory: tests/Umbraco.Tests.AcceptanceTest env: CI: true + CommitId: $(Build.SourceVersion) + AgentOs: $(Agent.OS) - pwsh: | docker logs $(dockerImageName) > $(Build.ArtifactStagingDirectory)/playwright.log 2>&1 docker stop $(dockerImageName) diff --git a/src/Umbraco.Cms.ManagementApi/Controllers/Search/SearcherSearchSearchController.cs b/src/Umbraco.Cms.ManagementApi/Controllers/Search/SearcherSearchSearchController.cs index 36463ac3d8..3b9f7f6f85 100644 --- a/src/Umbraco.Cms.ManagementApi/Controllers/Search/SearcherSearchSearchController.cs +++ b/src/Umbraco.Cms.ManagementApi/Controllers/Search/SearcherSearchSearchController.cs @@ -19,7 +19,7 @@ public class SearcherSearchSearchController : SearchControllerBase [HttpGet("searcher/{searcherName}/search")] [MapToApiVersion("1.0")] - [ProducesResponseType(typeof(PagedViewModel>), StatusCodes.Status200OK)] + [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)] public async Task>> GetSearchResults(string searcherName, string? query, int skip, int take) { diff --git a/src/Umbraco.Cms.ManagementApi/Factories/IndexViewModelFactory.cs b/src/Umbraco.Cms.ManagementApi/Factories/IndexViewModelFactory.cs index 902d05a9cd..a23e22156e 100644 --- a/src/Umbraco.Cms.ManagementApi/Factories/IndexViewModelFactory.cs +++ b/src/Umbraco.Cms.ManagementApi/Factories/IndexViewModelFactory.cs @@ -37,6 +37,21 @@ public class IndexViewModelFactory : IIndexViewModelFactory Attempt isHealthy = indexDiag.IsHealthy(); + var properties = new Dictionary(); + + foreach (var property in indexDiag.Metadata) + { + if (property.Value is null) + { + properties[property.Key] = null; + } + else + { + var propertyType = property.Value.GetType(); + properties[property.Key] = propertyType.IsClass && !propertyType.IsArray ? property.Value?.ToString() : property.Value; + } + } + var indexerModel = new IndexViewModel { Name = index.Name, @@ -45,6 +60,7 @@ public class IndexViewModelFactory : IIndexViewModelFactory SearcherName = index.Searcher.Name, DocumentCount = indexDiag.GetDocumentCount(), FieldCount = indexDiag.GetFieldNames().Count(), + ProviderProperties = properties, }; return indexerModel; diff --git a/src/Umbraco.Cms.ManagementApi/OpenApi.json b/src/Umbraco.Cms.ManagementApi/OpenApi.json index 1e5a80b5a1..d2c27c5746 100644 --- a/src/Umbraco.Cms.ManagementApi/OpenApi.json +++ b/src/Umbraco.Cms.ManagementApi/OpenApi.json @@ -2827,7 +2827,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/PagedPaged" + "$ref": "#/components/schemas/PagedSearchResult" } } } @@ -4854,11 +4854,18 @@ "additionalProperties": false }, "Index": { + "required": [ + "canRebuild", + "documentCount", + "fieldCount", + "isHealthy", + "name" + ], "type": "object", "properties": { "name": { - "type": "string", - "nullable": true + "minLength": 1, + "type": "string" }, "healthStatus": { "type": "string", @@ -4882,6 +4889,11 @@ "fieldCount": { "type": "integer", "format": "int32" + }, + "providerProperties": { + "type": "object", + "additionalProperties": {}, + "nullable": true } }, "additionalProperties": false @@ -5754,26 +5766,6 @@ }, "additionalProperties": false }, - "PagedPaged": { - "required": [ - "items", - "total" - ], - "type": "object", - "properties": { - "total": { - "type": "integer", - "format": "int64" - }, - "items": { - "type": "array", - "items": { - "$ref": "#/components/schemas/PagedSearchResult" - } - } - }, - "additionalProperties": false - }, "PagedRecycleBinItem": { "required": [ "items", diff --git a/src/Umbraco.Cms.ManagementApi/ViewModels/Search/IndexViewModel.cs b/src/Umbraco.Cms.ManagementApi/ViewModels/Search/IndexViewModel.cs index c28b6c5e02..9a63bc8886 100644 --- a/src/Umbraco.Cms.ManagementApi/ViewModels/Search/IndexViewModel.cs +++ b/src/Umbraco.Cms.ManagementApi/ViewModels/Search/IndexViewModel.cs @@ -1,18 +1,27 @@ -namespace Umbraco.Cms.ManagementApi.ViewModels.Search; +using System.ComponentModel.DataAnnotations; + +namespace Umbraco.Cms.ManagementApi.ViewModels.Search; public class IndexViewModel { + [Required] public string Name { get; init; } = null!; public string? HealthStatus { get; init; } + [Required] public bool IsHealthy => HealthStatus == "Healthy"; + [Required] public bool CanRebuild { get; init; } public string SearcherName { get; init; } = null!; + [Required] public long DocumentCount { get; init; } + [Required] public int FieldCount { get; init; } + + public IReadOnlyDictionary? ProviderProperties { get; init; } } diff --git a/src/Umbraco.Core/CompatibilitySuppressions.xml b/src/Umbraco.Core/CompatibilitySuppressions.xml index e34b117b9a..f580fa9458 100644 --- a/src/Umbraco.Core/CompatibilitySuppressions.xml +++ b/src/Umbraco.Core/CompatibilitySuppressions.xml @@ -1,5 +1,33 @@  + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridItem.get_ForceLeft + lib/net7.0/Umbraco.Core.dll + lib/net7.0/Umbraco.Core.dll + true + + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridItem.get_ForceRight + lib/net7.0/Umbraco.Core.dll + lib/net7.0/Umbraco.Core.dll + true + + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridItem.set_ForceLeft(System.Boolean) + lib/net7.0/Umbraco.Core.dll + lib/net7.0/Umbraco.Core.dll + true + + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridItem.set_ForceRight(System.Boolean) + lib/net7.0/Umbraco.Core.dll + lib/net7.0/Umbraco.Core.dll + true + CP0006 M:Umbraco.Cms.Core.Deploy.IDataTypeConfigurationConnector.FromArtifact(Umbraco.Cms.Core.Models.IDataType,System.String,Umbraco.Cms.Core.Deploy.IContextCache) diff --git a/src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs b/src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs index 315cee4627..23a67f3267 100644 --- a/src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs +++ b/src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs @@ -10,9 +10,9 @@ public static class ContentSettingsExtensions /// Allow upload if extension is whitelisted OR if there is no whitelist and extension is NOT blacklisted. /// public static bool IsFileAllowedForUpload(this ContentSettings contentSettings, string extension) => - contentSettings.AllowedUploadFiles.Any(x => x.InvariantEquals(extension)) || - (contentSettings.AllowedUploadFiles.Any() == false && - contentSettings.DisallowedUploadFiles.Any(x => x.InvariantEquals(extension)) == false); + contentSettings.AllowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension)) || + (contentSettings.AllowedUploadedFileExtensions.Any() == false && + contentSettings.DisallowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension)) == false); /// /// Gets the auto-fill configuration for a specified property alias. diff --git a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs index f4f3040b79..4014930a5c 100644 --- a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs @@ -196,11 +196,13 @@ public class ContentSettings /// Gets or sets a value for the collection of file extensions that are disallowed for upload. /// [DefaultValue(StaticDisallowedUploadFiles)] + [Obsolete("Please use DisAllowedUploadedFileExtensions instead, scheduled for removal in V13")] public IEnumerable DisallowedUploadFiles { get; set; } = StaticDisallowedUploadFiles.Split(','); /// /// Gets or sets a value for the collection of file extensions that are allowed for upload. /// + [Obsolete("Please use AllowedUploadedFileExtensions instead, scheduled for removal in V13")] public IEnumerable AllowedUploadFiles { get; set; } = Array.Empty(); /// @@ -249,4 +251,15 @@ public class ContentSettings /// [DefaultValue(StaticAllowEditInvariantFromNonDefault)] public bool AllowEditInvariantFromNonDefault { get; set; } = StaticAllowEditInvariantFromNonDefault; + + /// + /// Gets or sets a value for the collection of file extensions that are allowed for upload. + /// + public string[] AllowedUploadedFileExtensions { get; set; } = Array.Empty(); + + /// + /// Gets or sets a value for the collection of file extensions that are disallowed for upload. + /// + [DefaultValue(StaticDisallowedUploadFiles)] + public string[] DisallowedUploadedFileExtensions { get; set; } = StaticDisallowedUploadFiles.Split(','); } diff --git a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs index 3be3815afa..28fc05907e 100644 --- a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs +++ b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs @@ -117,6 +117,32 @@ public static partial class UmbracoBuilderExtensions } }); + // TODO: Remove this in V13 + // This is to avoid a breaking change in ContentSettings, if the old AllowedFileUploads has a value, and the new + // AllowedFileUploadExtensions does not, copy the value over, if the new has a value, use that instead. + builder.Services.Configure(settings => + { + // We have to use Config.GetSection().Get, as the GetSection.GetValue simply cannot retrieve a string array + var allowedUploadedFileExtensionsValue = builder.Config.GetSection($"{Constants.Configuration.ConfigContent}:{nameof(ContentSettings.AllowedUploadedFileExtensions)}").Get(); + var allowedUploadFilesValue = builder.Config.GetSection($"{Constants.Configuration.ConfigContent}:{nameof(ContentSettings.AllowedUploadFiles)}").Get(); + + if (allowedUploadedFileExtensionsValue is null && allowedUploadFilesValue is not null) + { + settings.AllowedUploadedFileExtensions = allowedUploadFilesValue; + } + }); + + // TODO: Remove this in V13 + builder.Services.Configure(settings => + { + var disallowedUploadedFileExtensionsValue = builder.Config.GetSection($"{Constants.Configuration.ConfigContent}:{nameof(ContentSettings.DisallowedUploadedFileExtensions)}").Get(); + var disallowedUploadFilesValue = builder.Config.GetSection($"{Constants.Configuration.ConfigContent}:{nameof(ContentSettings.DisallowedUploadFiles)}").Get(); + + if (disallowedUploadedFileExtensionsValue is null && disallowedUploadFilesValue is not null) + { + settings.DisallowedUploadedFileExtensions = disallowedUploadFilesValue; + } + }); return builder; } } diff --git a/src/Umbraco.Infrastructure/CompatibilitySuppressions.xml b/src/Umbraco.Infrastructure/CompatibilitySuppressions.xml index 2095a0c798..f48f361244 100644 --- a/src/Umbraco.Infrastructure/CompatibilitySuppressions.xml +++ b/src/Umbraco.Infrastructure/CompatibilitySuppressions.xml @@ -1,5 +1,33 @@  + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridLayoutItem.get_ForceLeft + lib/net7.0/Umbraco.Infrastructure.dll + lib/net7.0/Umbraco.Infrastructure.dll + true + + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridLayoutItem.get_ForceRight + lib/net7.0/Umbraco.Infrastructure.dll + lib/net7.0/Umbraco.Infrastructure.dll + true + + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridLayoutItem.set_ForceLeft(System.Boolean) + lib/net7.0/Umbraco.Infrastructure.dll + lib/net7.0/Umbraco.Infrastructure.dll + true + + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridLayoutItem.set_ForceRight(System.Boolean) + lib/net7.0/Umbraco.Infrastructure.dll + lib/net7.0/Umbraco.Infrastructure.dll + true + CP0006 M:Umbraco.Cms.Core.Deploy.IGridCellValueConnector.GetValue(Umbraco.Cms.Core.Models.GridValue.GridControl,System.Collections.Generic.ICollection{Umbraco.Cms.Core.Deploy.ArtifactDependency},Umbraco.Cms.Core.Deploy.IContextCache) diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs index c8a3c710ec..768fe382f9 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs @@ -543,11 +543,11 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers }, { "disallowedUploadFiles", - string.Join(",", _contentSettings.DisallowedUploadFiles) + string.Join(",", _contentSettings.DisallowedUploadedFileExtensions) }, { "allowedUploadFiles", - string.Join(",", _contentSettings.AllowedUploadFiles) + string.Join(",", _contentSettings.AllowedUploadedFileExtensions) }, { "maxFileSize", diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json index 92b5121640..0c44f7f6cc 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json @@ -8,7 +8,7 @@ "hasInstallScript": true, "dependencies": { "@umbraco/json-models-builders": "^1.0.2", - "@umbraco/playwright-testhelpers": "^1.0.12", + "@umbraco/playwright-testhelpers": "^1.0.18", "camelize": "^1.0.0", "dotenv": "^16.0.2", "faker": "^4.1.0", @@ -138,9 +138,9 @@ } }, "node_modules/@umbraco/playwright-testhelpers": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-1.0.12.tgz", - "integrity": "sha512-O6P307ocTaBzaNE0QjFS100w94DalTx9nXUGczpwku3oAZZyoNaG//A7xh5zmlmgAGHqyKnAMQBoH/RX3t8C6g==", + "version": "1.0.18", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-1.0.18.tgz", + "integrity": "sha512-SLtZqs3IxtuBfKBp25ZgAxjrXTIoR/mWQ8qfEFTpsebdQcnZVXxPXbCe2CwPT3zdTpjdjdh/HOfn/ONjtpL8Cw==", "dependencies": { "@umbraco/json-models-builders": "^1.0.2", "camelize": "^1.0.0", @@ -1064,9 +1064,9 @@ } }, "@umbraco/playwright-testhelpers": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-1.0.12.tgz", - "integrity": "sha512-O6P307ocTaBzaNE0QjFS100w94DalTx9nXUGczpwku3oAZZyoNaG//A7xh5zmlmgAGHqyKnAMQBoH/RX3t8C6g==", + "version": "1.0.18", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-1.0.18.tgz", + "integrity": "sha512-SLtZqs3IxtuBfKBp25ZgAxjrXTIoR/mWQ8qfEFTpsebdQcnZVXxPXbCe2CwPT3zdTpjdjdh/HOfn/ONjtpL8Cw==", "requires": { "@umbraco/json-models-builders": "^1.0.2", "camelize": "^1.0.0", diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index 997514c470..72a314a060 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@umbraco/json-models-builders": "^1.0.2", - "@umbraco/playwright-testhelpers": "^1.0.12", + "@umbraco/playwright-testhelpers": "^1.0.18", "camelize": "^1.0.0", "faker": "^4.1.0", "form-data": "^4.0.0", diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorContent.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorContent.spec.ts index ffc14e1a18..242f93d6ce 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorContent.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorContent.spec.ts @@ -14,7 +14,8 @@ test.describe('BlockListEditorContent', () => { // Won't work if I use the to alias for the elementAlias const elementAlias = 'testElement'; - test.beforeEach(async ({page, umbracoApi, umbracoUi}) => { + test.beforeEach(async ({page, umbracoApi, umbracoUi}, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoApi.documentTypes.ensureNameNotExists(documentName); await umbracoApi.documentTypes.ensureNameNotExists(elementName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDataType.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDataType.spec.ts index 70c4112c25..0c2c7d9a8f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDataType.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDataType.spec.ts @@ -10,7 +10,8 @@ test.describe('BlockListEditorDataType', () => { const elementAlias = AliasHelper.toAlias(elementName); - test.beforeEach(async ({page, umbracoApi, umbracoUi}) => { + test.beforeEach(async ({page, umbracoApi, umbracoUi}, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoApi.documentTypes.ensureNameNotExists(documentName); await umbracoApi.dataTypes.ensureNameNotExists(blockListName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDocument.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDocument.spec.ts index e38236f3dd..55588a2848 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDocument.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDocument.spec.ts @@ -11,7 +11,8 @@ test.describe('BlockListEditorDocument', () => { const blockListAlias = AliasHelper.toAlias(blockListName); const elementAlias = AliasHelper.toAlias(elementName); - test.beforeEach(async ({page, umbracoApi, umbracoUi}) => { + test.beforeEach(async ({page, umbracoApi, umbracoUi}, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoApi.documentTypes.ensureNameNotExists(documentName); await umbracoApi.dataTypes.ensureNameNotExists(blockListName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Branding/logo.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Branding/logo.spec.ts index c9e28e69a6..eaa8f4a72a 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Branding/logo.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Branding/logo.spec.ts @@ -3,10 +3,8 @@ import { expect } from "@playwright/test"; test.describe('Umbraco Logo Information', () => { - test.beforeEach(async ({ page, umbracoApi }) => { - // TODO: REMOVE THIS WHEN SQLITE IS FIXED - // Wait so we don't bombard the API - await page.waitForTimeout(1000); + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts index 603e86470a..eb1965a628 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts @@ -10,7 +10,8 @@ import { test.describe('Content tests', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/recycleBin.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/recycleBin.spec.ts index 135a7ade07..f55ea4379b 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/recycleBin.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/recycleBin.spec.ts @@ -4,7 +4,8 @@ import {ContentBuilder, DocumentTypeBuilder} from "@umbraco/json-models-builders test.describe('Recycle bin', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/routing.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/routing.spec.ts index 0838b5acde..2a40de0c6f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/routing.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/routing.spec.ts @@ -11,7 +11,8 @@ test.describe('Routing', () => { const grandChildNodeName = "Grandchild"; const rootDocTypeName = "Test document type"; - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoApi.content.deleteAllContent(); await umbracoApi.documentTypes.ensureNameNotExists(rootDocTypeName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/dataTypes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/dataTypes.spec.ts index ba6637c693..208f2b2708 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/dataTypes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/dataTypes.spec.ts @@ -8,7 +8,8 @@ import { test.describe('DataTypes', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/textBoxVariation.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/textBoxVariation.spec.ts index 9222301db1..cbdd445e20 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/textBoxVariation.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/textBoxVariation.spec.ts @@ -4,7 +4,8 @@ import {ContentBuilder, DocumentTypeBuilder, DomainBuilder} from "@umbraco/json- test.describe('Vary by culture for TextBox', () => { - test.beforeEach(async ({page, umbracoApi, umbracoUi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/systemInformation.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/systemInformation.spec.ts index 76199001a6..fb46e6ee52 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/systemInformation.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/systemInformation.spec.ts @@ -5,7 +5,8 @@ test.describe('System Information', () => { const enCulture = "en-US"; const dkCulture = "da-DK"; - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoApi.users.setCurrentLanguage(enCulture); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Languages/languages.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Languages/languages.spec.ts index 6e6c2bf4e0..d12ca73678 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Languages/languages.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Languages/languages.spec.ts @@ -3,7 +3,8 @@ import {expect} from "@playwright/test"; test.describe('Languages', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts index 3d3000b5b0..25eaa34ae5 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts @@ -1,7 +1,10 @@ -import { test, expect } from '@playwright/test'; +import {expect } from '@playwright/test'; +import {test} from "@umbraco/playwright-testhelpers"; + test.describe('Login', () => { - test.beforeEach(async ({ page }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await page.goto(process.env.URL + '/umbraco'); }); test('Login with correct username and password', async ({page}) => { diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaFiles.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaFiles.spec.ts index a894801968..4805cc5af0 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaFiles.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaFiles.spec.ts @@ -3,7 +3,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('media File Types', () => { - test.beforeEach(async ({page, umbracoApi, umbracoUi}) => { + test.beforeEach(async ({page, umbracoApi, umbracoUi}, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoUi.goToSection(ConstantHelper.sections.media); await umbracoApi.media.deleteAllMedia(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaSection.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaSection.spec.ts index 2620e21a34..2e55aa82b0 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaSection.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaSection.spec.ts @@ -3,7 +3,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('Media', () => { - test.beforeEach(async ({page, umbracoApi, umbracoUi}) => { + test.beforeEach(async ({page, umbracoApi, umbracoUi}, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoUi.goToSection(ConstantHelper.sections.media); await umbracoApi.media.deleteAllMedia() diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/memberGroups.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/memberGroups.spec.ts index 2e577e9548..e547036f05 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/memberGroups.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/memberGroups.spec.ts @@ -2,7 +2,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('Packages', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/members.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/members.spec.ts index 0af21e38a4..506f879614 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/members.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/members.spec.ts @@ -2,7 +2,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('Packages', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/ModelsBuilder/modelsbuilder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/ModelsBuilder/modelsbuilder.spec.ts index 998a738e2f..0215d617ee 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/ModelsBuilder/modelsbuilder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/ModelsBuilder/modelsbuilder.spec.ts @@ -6,7 +6,8 @@ import { test.describe('Modelsbuilder tests', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/packages.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/packages.spec.ts index a6acdee170..07bd1812e8 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/packages.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/packages.spec.ts @@ -7,7 +7,8 @@ test.describe('Packages', () => { const packageName = "TestPackage"; const rootDocTypeName = "Test document type"; const nodeName = "1) Home"; - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/dataType.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/dataType.spec.ts index 70c12486a9..4f719deab9 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/dataType.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/dataType.spec.ts @@ -3,8 +3,9 @@ import {expect} from "@playwright/test"; import {LabelDataTypeBuilder} from "@umbraco/json-models-builders"; test.describe('Data Types', () => { - - test.beforeEach(async ({page, umbracoApi}) => { + + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/documentTypes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/documentTypes.spec.ts index 7ab96953d3..99f578dbd6 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/documentTypes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/documentTypes.spec.ts @@ -3,7 +3,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; import {DocumentTypeBuilder} from "@umbraco/json-models-builders"; test.describe('Document types', () => { - test.beforeEach(async ({ page, umbracoApi }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/languages.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/languages.spec.ts index 879c696f65..41b4f4d0a7 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/languages.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/languages.spec.ts @@ -2,7 +2,8 @@ import {test, ApiHelpers, UiHelpers, ConstantHelper} from '@umbraco/playwright-t import {expect} from "@playwright/test"; test.describe('Languages', () => { - test.beforeEach(async ({ page, umbracoApi }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/macro.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/macro.spec.ts index c54907d315..11f99b3a95 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/macro.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/macro.spec.ts @@ -3,7 +3,8 @@ import {PartialViewMacroBuilder} from "@umbraco/json-models-builders"; test.describe('Macros', () => { - test.beforeEach(async ({ page, umbracoApi }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/mediaTypes.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/mediaTypes.ts index 1db083cd13..e92f4fb624 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/mediaTypes.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/mediaTypes.ts @@ -3,7 +3,8 @@ import {expect} from "@playwright/test"; test.describe('Media types', () => { - test.beforeEach(async ({ page, umbracoApi }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/memberTypes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/memberTypes.spec.ts index 661c4c842b..609116c112 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/memberTypes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/memberTypes.spec.ts @@ -1,7 +1,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('Member Types', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViewMacroFiles.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViewMacroFiles.spec.ts index 88939ab10f..15b9202e28 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViewMacroFiles.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViewMacroFiles.spec.ts @@ -4,7 +4,8 @@ import {PartialViewMacroBuilder} from "@umbraco/json-models-builders"; test.describe('Partial View Macro Files', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViews.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViews.spec.ts index c8dc16b51d..56fbe936a9 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViews.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViews.spec.ts @@ -4,7 +4,8 @@ import {PartialViewBuilder} from "@umbraco/json-models-builders"; test.describe('Partial Views', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/relationTypes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/relationTypes.spec.ts index 6ba20a619c..34b00c7fc3 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/relationTypes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/relationTypes.spec.ts @@ -3,7 +3,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('Relation Types', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/scripts.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/scripts.spec.ts index 5f8d93a6db..b6ca8a09ee 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/scripts.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/scripts.spec.ts @@ -3,7 +3,8 @@ import {expect} from "@playwright/test"; import {ScriptBuilder} from "@umbraco/json-models-builders"; test.describe('Scripts', () => { - test.beforeEach(async ({ page, umbracoApi }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/stylesheets.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/stylesheets.spec.ts index 6c82a85165..9639de6553 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/stylesheets.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/stylesheets.spec.ts @@ -7,7 +7,8 @@ test.describe('Stylesheets', () => { const name = "TestStylesheet"; const fileName = name + ".css"; - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/templates.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/templates.spec.ts index e3d5c7c943..bef67819d6 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/templates.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/templates.spec.ts @@ -3,7 +3,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; import {TemplateBuilder} from "@umbraco/json-models-builders"; test.describe('Templates', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts index e9b0e42c83..8ffeb6c685 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts @@ -6,8 +6,9 @@ const tabsDocTypeName = 'Tabs Test Document'; const tabsDocTypeAlias = AliasHelper.toAlias(tabsDocTypeName); test.describe('Tabs', () => { - - test.beforeEach(async ({ umbracoApi, page }) => { + + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tour/tours.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tour/tours.spec.ts index e0512acbc2..560be634aa 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tour/tours.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tour/tours.spec.ts @@ -3,7 +3,8 @@ import {test} from '@umbraco/playwright-testhelpers'; test.describe('Tours', () => { const timeout = 60000; - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await resetTourData(umbracoApi); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Translation/translation.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Translation/translation.spec.ts index e3c3bc2ada..80e55daae9 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Translation/translation.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Translation/translation.spec.ts @@ -2,10 +2,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('Translation', () => { - test.beforeEach(async ({page, umbracoApi}) => { - // TODO: REMOVE THIS WHEN SQLITE IS FIXED - // Wait so we don't bombard the API - await page.waitForTimeout(1000); + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/userGroups.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/userGroups.spec.ts index 86a94ec144..0edce122b5 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/userGroups.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/userGroups.spec.ts @@ -9,7 +9,8 @@ test.describe('User groups', () => { await page.locator('[data-element="sub-view-userGroups"]').click(); } - test.beforeEach(async ({ umbracoApi, page }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/users.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/users.spec.ts index 164f778e62..fa8829bd07 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/users.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/users.spec.ts @@ -22,8 +22,9 @@ test.describe('Users', () => { "userGroups": userGroups, "message": "" }; - - test.beforeEach(async ({ umbracoApi, page }) => { + + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); });