From 4df12ef6daa873b219a004cc52f9352f3f7bf631 Mon Sep 17 00:00:00 2001 From: tedbow <tedbow@240860.no-reply.drupal.org> Date: Thu, 23 Sep 2021 18:34:06 +0000 Subject: [PATCH] Issue #3238866 by tedbow: Change "Download these updates" button to "Update" --- src/Form/UpdaterForm.php | 2 +- tests/src/Build/CoreUpdateTest.php | 2 +- tests/src/Functional/UpdaterFormTest.php | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Form/UpdaterForm.php b/src/Form/UpdaterForm.php index 65762315ac..78b6cc4405 100644 --- a/src/Form/UpdaterForm.php +++ b/src/Form/UpdaterForm.php @@ -216,7 +216,7 @@ class UpdaterForm extends FormBase { else { $actions['submit'] = [ '#type' => 'submit', - '#value' => $this->t('Download these updates'), + '#value' => $this->t('Update'), ]; } return $actions; diff --git a/tests/src/Build/CoreUpdateTest.php b/tests/src/Build/CoreUpdateTest.php index 78612ad577..d391cda0be 100644 --- a/tests/src/Build/CoreUpdateTest.php +++ b/tests/src/Build/CoreUpdateTest.php @@ -122,7 +122,7 @@ class CoreUpdateTest extends UpdateTestBase { $assert_session->pageTextContains('There is a security update available for your version of Drupal.'); $page->clickLink('Automatic Updates'); $assert_session->pageTextNotContains('There is a security update available for your version of Drupal.'); - $page->pressButton('Download these updates'); + $page->pressButton('Update'); $this->waitForBatchJob(); $assert_session->pageTextContains('Ready to update'); $page->pressButton('Continue'); diff --git a/tests/src/Functional/UpdaterFormTest.php b/tests/src/Functional/UpdaterFormTest.php index 73e0d983b1..df68ffc7b1 100644 --- a/tests/src/Functional/UpdaterFormTest.php +++ b/tests/src/Functional/UpdaterFormTest.php @@ -79,7 +79,7 @@ class UpdaterFormTest extends BrowserTestBase { $assert_session = $this->assertSession(); $assert_session->statusCodeEquals(200); $assert_session->pageTextContains('No update available'); - $assert_session->buttonNotExists('Download these updates'); + $assert_session->buttonNotExists('Update'); } /** @@ -144,7 +144,7 @@ class UpdaterFormTest extends BrowserTestBase { // If a validator raises an error during readiness checking, the form should // not have a submit button. $this->drupalGet('/admin/modules/automatic-update'); - $assert_session->buttonNotExists('Download these updates'); + $assert_session->buttonNotExists('Update'); // Since this is an administrative page, the error message should be visible // thanks to automatic_updates_page_top(). The readiness checks were re-run // during the form build, which means the new error should be cached and @@ -162,7 +162,7 @@ class UpdaterFormTest extends BrowserTestBase { $session->reload(); $assert_session->pageTextNotContains(static::$errorsExplanation); $assert_session->pageTextNotContains(static::$warningsExplanation); - $page->pressButton('Download these updates'); + $page->pressButton('Update'); $this->checkForMetaRefresh(); $assert_session->pageTextContainsOnce('An error has occurred.'); $page->clickLink('the error page'); @@ -176,7 +176,7 @@ class UpdaterFormTest extends BrowserTestBase { // be halted. TestChecker1::setTestResult($expected_results, AutomaticUpdatesEvents::PRE_START); $this->deleteStagedUpdate(); - $page->pressButton('Download these updates'); + $page->pressButton('Update'); $this->checkForMetaRefresh(); $assert_session->pageTextContainsOnce('An error has occurred.'); $page->clickLink('the error page'); @@ -190,7 +190,7 @@ class UpdaterFormTest extends BrowserTestBase { TestChecker1::setTestResult($expected_results, AutomaticUpdatesEvents::PRE_START); $session->reload(); $this->deleteStagedUpdate(); - $page->pressButton('Download these updates'); + $page->pressButton('Update'); $this->checkForMetaRefresh(); $assert_session->pageTextContains('Ready to update'); } -- GitLab