71

Author: tedbow

core/modules/layout_builder/src/Form/MoveBlockForm.php

@@ -3,7 +3,6 @@
 namespace Drupal\layout_builder\Form;
 
 use Drupal\Core\Ajax\AjaxFormHelperTrait;
-use Drupal\Core\DependencyInjection\ClassResolverInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\layout_builder\Controller\LayoutRebuildTrait;
@@ -60,21 +59,17 @@ class MoveBlockForm extends FormBase {
    *
    * @param \Drupal\layout_builder\LayoutTempstoreRepositoryInterface $layout_tempstore_repository
    *   The layout tempstore.
-   * @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
-   *   The class resolver.
    */
-  public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository, ClassResolverInterface $class_resolver) {
+  public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository) {
     $this->layoutTempStore = $layout_tempstore_repository;
-    $this->classResolver = $class_resolver;
   }
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('layout_builder.tempstore_repository'),
-      $container->get('class_resolver')
+      $container->get('layout_builder.tempstore_repository')
     );
   }
 
@@ -86,7 +81,7 @@ public function getFormId() {
   }
 
   /**
-   * Builds block move form.
+   * Builds move block form.
    *
    * @param array $form
    *   An associative array containing the structure of the form.

core/modules/layout_builder/tests/src/FunctionalJavascript/MoveBlockFormTest.php

@@ -119,7 +119,7 @@ public function testMoveBlock() {
       'content',
       $expected_block_order
     );
-    $this->clickLink('Save Layout');
+    $page->pressButton('Save layout');
     $this->assertNotEmpty($assert_session->waitForElementVisible('css', '#edit-manage-layout'));
     $this->clickLink('Manage layout');
     $this->assertRegionBlocksOrder(
@@ -151,7 +151,7 @@ public function testMoveBlock() {
         '.block-extra-field-blocknodebundle-with-section-fieldlinks',
       ]
     );
-    $this->clickLink('Save Layout');
+    $page->pressButton('Save layout');
     $this->assertNotEmpty($assert_session->waitForElementVisible('css', '#edit-manage-layout'));
     $this->clickLink('Manage layout');
     $this->assertRegionBlocksOrder(
@@ -178,7 +178,7 @@ public function testMoveBlock() {
    * Asserts the correct block labels appear in the draggable tables.
    *
    * @param string[] $expected_block_labels
-   *   The expected block lables.
+   *   The expected block labels.
    */
   protected function assertBlockTable(array $expected_block_labels) {
     $page = $this->getSession()->getPage();