diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json index 48316d8ebf..a435cf2487 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": "^2.0.1 ", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.20", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.21", "camelize": "^1.0.0", "dotenv": "^16.3.1", "faker": "^4.1.0", @@ -146,9 +146,9 @@ "integrity": "sha512-9tCqYEDHI5RYFQigXFwF1hnCwcWCOJl/hmll0lr5D2Ljjb0o4wphb69wikeJDz5qCEzXCoPvG6ss5SDP6IfOdg==" }, "node_modules/@umbraco/playwright-testhelpers": { - "version": "2.0.0-beta.20", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.20.tgz", - "integrity": "sha512-XFkKr1TyEp2l1Nb9hlwODkYK1PAzsdHmtn6yRPu72gWhN5AO8/JTeKWrfhJZIgXPYCo4AhS2Rn9r/1PiXreKNw==", + "version": "2.0.0-beta.21", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.21.tgz", + "integrity": "sha512-XGjx0vDL+0qAsRh7WWMAUugmT4B2P10SRWRmxKe9F2U6bbB+ZFkgGu1rdLcVZANxW32R+m/dWkP8LqZp4DFPzA==", "dependencies": { "@umbraco/json-models-builders": "2.0.1", "camelize": "^1.0.0", diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index e9649ae6ec..6b50eccad5 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "@umbraco/json-models-builders": "^2.0.1 ", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.20", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.21", "camelize": "^1.0.0", "dotenv": "^16.3.1", "faker": "^4.1.0", diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/ExamineManagement.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/ExamineManagement.spec.ts index c070979630..78ee563b60 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/ExamineManagement.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/ExamineManagement.spec.ts @@ -24,22 +24,25 @@ test.describe('Examine Management Dashboard tests', () => { test('can view the details of an index', async ({umbracoApi, umbracoUi}) => { // Arrange const allIndexersData = await umbracoApi.indexer.getAll(); - const indexName = allIndexersData.items[0].name; - const indexData = await umbracoApi.indexer.getByIndexName(indexName); + for (const index of allIndexersData.items) { + const indexName = index.name; + const indexData = await umbracoApi.indexer.getByIndexName(indexName); - // Act - await umbracoUi.examineManagement.clickIndexByName(indexName); + // Act + await umbracoUi.examineManagement.clickIndexByName(indexName); - // Assert - await umbracoUi.examineManagement.doesIndexHaveHealthStatus(indexName, indexData.healthStatus); - await umbracoUi.examineManagement.doesIndexPropertyHaveValue('documentCount', indexData.documentCount.toString()); - await umbracoUi.examineManagement.doesIndexPropertyHaveValue('fieldCount', indexData.fieldCount.toString()); - await umbracoUi.examineManagement.doesIndexPropertyHaveValue('CommitCount', indexData.providerProperties.CommitCount.toString()); - await umbracoUi.examineManagement.doesIndexPropertyHaveValue('DefaultAnalyzer', indexData.providerProperties.DefaultAnalyzer); - await umbracoUi.examineManagement.doesIndexPropertyHaveValue('LuceneDirectory', indexData.providerProperties.LuceneDirectory); - await umbracoUi.examineManagement.doesIndexPropertyHaveValue('LuceneIndexFolder', indexData.providerProperties.LuceneIndexFolder); - await umbracoUi.examineManagement.doesIndexPropertyHaveValue('DirectoryFactory', indexData.providerProperties.DirectoryFactory); - await umbracoUi.examineManagement.doesIndexPropertyHaveValue('EnableDefaultEventHandler', indexData.providerProperties.EnableDefaultEventHandler.toString()); - await umbracoUi.examineManagement.doesIndexPropertyHaveValue('PublishedValuesOnly', indexData.providerProperties.PublishedValuesOnly.toString()); + // Assert + await umbracoUi.examineManagement.doesIndexHaveHealthStatus(indexName, indexData.healthStatus); + await umbracoUi.examineManagement.doesIndexPropertyHaveValue('documentCount', indexData.documentCount.toString()); + await umbracoUi.examineManagement.doesIndexPropertyHaveValue('fieldCount', indexData.fieldCount.toString()); + await umbracoUi.examineManagement.doesIndexPropertyHaveValue('CommitCount', indexData.providerProperties.CommitCount.toString()); + await umbracoUi.examineManagement.doesIndexPropertyHaveValue('DefaultAnalyzer', indexData.providerProperties.DefaultAnalyzer); + await umbracoUi.examineManagement.doesIndexPropertyHaveValue('LuceneDirectory', indexData.providerProperties.LuceneDirectory); + await umbracoUi.examineManagement.doesIndexPropertyHaveValue('LuceneIndexFolder', indexData.providerProperties.LuceneIndexFolder); + await umbracoUi.examineManagement.doesIndexPropertyHaveValue('DirectoryFactory', indexData.providerProperties.DirectoryFactory); + await umbracoUi.examineManagement.doesIndexPropertyHaveValue('EnableDefaultEventHandler', indexData.providerProperties.EnableDefaultEventHandler.toString()); + await umbracoUi.examineManagement.doesIndexPropertyHaveValue('PublishedValuesOnly', indexData.providerProperties.PublishedValuesOnly.toString()); + await umbracoUi.goBackPage(); + } }); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/HealthCheck.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/HealthCheck.spec.ts index 96cb9aa3c1..1db7b96c05 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/HealthCheck.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/HealthCheck.spec.ts @@ -41,16 +41,19 @@ test.describe('Health Check Dashboard tests', () => { // Arrange const allHealthChecksData = await umbracoApi.healthCheck.getAll(); if (allHealthChecksData !== undefined) { - const healthCheckName = allHealthChecksData.items[0].name; - const healthCheckData = await umbracoApi.healthCheck.getByName(healthCheckName); - - // Act - await umbracoUi.healthCheck.clickHeathCheckGroupByName(healthCheckName); - - // Assert - for (const check of healthCheckData.checks) { - await umbracoUi.healthCheck.isCheckNameVisible(check.name); - await umbracoUi.healthCheck.isCheckDescriptionVisible(check.description); + for (const healthCheck of allHealthChecksData.items) { + const healthCheckName = healthCheck.name; + const healthCheckData = await umbracoApi.healthCheck.getByName(healthCheckName); + + // Act + await umbracoUi.healthCheck.clickHeathCheckGroupByName(healthCheckName); + + // Assert + for (const check of healthCheckData.checks) { + await umbracoUi.healthCheck.isCheckNameVisible(check.name); + await umbracoUi.healthCheck.isCheckDescriptionVisible(check.description); + } + await umbracoUi.goBackPage(); } } }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/PublishedStatus.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/PublishedStatus.spec.ts index d4817444aa..9a108a6173 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/PublishedStatus.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/PublishedStatus.spec.ts @@ -8,17 +8,17 @@ test.describe('Published Status Dashboard tests', () => { await umbracoUi.publishedStatus.clickPublishedStatusTab(); }); - test('can view and refresh published cache status', async ({umbracoApi, umbracoUi}) => { + test('can refresh published cache status', async ({umbracoApi, umbracoUi}) => { // Arrange - const expectedStatus = await umbracoApi.publishedCache.getStatus(); + const expectedStatus = await umbracoApi.publishedCache.getStatus(); // Act await umbracoUi.publishedStatus.clickRefreshStatusButton(); + // TODO: create a content item, and check if the ContentStore contains the content or not. // Assert await umbracoUi.publishedStatus.isSuccessButtonWithTextVisible('Refresh Status'); await umbracoUi.publishedStatus.isPublishedCacheStatusVisible(expectedStatus); - }); test('can reload the memory cache', async ({umbracoUi}) => {