--- /dev/null
+<?php
+
+namespace Drupal\Tests\block_content\Functional;
+
+use Drupal\block_content\Entity\BlockContent;
+use Drupal\Component\Utility\Unicode;
+
+/**
+ * Create a block and test block edit functionality.
+ *
+ * @group block_content
+ */
+class PageEditTest extends BlockContentTestBase {
+
+ protected function setUp() {
+ parent::setUp();
+
+ $this->drupalPlaceBlock('page_title_block');
+ }
+
+ /**
+ * Checks block edit functionality.
+ */
+ public function testPageEdit() {
+ $this->drupalLogin($this->adminUser);
+
+ $title_key = 'info[0][value]';
+ $body_key = 'body[0][value]';
+ // Create block to edit.
+ $edit = [];
+ $edit['info[0][value]'] = Unicode::strtolower($this->randomMachineName(8));
+ $edit[$body_key] = $this->randomMachineName(16);
+ $this->drupalPostForm('block/add/basic', $edit, t('Save'));
+
+ // Check that the block exists in the database.
+ $blocks = \Drupal::entityQuery('block_content')->condition('info', $edit['info[0][value]'])->execute();
+ $block = BlockContent::load(reset($blocks));
+ $this->assertTrue($block, 'Custom block found in database.');
+
+ // Load the edit page.
+ $this->drupalGet('block/' . $block->id());
+ $this->assertFieldByName($title_key, $edit[$title_key], 'Title field displayed.');
+ $this->assertFieldByName($body_key, $edit[$body_key], 'Body field displayed.');
+
+ // Edit the content of the block.
+ $edit = [];
+ $edit[$title_key] = $this->randomMachineName(8);
+ $edit[$body_key] = $this->randomMachineName(16);
+ // Stay on the current page, without reloading.
+ $this->drupalPostForm(NULL, $edit, t('Save'));
+
+ // Edit the same block, creating a new revision.
+ $this->drupalGet("block/" . $block->id());
+ $edit = [];
+ $edit['info[0][value]'] = $this->randomMachineName(8);
+ $edit[$body_key] = $this->randomMachineName(16);
+ $edit['revision'] = TRUE;
+ $this->drupalPostForm(NULL, $edit, t('Save'));
+
+ // Ensure that the block revision has been created.
+ \Drupal::entityManager()->getStorage('block_content')->resetCache([$block->id()]);
+ $revised_block = BlockContent::load($block->id());
+ $this->assertNotIdentical($block->getRevisionId(), $revised_block->getRevisionId(), 'A new revision has been created.');
+
+ // Test deleting the block.
+ $this->drupalGet("block/" . $revised_block->id());
+ $this->clickLink(t('Delete'));
+ $this->assertText(format_string('Are you sure you want to delete the custom block @label?', ['@label' => $revised_block->label()]));
+ }
+
+}