Update to Drupal 8.0.0-beta15. For more information, see: https://www.drupal.org/node/2563023

core/modules/block/tests/modules/block_test/block_test.module

@@ -22,19 +22,37 @@ function block_test_block_alter(&$block_info) {
  */
 function block_test_block_view_test_cache_alter(array &$build, BlockPluginInterface $block) {
   if (\Drupal::state()->get('block_test_view_alter_suffix') !== NULL) {
-    $build['#suffix'] = '<br>Goodbye!';
-  }
-  if (\Drupal::state()->get('block_test_view_alter_cache_key') !== NULL) {
-    $build['#cache']['keys'][] = \Drupal::state()->get('block_test_view_alter_cache_key');
-  }
-  if (\Drupal::state()->get('block_test_view_alter_cache_tag') !== NULL) {
-    $build['#cache']['tags'][] = \Drupal::state()->get('block_test_view_alter_cache_tag');
+    $build['#attributes']['foo'] = 'bar';
   }
   if (\Drupal::state()->get('block_test_view_alter_append_pre_render_prefix') !== NULL) {
     $build['#pre_render'][] = 'block_test_pre_render_alter_content';
   }
 }
 
+/**
+ * Implements hook_block_build_BASE_BLOCK_ID_alter().
+ */
+function block_test_block_build_test_cache_alter(array &$build, BlockPluginInterface $block) {
+  // Test altering cache keys, contexts, tags and max-age.
+  if (\Drupal::state()->get('block_test_block_alter_cache_key') !== NULL) {
+    $build['#cache']['keys'][] = \Drupal::state()->get('block_test_block_alter_cache_key');
+  }
+  if (\Drupal::state()->get('block_test_block_alter_cache_context') !== NULL) {
+    $build['#cache']['contexts'][] = \Drupal::state()->get('block_test_block_alter_cache_context');
+  }
+  if (\Drupal::state()->get('block_test_block_alter_cache_tag') !== NULL) {
+    $build['#cache']['tags'] = Cache::mergeTags($build['#cache']['tags'], [\Drupal::state()->get('block_test_block_alter_cache_tag')]);
+  }
+  if (\Drupal::state()->get('block_test_block_alter_cache_max_age') !== NULL) {
+    $build['#cache']['max-age'] = \Drupal::state()->get('block_test_block_alter_cache_max_age');
+  }
+
+  // Test setting #create_placeholder.
+  if (\Drupal::state()->get('block_test_block_alter_create_placeholder') !== NULL) {
+    $build['#create_placeholder'] = \Drupal::state()->get('block_test_block_alter_create_placeholder');
+  }
+}
+
 /**
  * #pre_render callback for a block to alter its content.
  */

core/modules/block/tests/modules/block_test/block_test.routing.yml

@@ -0,0 +1,7 @@
+block_test.test_multipleforms:
+  path: '/test-multiple-forms'
+  defaults:
+    _controller: '\Drupal\block_test\Controller\TestMultipleFormController::testMultipleForms'
+    _title: 'Multiple forms'
+  requirements:
+    _access: 'TRUE'

core/modules/block/tests/modules/block_test/config/schema/block_test.schema.yml

@@ -5,3 +5,6 @@ block.settings.test_block_instantiation:
     display_message:
       type: string
       label: 'Message text'
+
+condition.plugin.baloney_spam:
+  type: condition.plugin

core/modules/block/tests/modules/block_test/src/Controller/TestMultipleFormController.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\block_test\Controller\TestMultipleFormController.
+ */
+
+namespace Drupal\block_test\Controller;
+
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Form\FormState;
+
+/**
+ * Controller for block_test module
+ */
+class TestMultipleFormController  extends ControllerBase {
+
+  public function testMultipleForms() {
+    $form_state = new FormState();
+    $build = [
+      'form1' => $this->formBuilder()->buildForm('\Drupal\block_test\Form\TestForm', $form_state),
+      'form2' => $this->formBuilder()->buildForm('\Drupal\block_test\Form\FavoriteAnimalTestForm', $form_state),
+    ];
+
+    // Output all attached placeholders trough drupal_set_message(), so we can
+    // see if there's only one in the tests.
+    $post_render_callable = function ($elements) {
+      $matches = [];
+      preg_match_all('<form\s(.*?)action="(.*?)"(.*)>', $elements, $matches);
+
+      $action_values = $matches[2];
+
+      foreach ($action_values as $action_value) {
+        drupal_set_message('Form action: ' . $action_value);
+      }
+      return $elements;
+    };
+
+    $build['#post_render'] = [$post_render_callable];
+
+    return $build;
+  }
+
+}

core/modules/block/tests/modules/block_test/src/Form/FavoriteAnimalTestForm.php

@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block_test\Form\FavoriteAnimalTestForm.
+ */
+
+namespace Drupal\block_test\Form;
+
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+class FavoriteAnimalTestForm extends FormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'block_test_form_favorite_animal_test';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['favorite_animal'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Your favorite animal.')
+    ];
+
+    $form['submit_animal'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Submit your chosen animal'),
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    drupal_set_message($this->t('Your favorite animal is: @favorite_animal', ['@favorite_animal' => $form['favorite_animal']['#value']]));
+  }
+
+}

core/modules/block/tests/modules/block_test/src/Form/TestForm.php

@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block_test\Form\TestForm.
+ */
+
+namespace Drupal\block_test\Form;
+
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+class TestForm extends FormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'block_test_form_test';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['email'] = [
+      '#type' => 'email',
+      '#title' => $this->t('Your .com email address.')
+    ];
+
+    $form['show'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Submit'),
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    if (strpos($form_state->getValue('email'), '.com') === FALSE) {
+      $form_state->setErrorByName('email', $this->t('This is not a .com email address.'));
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    drupal_set_message($this->t('Your email address is @email', ['@email' => $form['email']['#value']]));
+  }
+
+}

core/modules/block/tests/modules/block_test/src/Plugin/Block/TestFormBlock.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block_test\Plugin\Block\TestFormBlock.
+ */
+
+namespace Drupal\block_test\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+
+/**
+ * Provides a block to test caching.
+ *
+ * @Block(
+ *   id = "test_form_in_block",
+ *   admin_label = @Translation("Test form block caching")
+ * )
+ */
+class TestFormBlock extends BlockBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+    return \Drupal::formBuilder()->getForm('Drupal\block_test\Form\TestForm');
+  }
+
+}

core/modules/block/tests/modules/block_test/src/Plugin/Condition/BaloneySpam.php

@@ -10,10 +10,10 @@ namespace Drupal\block_test\Plugin\Condition;
 use Drupal\Core\Condition\ConditionPluginBase;
 
 /**
- * Provides a 'baloney.spam' condition.
+ * Provides a 'baloney_spam' condition.
  *
  * @Condition(
- *   id = "baloney.spam",
+ *   id = "baloney_spam",
  *   label = @Translation("Baloney spam"),
  * )
  *

core/modules/block/tests/src/Unit/Plugin/migrate/source/d6/BlockTest.php

@@ -25,7 +25,6 @@ class BlockTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = array(
     // The ID of the entity, can be any string.
     'id' => 'test',
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_block',
     ),