From fd2f9a07a0af2b36592962d0b3dde6e58963bdcb Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 21 Jul 2020 19:36:44 +0100
Subject: [PATCH] Issue #3160124 by jungle, jameszhang023, alexpott: Fix
 "wiget, escapeable, PHPunit" typos in Core

(cherry picked from commit 0345c33765c4f373497b708a7892f396665c1d2b)
(cherry picked from commit 275ac5ab0e8dfb4c717020b8a400c1c3f5cf3633)
---
 core/lib/Drupal/Core/Test/PhpUnitTestRunner.php        |  2 +-
 .../FunctionalJavascript/ViewsUiIntegrationTest.php    |  2 +-
 .../Tests/Component/Render/HtmlEscapedTextTest.php     | 10 +++++-----
 .../Drupal/Tests/Core/Test/PhpUnitTestRunnerTest.php   |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/lib/Drupal/Core/Test/PhpUnitTestRunner.php b/core/lib/Drupal/Core/Test/PhpUnitTestRunner.php
index 4791252b7bd..ee85a625b1e 100644
--- a/core/lib/Drupal/Core/Test/PhpUnitTestRunner.php
+++ b/core/lib/Drupal/Core/Test/PhpUnitTestRunner.php
@@ -217,7 +217,7 @@ class PhpUnitTestRunner implements ContainerInjectionInterface {
         'test_id' => $test_id,
         'test_class' => implode(",", $unescaped_test_classnames),
         'status' => TestStatus::label($status),
-        'message' => 'PHPunit Test failed to complete; Error: ' . implode("\n", $output),
+        'message' => 'PHPUnit Test failed to complete; Error: ' . implode("\n", $output),
         'message_group' => 'Other',
         'function' => implode(",", $unescaped_test_classnames),
         'line' => '0',
diff --git a/core/modules/media_library/tests/src/FunctionalJavascript/ViewsUiIntegrationTest.php b/core/modules/media_library/tests/src/FunctionalJavascript/ViewsUiIntegrationTest.php
index 7e68f16a5a3..3b5a6f50397 100644
--- a/core/modules/media_library/tests/src/FunctionalJavascript/ViewsUiIntegrationTest.php
+++ b/core/modules/media_library/tests/src/FunctionalJavascript/ViewsUiIntegrationTest.php
@@ -55,7 +55,7 @@ class ViewsUiIntegrationTest extends MediaLibraryTestBase {
     $page->find('css', '.js-media-library-view .view-filters')->pressButton('Apply filters');
     $this->waitForElementsCount('css', '.js-media-library-item', 1);
 
-    // Test the same routine but in the view for the table wiget.
+    // Test the same routine but in the view for the table widget.
     $this->drupalGet('/admin/structure/views/view/media_library/edit/widget_table');
     $this->waitForElementsCount('css', '.js-media-library-item', 8);
 
diff --git a/core/tests/Drupal/Tests/Component/Render/HtmlEscapedTextTest.php b/core/tests/Drupal/Tests/Component/Render/HtmlEscapedTextTest.php
index 5fc3902f0fa..920189e91c6 100644
--- a/core/tests/Drupal/Tests/Component/Render/HtmlEscapedTextTest.php
+++ b/core/tests/Drupal/Tests/Component/Render/HtmlEscapedTextTest.php
@@ -21,9 +21,9 @@ class HtmlEscapedTextTest extends TestCase {
    * @dataProvider providerToString
    */
   public function testToString($text, $expected, $message) {
-    $escapeable_string = new HtmlEscapedText($text);
-    $this->assertEquals($expected, (string) $escapeable_string, $message);
-    $this->assertEquals($expected, $escapeable_string->jsonSerialize());
+    $escapable_string = new HtmlEscapedText($text);
+    $this->assertEquals($expected, (string) $escapable_string, $message);
+    $this->assertEquals($expected, $escapable_string->jsonSerialize());
   }
 
   /**
@@ -57,8 +57,8 @@ class HtmlEscapedTextTest extends TestCase {
    */
   public function testCount() {
     $string = 'Can I please have a <em>kitten</em>';
-    $escapeable_string = new HtmlEscapedText($string);
-    $this->assertEquals(strlen($string), $escapeable_string->count());
+    $escapable_string = new HtmlEscapedText($string);
+    $this->assertEquals(strlen($string), $escapable_string->count());
   }
 
 }
diff --git a/core/tests/Drupal/Tests/Core/Test/PhpUnitTestRunnerTest.php b/core/tests/Drupal/Tests/Core/Test/PhpUnitTestRunnerTest.php
index bd62c430c6d..ce68766de5a 100644
--- a/core/tests/Drupal/Tests/Core/Test/PhpUnitTestRunnerTest.php
+++ b/core/tests/Drupal/Tests/Core/Test/PhpUnitTestRunnerTest.php
@@ -57,7 +57,7 @@ class PhpUnitTestRunnerTest extends UnitTestCase {
       'test_id' => $test_id,
       'test_class' => 'SomeTest',
       'status' => TestStatus::label(TestStatus::EXCEPTION),
-      'message' => 'PHPunit Test failed to complete; Error: ',
+      'message' => 'PHPUnit Test failed to complete; Error: ',
       'message_group' => 'Other',
       'function' => 'SomeTest',
       'line' => '0',