From fd701622fd39e048dbdeca1ba6c5f6e25f2c5999 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 8 Sep 2021 14:18:24 +0200
Subject: [PATCH 1/3] OEL-469: Update composer version of oe_bootstrap_theme.
---
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index 70fe0caa..514f5b71 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
"drupal/core": "^8.9 || ^9.1",
"drupal/ui_patterns": "^1.0",
"drupal/ui_patterns_settings": "^1.0",
- "openeuropa/oe_bootstrap_theme": "1.0.0-alpha1",
+ "openeuropa/oe_bootstrap_theme": "1.x-dev",
"php": ">=7.3"
},
"require-dev": {
--
GitLab
From a8dab950122668072d8bc34b02f7db77a484b477 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 8 Sep 2021 14:18:51 +0200
Subject: [PATCH 2/3] OEL-469: Make test compatible with d9.
---
tests/src/Kernel/SiteBrandingBlockTest.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/src/Kernel/SiteBrandingBlockTest.php b/tests/src/Kernel/SiteBrandingBlockTest.php
index a491a95d..76bfc700 100644
--- a/tests/src/Kernel/SiteBrandingBlockTest.php
+++ b/tests/src/Kernel/SiteBrandingBlockTest.php
@@ -22,9 +22,13 @@ class SiteBrandingBlockTest extends KernelTestBase {
*/
protected function setUp(): void {
parent::setUp();
+ /** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */
+ \Drupal::service('theme_installer')->install(['oe_whitelabel']);
- $this->container->get('theme_installer')->install(['oe_whitelabel']);
- $this->container->get('theme_handler')->setDefault('oe_whitelabel');
+ \Drupal::configFactory()
+ ->getEditable('system.theme')
+ ->set('default', 'oe_whitelabel')
+ ->save();
$this->container->set('theme.registry', NULL);
$this->config('system.site')
->set('name', 'Site name')
--
GitLab
From ca2943e9c74d23cc423e5b834d8c25b27b753155 Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Wed, 8 Sep 2021 13:28:50 +0000
Subject: [PATCH 3/3] OEL-469: Change test from token to base.
---
config/schema/oe_whitelabel.schema.yml | 5 +++++
tests/src/Kernel/SiteBrandingBlockTest.php | 18 +++++++++++++-----
2 files changed, 18 insertions(+), 5 deletions(-)
create mode 100644 config/schema/oe_whitelabel.schema.yml
diff --git a/config/schema/oe_whitelabel.schema.yml b/config/schema/oe_whitelabel.schema.yml
new file mode 100644
index 00000000..4767244a
--- /dev/null
+++ b/config/schema/oe_whitelabel.schema.yml
@@ -0,0 +1,5 @@
+# Schema for the configuration files of the OE Whitelabel theme.
+
+oe_whitelabel.settings:
+ type: theme_settings
+ label: 'OE Whitelabel settings'
diff --git a/tests/src/Kernel/SiteBrandingBlockTest.php b/tests/src/Kernel/SiteBrandingBlockTest.php
index 76bfc700..2cddf783 100644
--- a/tests/src/Kernel/SiteBrandingBlockTest.php
+++ b/tests/src/Kernel/SiteBrandingBlockTest.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
namespace Drupal\Tests\oe_whitelabel\Kernel;
-use Drupal\Tests\token\Kernel\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
use Symfony\Component\DomCrawler\Crawler;
/**
@@ -15,22 +15,30 @@ class SiteBrandingBlockTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['block', 'system'];
+ protected static $modules = ['block', 'system', 'user'];
/**
* {@inheritdoc}
*/
protected function setUp(): void {
parent::setUp();
- /** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */
+
\Drupal::service('theme_installer')->install(['oe_whitelabel']);
+ $this->container->set('theme.registry', NULL);
+ $url = '/' . drupal_get_path('theme', 'oe_whitelabel') . '/logo.svg';
+
+ \Drupal::configFactory()
+ ->getEditable('oe_whitelabel.settings')
+ ->set('logo', ['url' => $url])
+ ->save();
\Drupal::configFactory()
->getEditable('system.theme')
->set('default', 'oe_whitelabel')
->save();
- $this->container->set('theme.registry', NULL);
- $this->config('system.site')
+
+ \Drupal::configFactory()
+ ->getEditable('system.site')
->set('name', 'Site name')
->set('slogan', 'Slogan')
->save();
--
GitLab