From 000639b0690507e89beba3ca08711bec199c5613 Mon Sep 17 00:00:00 2001
From: Ted Bowman <ted+git@tedbow.com>
Date: Mon, 4 Dec 2023 15:38:54 -0500
Subject: [PATCH] update test expectations
---
.../StatusCheckerRunAfterUpdateTest.php | 16 ++++++----------
.../StatusCheckerRunAfterUpdateTest.php | 16 ++++++----------
2 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/automatic_updates_extensions/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php b/automatic_updates_extensions/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php
index 6e38eaf962..cd782c22e1 100644
--- a/automatic_updates_extensions/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php
+++ b/automatic_updates_extensions/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php
@@ -79,23 +79,19 @@ class StatusCheckerRunAfterUpdateTest extends UpdaterFormTestBase {
$page->clickLink('Apply pending updates');
$this->checkForMetaRefresh();
$assert_session->pageTextContains('Updates were attempted.');
- // PendingUpdatesValidator prevented the update to complete, so the status
- // checks weren't run.
- $this->drupalGet('/admin');
- $assert_session->pageTextContains('Your site has not recently run an update readiness check. Rerun readiness checks now.');
}
else {
$page->pressButton('Continue');
$this->checkForMetaRefresh();
$assert_session->addressEquals('/admin/reports/updates');
$assert_session->pageTextContainsOnce('Update complete!');
- // Status checks should display errors on admin page.
- $this->drupalGet('/admin');
- // Confirm that the status checks were run and the new error is displayed.
- $assert_session->statusMessageContains('Error before continue.', 'error');
- $assert_session->statusMessageContains('Your site does not pass some readiness checks for automatic updates. It cannot be automatically updated until further action is performed.', 'error');
- $assert_session->pageTextNotContains('Your site has not recently run an update readiness check. Rerun readiness checks now.');
}
+ // Status checks should display errors on admin page.
+ $this->drupalGet('/admin');
+ // Confirm that the status checks were run and the new error is displayed.
+ $assert_session->statusMessageContains('Error before continue.', 'error');
+ $assert_session->statusMessageContains('Your site does not pass some readiness checks for automatic updates. It cannot be automatically updated until further action is performed.', 'error');
+ $assert_session->pageTextNotContains('Your site has not recently run an update readiness check. Rerun readiness checks now.');
}
}
diff --git a/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php b/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php
index b057b37a22..25befea759 100644
--- a/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php
+++ b/tests/src/Functional/StatusCheckerRunAfterUpdateTest.php
@@ -75,23 +75,19 @@ class StatusCheckerRunAfterUpdateTest extends UpdaterFormTestBase {
$page->clickLink('Apply pending updates');
$this->checkForMetaRefresh();
$assert_session->pageTextContains('Updates were attempted.');
- // PendingUpdatesValidator prevented the update to complete, so the status
- // checks weren't run.
- $this->drupalGet('/admin');
- $assert_session->pageTextContains('Your site has not recently run an update readiness check. Rerun readiness checks now.');
}
else {
$page->pressButton('Continue');
$this->checkForMetaRefresh();
$assert_session->addressEquals('/admin/reports/updates');
$assert_session->pageTextContainsOnce('Update complete!');
- // Status checks should display errors on admin page.
- $this->drupalGet('/admin');
- // Confirm that the status checks were run and the new error is displayed.
- $assert_session->statusMessageContains('Error before continue.', 'error');
- $assert_session->statusMessageContains('Your site does not pass some readiness checks for automatic updates. It cannot be automatically updated until further action is performed.', 'error');
- $assert_session->pageTextNotContains('Your site has not recently run an update readiness check. Rerun readiness checks now.');
}
+ // Status checks should display errors on admin page.
+ $this->drupalGet('/admin');
+ // Confirm that the status checks were run and the new error is displayed.
+ $assert_session->statusMessageContains('Error before continue.', 'error');
+ $assert_session->statusMessageContains('Your site does not pass some readiness checks for automatic updates. It cannot be automatically updated until further action is performed.', 'error');
+ $assert_session->pageTextNotContains('Your site has not recently run an update readiness check. Rerun readiness checks now.');
}
}
--
GitLab