Verified Commit 1876f3f5 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3271507 by danflanagan8, nod_: Block tests should not rely on Classy 

(cherry picked from commit f88b4a9a)
parent 1a20413c

core/modules/block/tests/src/Functional/BlockCacheTest.php

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class BlockCacheTest extends BrowserTestBase { 
  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'classy';

  protected $defaultTheme = 'stark';



  /**

   * A user with permission to create and edit books and to administer blocks.

core/modules/block/tests/src/Functional/BlockDemoTest.php

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ class BlockDemoTest extends BrowserTestBase { 
  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'classy';

  protected $defaultTheme = 'stark';



  /**

   * Check for the accessibility of the admin block demo page.
@@ -45,7 +45,6 @@ public function testBlockDemo() { 
    // All available themes in core.

    $available_themes = [

      'bartik',

      'classy',

      'olivero',

      'seven',

      'stark',

core/modules/block/tests/src/Functional/BlockFormInBlockTest.php

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class BlockFormInBlockTest extends BrowserTestBase { 
  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'classy';

  protected $defaultTheme = 'stark';



  /**

   * {@inheritdoc}

core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class BlockHiddenRegionTest extends BrowserTestBase { 
  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'classy';

  protected $defaultTheme = 'stark';



  protected function setUp(): void {

    parent::setUp();

core/modules/block/tests/src/Functional/BlockHtmlTest.php

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ class BlockHtmlTest extends BrowserTestBase { 
  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'classy';

  protected $defaultTheme = 'stark';



  protected function setUp(): void {

    parent::setUp();
@@ -34,7 +34,7 @@ protected function setUp(): void { 
    $this->drupalPlaceBlock('test_html', ['id' => 'test_html_block']);



    // Enable a menu block, to test more complicated HTML.

    $this->drupalPlaceBlock('system_menu_block:admin');

    $this->drupalPlaceBlock('system_menu_block:admin', ['id' => 'test_menu_block']);

  }



  /**
@@ -48,7 +48,7 @@ public function testHtml() { 
    $this->assertSession()->elementExists('xpath', '//div[@id="block-test-html-block" and @data-custom-attribute="foo"]');



    // Ensure expected markup for a menu block.

    $elements = $this->xpath('//nav[contains(@class, :nav-class)]/ul[contains(@class, :ul-class)]/li', [':nav-class' => 'block-menu', ':ul-class' => 'menu']);

    $elements = $this->xpath('//nav[@id="block-test-menu-block"]/ul/li');

    $this->assertNotEmpty($elements, 'The proper block markup was found.');

  }