Unverified Commit 3668a964 authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Issue #3281454 by _shY, pooja saraah, deviantintegral, quietone, alexpott,... 

Issue #3281454 by _shY, pooja saraah, deviantintegral, quietone, alexpott, nod_: Update various module tests to not use Bartik and Seven

(cherry picked from commit cd700d84)
(cherry picked from commit 8c03eb75)
parent 3a2ddfed

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

+2 −10
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public function testsBlockContentAddTypes() { 
      ->getStorage('block_content');



    // Install all themes.

    $themes = ['bartik', 'olivero', 'seven', 'stark'];

    $themes = ['olivero', 'stark', 'claro'];

    \Drupal::service('theme_installer')->install($themes);

    $theme_settings = $this->config('system.theme');

    foreach ($themes as $default_theme) {
@@ -220,15 +220,7 @@ public function testsBlockContentAddTypes() { 
        $this->drupalGet($path);

        $this->clickLink('Place block');

        $this->clickLink('Add custom block');

        // The seven theme has markup inside the link, we cannot use clickLink().

        if ($default_theme == 'seven') {

          $options = $theme != $default_theme ? ['query' => ['theme' => $theme]] : [];

          $this->assertSession()->linkByHrefExists(Url::fromRoute('block_content.add_form', ['block_content_type' => 'foo'], $options)->toString());

          $this->drupalGet('block/add/foo', $options);

        }

        else {

        $this->clickLink('foo');

        }

        // Create a new block.

        $edit = ['info[0][value]' => $this->randomMachineName(8)];

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

core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public function testModuleBreakpoints() { 
   */

  public function testBreakpointGroups() {

    $expected = [

      'bartik' => 'Bartik',

      'olivero' => 'Olivero',

      'breakpoint_module_test' => 'Breakpoint test module',

      'breakpoint_theme_test' => 'Breakpoint test theme',

      'breakpoint_theme_test.group2' => 'breakpoint_theme_test.group2',

core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ name: 'Breakpoint test theme' 
type: theme

description: 'Test theme for breakpoint.'

version: VERSION

base theme: bartik
 
base theme: olivero

core/modules/ckeditor5/tests/src/Functional/AddedStylesheetsTest.php

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ public function testCkeditorStylesheets() { 


    /** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */

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

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

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

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

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

    $this->config('node.settings')->set('use_admin_theme', TRUE)->save();



    $this->drupalGet('node/add/article');

core/modules/comment/tests/src/Functional/CommentDisplayConfigurableTest.php

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class CommentDisplayConfigurableTest extends CommentTestBase { 
  /**

   * {@inheritdoc}

   */

  protected $defaultTheme = 'bartik';

  protected $defaultTheme = 'olivero';



  protected function setUp(): void {

    parent::setUp();