From ba592566b4c3ab4df493c7e7eaac98fe692b4f52 Mon Sep 17 00:00:00 2001 From: webchick Date: Thu, 17 Jan 2013 14:28:43 -0800 Subject: [PATCH] Issue #1884758 by xjm, tim.plunkett: Remove testing profile default blocks. --- .../system/Tests/Menu/MenuRouterTest.php | 2 +- .../lib/Drupal/user/Tests/UserBlocksTests.php | 2 +- .../config/plugin.core.block.stark.admin.yml | 21 --------------- .../config/plugin.core.block.stark.online.yml | 27 ------------------- .../config/plugin.core.block.stark.tools.yml | 21 --------------- 5 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 core/profiles/testing/config/plugin.core.block.stark.admin.yml delete mode 100644 core/profiles/testing/config/plugin.core.block.stark.online.yml delete mode 100644 core/profiles/testing/config/plugin.core.block.stark.tools.yml diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php index b5861baf75c..35d23e89870 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php @@ -63,7 +63,7 @@ class MenuRouterTest extends WebTestBase { variable_set('theme_default', $this->default_theme); config('system.theme')->set('admin', $this->admin_theme)->save(); theme_disable(array($this->alternate_theme)); - + $this->drupalPlaceBlock('system_menu_block:menu-tools'); } /** diff --git a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php b/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php index 50a79ea4bc4..052c254c2e7 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php @@ -80,7 +80,7 @@ class UserBlocksTests extends WebTestBase { * Test the Who's Online block. */ function testWhosOnlineBlock() { - $block = entity_load('block', 'stark.online'); + $block = $this->drupalPlaceBlock('user_online_block'); $config = $block->get('settings'); // Generate users. diff --git a/core/profiles/testing/config/plugin.core.block.stark.admin.yml b/core/profiles/testing/config/plugin.core.block.stark.admin.yml deleted file mode 100644 index 5ca8d1fd6b6..00000000000 --- a/core/profiles/testing/config/plugin.core.block.stark.admin.yml +++ /dev/null @@ -1,21 +0,0 @@ -id: stark.admin -plugin: 'system_menu_block:menu-admin' -status: '1' -settings: - cache: '-1' -visibility: - path: - visibility: '0' - pages: '' - role: - roles: { } - node_type: - types: - article: '0' - page: '0' - visibility__active_tab: edit-visibility-path -label: '' -module: system -region: sidebar_first -weight: '0' -langcode: und diff --git a/core/profiles/testing/config/plugin.core.block.stark.online.yml b/core/profiles/testing/config/plugin.core.block.stark.online.yml deleted file mode 100644 index a00e02de8e1..00000000000 --- a/core/profiles/testing/config/plugin.core.block.stark.online.yml +++ /dev/null @@ -1,27 +0,0 @@ -id: stark.online -label: 'Who''s online' -plugin: user_online_block -settings: - properties: - administrative: '1' - seconds_online: '900' - max_list_count: '10' - cache: '-1' -status: '1' -label: 'Who''s online' -visibility: - path: - visibility: '0' - pages: '' - role: - roles: { } - node_type: - types: - article: '0' - page: '0' - poll: '0' - visibility__active_tab: edit-visibility-path -module: user -region: sidebar_first -weight: '0' -langcode: und diff --git a/core/profiles/testing/config/plugin.core.block.stark.tools.yml b/core/profiles/testing/config/plugin.core.block.stark.tools.yml deleted file mode 100644 index d68441ec54c..00000000000 --- a/core/profiles/testing/config/plugin.core.block.stark.tools.yml +++ /dev/null @@ -1,21 +0,0 @@ -id: stark.tools -plugin: 'system_menu_block:menu-tools' -status: '1' -settings: - cache: '-1' -visibility: - path: - visibility: '0' - pages: '' - role: - roles: { } - node_type: - types: - article: '0' - page: '0' - visibility__active_tab: edit-visibility-path -label: '' -module: system -region: sidebar_first -weight: '0' -langcode: und