Issue #3267644 by danflanagan8, mglaman: Custom Block (block_content) tests...

Issue #3267644 by danflanagan8, mglaman: Custom Block (block_content) tests should not rely on Classy

core/modules/block_content/tests/modules/block_content_test/config/install/block.block.foobargorilla.yml

@@ -4,9 +4,9 @@ dependencies:
   module:
     - block_content
   theme:
-    - classy
+    - stark
 id: foobargorilla
-theme: classy
+theme: stark
 region: content
 weight: null
 provider: null

core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php

@@ -25,7 +25,7 @@ class BlockContentCreationTest extends BlockContentTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * Permissions to grant admin user.

core/modules/block_content/tests/src/Functional/BlockContentListTest.php

@@ -25,7 +25,7 @@ class BlockContentListTest extends BlockContentTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * Tests the custom block listing page.
@@ -65,11 +65,10 @@ public function testListing() {
     $this->assertSession()->elementTextContains('xpath', '//td', $label);
 
     // Check the number of table row cells.
-    $this->assertSession()->elementsCount('xpath', '//div[@class="layout-content"]//table/tbody/tr[@class="odd"]/td', 2);
-    // Check the contents of each row cell. The first cell contains the label,
-    // the second contains the machine name, and the third contains the
-    // operations list.
-    $this->assertSession()->elementTextEquals('xpath', '//div[@class="layout-content"]//table/tbody/tr[@class="odd"]/td[1]', $label);
+    $this->assertSession()->elementsCount('xpath', '//div[@class="layout-content"]//table/tbody/tr[1]/td', 2);
+    // Check the contents of the row. The first cell contains the label,
+    // and the second contains the operations list.
+    $this->assertSession()->elementTextEquals('xpath', '//div[@class="layout-content"]//table/tbody/tr[1]/td[1]', $label);
 
     // Edit the entity using the operations link.
     $blocks = $this->container

core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php

@@ -19,7 +19,7 @@ class BlockContentPageViewTest extends BlockContentTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * Checks block edit and fallback functionality.

core/modules/block_content/tests/src/Functional/BlockContentSaveTest.php

@@ -21,7 +21,7 @@ class BlockContentSaveTest extends BlockContentTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * Sets the test up.

core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php

@@ -25,7 +25,7 @@ class BlockContentTypeTest extends BlockContentTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * Permissions to grant admin user.

core/modules/block_content/tests/src/Functional/UnpublishedBlockTest.php

@@ -23,7 +23,7 @@ class UnpublishedBlockTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * Tests unpublishing of block_content entities.
@@ -35,18 +35,18 @@ public function testViewShowsCorrectStates() {
     ]);
     $block_content->save();
 
-    $this->placeBlock('block_content:' . $block_content->uuid());
+    $block = $this->placeBlock('block_content:' . $block_content->uuid());
 
     $this->drupalGet('<front>');
     $page = $this->getSession()->getPage();
-    $this->assertTrue($page->has('css', '.block-block-content' . $block_content->uuid()));
+    $this->assertTrue($page->has('css', '#block-' . $block->id()));
 
     $block_content->setUnpublished();
     $block_content->save();
 
     $this->drupalGet('<front>');
     $page = $this->getSession()->getPage();
-    $this->assertFalse($page->has('css', '.block-block-content' . $block_content->uuid()));
+    $this->assertFalse($page->has('css', '#block-' . $block->id()));
   }
 
 }