openeuropa · upchuk · Apr 4, 2019 · Mar 29, 2019 · Mar 29, 2019 · Mar 29, 2019
diff --git a/behat.yml.dist b/behat.yml.dist
@@ -21,7 +21,7 @@ default:
               page header: ".ecl-page-header__body"
               priorities dropdown menu: "#nav-menu-expandable-group-3 .ecl-navigation-menu__links"
               search form: ".ecl-search-form"
-              sites switcher: ".demo-block-site-switcher"
+              sites switcher: ".ecl-site-switcher--header"
               dropdown content: ".ecl-link-block__list"
             pages:
               user registration: "/user/register"

diff --git a/config/optional/block.block.oe_theme_site_switcher.yml b/config/optional/block.block.oe_theme_site_switcher.yml
@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - oe_corporate_blocks
+  theme:
+    - oe_theme
+id: oe_theme_site_switcher
+theme: oe_theme
+region: site_top_bar
+weight: 0
+provider: null
+plugin: oe_site_switcher
+settings:
+  id: oe_site_switcher
+  label: 'Site switcher block'
+  provider: oe_corporate_blocks
+  label_display: '0'
+visibility: {  }
diff --git a/modules/oe_theme_demo/README.md b/modules/oe_theme_demo/README.md
@@ -7,9 +7,6 @@ The demo module includes:
 
 - A custom main menu with sub-menu items
 - An overview page for all Drupal-related components called "Style guide"
-- Placeholder blocks like:
- - Language switcher
- - Site switcher
 
 ### Requirements
 

diff --git a/modules/oe_theme_demo/config/optional/block.block.oe_theme_demo_header_site_switcher.yml b/modules/oe_theme_demo/config/optional/block.block.oe_theme_demo_header_site_switcher.yml
diff --git a/modules/oe_theme_demo/oe_theme_demo.demo_blocks.yml b/modules/oe_theme_demo/oe_theme_demo.demo_blocks.yml
diff --git a/modules/oe_theme_demo/oe_theme_demo.info.yml b/modules/oe_theme_demo/oe_theme_demo.info.yml
@@ -6,8 +6,3 @@ package: OpenEuropa
 dependencies:
   - drupal:block
   - styleguide:styleguide
-
-config_devel:
-  optional:
-    - block.block.oe_theme_demo_header_site_switcher
-    - block.block.oe_theme_demo_main_navigation
diff --git a/modules/oe_theme_demo/oe_theme_demo.module b/modules/oe_theme_demo/oe_theme_demo.module
diff --git a/modules/oe_theme_demo/oe_theme_demo.services.yml b/modules/oe_theme_demo/oe_theme_demo.services.yml
diff --git a/modules/oe_theme_demo/src/DemoBlockPluginManager.php b/modules/oe_theme_demo/src/DemoBlockPluginManager.php
diff --git a/modules/oe_theme_demo/src/Plugin/Block/DemoBlock.php b/modules/oe_theme_demo/src/Plugin/Block/DemoBlock.php
diff --git a/modules/oe_theme_demo/src/Plugin/Derivative/DemoBlock.php b/modules/oe_theme_demo/src/Plugin/Derivative/DemoBlock.php
diff --git a/modules/oe_theme_demo/templates/demo-block-header-site-switcher.html.twig b/modules/oe_theme_demo/templates/demo-block-header-site-switcher.html.twig
diff --git a/templates/navigation/oe-corporate-blocks-site-switcher.html.twig b/templates/navigation/oe-corporate-blocks-site-switcher.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override for rendering corporate site switcher block.
+ *
+ * Available variables:
+ * - links: list of site switcher links.
+ *
+ * @ingroup themeable
+ */
+#}
+
+{% include '@ecl/ec-component-site-switcher' with {
+  'variant': 'header',
+  'political': {
+    'href': links.political.href,
+    'label': links.political.label,
+    'is_active': links.political.active
+  },
+  'info': {
+    'href': links.info.href,
+    'label': links.info.label,
+    'is_active': links.info.active
+  },
+} only %}
diff --git a/tests/Kernel/CorporateBlocksFooterTest.php → ...orateBlocks/CorporateBlocksFooterTest.php b/tests/Kernel/CorporateBlocksFooterTest.php → ...orateBlocks/CorporateBlocksFooterTest.php
@@ -2,31 +2,14 @@
 
 declare(strict_types = 1);
 
-namespace Drupal\Tests\oe_theme\Kernel;
+namespace Drupal\Tests\oe_theme\Kernel\CorporateBlocks;
 
 use Symfony\Component\DomCrawler\Crawler;
 
 /**
  * Test footer block rendering.
  */
-class CorporateBlocksFooterTest extends AbstractKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'oe_corporate_blocks',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['oe_corporate_blocks']);
-  }
+class CorporateBlocksFooterTest extends CorporateBlocksTestBase {
 
   /**
    * Array containing data to merge with config object.