Commit eb99b79b authored by alexpott's avatar alexpott
Browse files

Issue #2604974 by Chi, tstoeckler, dcrocks, Edit Olah: Hide "Powered by...

Issue #2604974 by Chi, tstoeckler, dcrocks, Edit Olah: Hide "Powered by Drupal" block title by default
parent 6aed5822
...@@ -32,6 +32,7 @@ function testBlockVisibility() { ...@@ -32,6 +32,7 @@ function testBlockVisibility() {
'id' => strtolower($this->randomMachineName(8)), 'id' => strtolower($this->randomMachineName(8)),
'region' => 'sidebar_first', 'region' => 'sidebar_first',
'settings[label]' => $title, 'settings[label]' => $title,
'settings[label_display]' => TRUE,
); );
// Set the block to be hidden on any user path, and to be shown only to // Set the block to be hidden on any user path, and to be shown only to
// authenticated users. // authenticated users.
...@@ -142,11 +143,12 @@ function testBlock() { ...@@ -142,11 +143,12 @@ function testBlock() {
$block = array(); $block = array();
$block['id'] = 'system_powered_by_block'; $block['id'] = 'system_powered_by_block';
$block['settings[label]'] = $this->randomMachineName(8); $block['settings[label]'] = $this->randomMachineName(8);
$block['settings[label_display]'] = TRUE;
$block['theme'] = $this->config('system.theme')->get('default'); $block['theme'] = $this->config('system.theme')->get('default');
$block['region'] = 'header'; $block['region'] = 'header';
// Set block title to confirm that interface works and override any custom titles. // Set block title to confirm that interface works and override any custom titles.
$this->drupalPostForm('admin/structure/block/add/' . $block['id'] . '/' . $block['theme'], array('settings[label]' => $block['settings[label]'], 'id' => $block['id'], 'region' => $block['region']), t('Save block')); $this->drupalPostForm('admin/structure/block/add/' . $block['id'] . '/' . $block['theme'], array('settings[label]' => $block['settings[label]'], 'settings[label_display]' => $block['settings[label_display]'], 'id' => $block['id'], 'region' => $block['region']), t('Save block'));
$this->assertText(t('The block configuration has been saved.'), 'Block title set.'); $this->assertText(t('The block configuration has been saved.'), 'Block title set.');
// Check to see if the block was created by checking its configuration. // Check to see if the block was created by checking its configuration.
$instance = Block::load($block['id']); $instance = Block::load($block['id']);
...@@ -255,19 +257,19 @@ function testHideBlockTitle() { ...@@ -255,19 +257,19 @@ function testHideBlockTitle() {
$this->assertText('The block configuration has been saved.', 'Block was saved'); $this->assertText('The block configuration has been saved.', 'Block was saved');
$this->drupalGet('user'); $this->drupalGet('user');
$this->assertText($title, 'Block title was displayed by default.'); $this->assertNoText($title, 'Block title was not displayed by default.');
$edit = array( $edit = array(
'settings[label_display]' => FALSE, 'settings[label_display]' => TRUE,
); );
$this->drupalPostForm('admin/structure/block/manage/' . $id, $edit, t('Save block')); $this->drupalPostForm('admin/structure/block/manage/' . $id, $edit, t('Save block'));
$this->assertText('The block configuration has been saved.', 'Block was saved'); $this->assertText('The block configuration has been saved.', 'Block was saved');
$this->drupalGet('admin/structure/block/manage/' . $id); $this->drupalGet('admin/structure/block/manage/' . $id);
$this->assertNoFieldChecked('edit-settings-label-display', 'The display_block option has the correct default value on the configuration form.'); $this->assertFieldChecked('edit-settings-label-display', 'The display_block option has the correct default value on the configuration form.');
$this->drupalGet('user'); $this->drupalGet('user');
$this->assertNoText($title, 'Block title was not displayed when hidden.'); $this->assertText($title, 'Block title was displayed when enabled.');
} }
/** /**
......
...@@ -19,6 +19,13 @@ ...@@ -19,6 +19,13 @@
*/ */
class SystemPoweredByBlock extends BlockBase { class SystemPoweredByBlock extends BlockBase {
/**
* {@inheritdoc}
*/
public function defaultConfiguration() {
return ['label_display' => FALSE];
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment