Commit 1684cd54 authored by catch's avatar catch
Browse files

Issue #3281429 by tinto, nod_, deviantintegral, lauriii: Update Block... 

Issue #3281429 by tinto, nod_, deviantintegral, lauriii: Update Block non-Migration tests to not use Bartik and Seven

(cherry picked from commit 763577f8)
parent 7cb838f7

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

+9 −9
Original line number Diff line number Diff line
@@ -36,22 +36,22 @@ public function testAdminTheme() { 


    // Ensure that access to block admin page is denied when theme is not

    // installed.

    $this->drupalGet('admin/structure/block/list/bartik');

    $this->drupalGet('admin/structure/block/list/olivero');

    $this->assertSession()->statusCodeEquals(403);



    // Install admin theme and confirm that tab is accessible.

    \Drupal::service('theme_installer')->install(['bartik']);

    $edit['admin_theme'] = 'bartik';

    \Drupal::service('theme_installer')->install(['olivero']);

    $edit['admin_theme'] = 'olivero';

    $this->drupalGet('admin/appearance');

    $this->submitForm($edit, 'Save configuration');

    $this->drupalGet('admin/structure/block/list/bartik');

    $this->drupalGet('admin/structure/block/list/olivero');

    $this->assertSession()->statusCodeEquals(200);

  }



  /**

   * Ensure contextual links are disabled in Seven theme.

   * Ensure contextual links are disabled in Claro theme.

   */

  public function testSevenAdminTheme() {

  public function testClaroAdminTheme() {

    // Create administrative user.

    $admin_user = $this->drupalCreateUser([

      'access administration pages',
@@ -62,14 +62,14 @@ public function testSevenAdminTheme() { 
    $this->drupalLogin($admin_user);



    // Install admin theme and confirm that tab is accessible.

    \Drupal::service('theme_installer')->install(['seven']);

    $edit['admin_theme'] = 'seven';

    \Drupal::service('theme_installer')->install(['claro']);

    $edit['admin_theme'] = 'claro';

    $this->drupalGet('admin/appearance');

    $this->submitForm($edit, 'Save configuration');



    // Define our block settings.

    $settings = [

      'theme' => 'seven',

      'theme' => 'claro',

      'region' => 'header',

    ];

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

+1 −2
Original line number Diff line number Diff line
@@ -44,9 +44,8 @@ public function testBlockDemo() { 


    // All available themes in core.

    $available_themes = [

      'bartik',

      'olivero',

      'seven',

      'claro',

      'stark',

    ];

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

+5 −6
Original line number Diff line number Diff line
@@ -270,9 +270,8 @@ public function testBlock() { 
  public function testBlockThemeSelector() {

    // Install all themes.

    $themes = [

      'bartik',

      'olivero',

      'seven',

      'claro',

      'stark',

    ];

    \Drupal::service('theme_installer')->install($themes);
@@ -530,14 +529,14 @@ public function testUninstallTheme() { 
    /** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */

    $theme_installer = \Drupal::service('theme_installer');



    $theme_installer->install(['seven']);

    $this->config('system.theme')->set('default', 'seven')->save();

    $block = $this->drupalPlaceBlock('system_powered_by_block', ['theme' => 'seven', 'region' => 'help']);

    $theme_installer->install(['claro']);

    $this->config('system.theme')->set('default', 'claro')->save();

    $block = $this->drupalPlaceBlock('system_powered_by_block', ['theme' => 'claro', 'region' => 'help']);

    $this->drupalGet('<front>');

    $this->assertSession()->pageTextContains('Powered by Drupal');



    $this->config('system.theme')->set('default', 'stark')->save();

    $theme_installer->uninstall(['seven']);

    $theme_installer->uninstall(['claro']);



    // Ensure that the block configuration does not exist anymore.

    $this->assertNull(Block::load($block->id()));

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

+3 −3
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ public function testNonDefaultBlockAdmin() { 
      'administer themes',

    ]);

    $this->drupalLogin($admin_user);

    $new_theme = 'bartik';

    $new_theme = 'olivero';

    \Drupal::service('theme_installer')->install([$new_theme]);

    // Ensure that the Bartik tab is shown.

    // Ensure that the Olivero tab is shown.

    $this->drupalGet('admin/structure/block/list/' . $new_theme);

    $this->assertSession()->pageTextContains('Bartik(active tab)');

    $this->assertSession()->pageTextContains('Olivero(active tab)');

  }



}

core/modules/block/tests/src/FunctionalJavascript/BlockAddTest.php

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class BlockAddTest extends WebDriverTestBase { 
   * Tests the AJAX for the theme selector.

   */

  public function testBlockAddThemeSelector() {

    \Drupal::service('theme_installer')->install(['seven']);

    \Drupal::service('theme_installer')->install(['claro']);



    $this->drupalLogin($this->drupalCreateUser([

      'administer blocks',
@@ -37,7 +37,7 @@ public function testBlockAddThemeSelector() { 
    $this->drupalGet('admin/structure/block/add/system_powered_by_block');

    $assert_session = $this->assertSession();

    // Pick a theme with a region that does not exist in another theme.

    $assert_session->selectExists('Theme')->selectOption('seven');

    $assert_session->selectExists('Theme')->selectOption('claro');

    $assert_session->assertWaitOnAjaxRequest();

    $assert_session->selectExists('Region')->selectOption('pre_content');

    $assert_session->assertWaitOnAjaxRequest();