upgrades core to 8.4.2

2017-11-14 16:09:54 +01:00
parent bd60eff9b3
commit c2b4e25be4
3504 changed files with 140306 additions and 38684 deletions
@@ -8,8 +8,8 @@ configure: entity.shortcut_set.collection
 dependencies:
  - link

-# Information added by Drupal.org packaging script on 2017-08-16
-version: '8.3.7'
+# Information added by Drupal.org packaging script on 2017-11-03
+version: '8.4.2'
 core: '8.x'
 project: 'drupal'
-datestamp: 1502903957
+datestamp: 1509719929
@@ -18,6 +18,7 @@ use Drupal\shortcut\ShortcutInterface;
 * @ContentEntityType(
 *   id = "shortcut",
 *   label = @Translation("Shortcut link"),
+ *   bundle_label = @Translation("Shortcut set"),
 *   handlers = {
 *     "access" = "Drupal\shortcut\ShortcutAccessControlHandler",
 *     "form" = {
@@ -9,7 +9,7 @@ use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 *
 * @MigrateSource(
 *   id = "d7_shortcut",
- *   source_provider = "shortcut"
+ *   source_module = "shortcut"
 * )
 */
 class Shortcut extends DrupalSqlBase {
@@ -9,7 +9,7 @@ use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 *
 * @MigrateSource(
 *   id = "d7_shortcut_set",
- *   source_provider = "shortcut"
+ *   source_module = "shortcut"
 * )
 */
 class ShortcutSet extends DrupalSqlBase {
@@ -9,7 +9,7 @@ use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 *
 * @MigrateSource(
 *   id = "d7_shortcut_set_users",
- *   source_provider = "shortcut"
+ *   source_module = "shortcut"
 * )
 */
 class ShortcutSetUsers extends DrupalSqlBase {
@@ -2,6 +2,8 @@

 namespace Drupal\shortcut\Tests;

+@trigger_error(__NAMESPACE__ . '\ShortcutTestBase is deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\shortcut\Functional\ShortcutTestBase, see https://www.drupal.org/node/2906736.', E_USER_DEPRECATED);
+
 use Drupal\shortcut\Entity\Shortcut;
 use Drupal\shortcut\Entity\ShortcutSet;
 use Drupal\shortcut\ShortcutSetInterface;
@@ -9,6 +11,11 @@ use Drupal\simpletest\WebTestBase;

 /**
 * Defines base class for shortcut test cases.
+ *
+ * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\Tests\shortcut\Functional\ShortcutTestBase.
+ *
+ * @see https://www.drupal.org/node/2906736
 */
 abstract class ShortcutTestBase extends WebTestBase {

@@ -0,0 +1,465 @@
+<?php
+
+namespace Drupal\Tests\shortcut\Functional;
+
+use Drupal\block_content\Entity\BlockContentType;
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Core\Url;
+use Drupal\shortcut\Entity\Shortcut;
+use Drupal\shortcut\Entity\ShortcutSet;
+use Drupal\Tests\block\Functional\AssertBlockAppearsTrait;
+use Drupal\views\Entity\View;
+
+/**
+ * Create, view, edit, delete, and change shortcut links.
+ *
+ * @group shortcut
+ */
+class ShortcutLinksTest extends ShortcutTestBase {
+
+  use AssertBlockAppearsTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['router_test', 'views', 'block'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->drupalPlaceBlock('page_title_block');
+  }
+
+  /**
+   * Tests that creating a shortcut works properly.
+   */
+  public function testShortcutLinkAdd() {
+    $set = $this->set;
+
+    // Create an alias for the node so we can test aliases.
+    $path = [
+      'source' => '/node/' . $this->node->id(),
+      'alias' => '/' . $this->randomMachineName(8),
+    ];
+    $this->container->get('path.alias_storage')->save($path['source'], $path['alias']);
+
+    // Create some paths to test.
+    $test_cases = [
+      '/',
+      '/admin',
+      '/admin/config/system/site-information',
+      '/node/' . $this->node->id() . '/edit',
+      $path['alias'],
+      '/router_test/test2',
+      '/router_test/test3/value',
+    ];
+
+    $test_cases_non_access = [
+      '/admin',
+      '/admin/config/system/site-information',
+    ];
+
+    // Check that each new shortcut links where it should.
+    foreach ($test_cases as $test_path) {
+      $title = $this->randomMachineName();
+      $form_data = [
+        'title[0][value]' => $title,
+        'link[0][uri]' => $test_path,
+      ];
+      $this->drupalPostForm('admin/config/user-interface/shortcut/manage/' . $set->id() . '/add-link', $form_data, t('Save'));
+      $this->assertResponse(200);
+      $this->assertText(t('Added a shortcut for @title.', ['@title' => $title]));
+      $saved_set = ShortcutSet::load($set->id());
+      $paths = $this->getShortcutInformation($saved_set, 'link');
+      $this->assertTrue(in_array('internal:' . $test_path, $paths), 'Shortcut created: ' . $test_path);
+
+      if (in_array($test_path, $test_cases_non_access)) {
+        $this->assertNoLink($title, SafeMarkup::format('Shortcut link %url not accessible on the page.', ['%url' => $test_path]));
+      }
+      else {
+        $this->assertLink($title, 0, SafeMarkup::format('Shortcut link %url found on the page.', ['%url' => $test_path]));
+      }
+    }
+    $saved_set = ShortcutSet::load($set->id());
+    // Test that saving and re-loading a shortcut preserves its values.
+    $shortcuts = $saved_set->getShortcuts();
+    foreach ($shortcuts as $entity) {
+      // Test the node routes with parameters.
+      $entity->save();
+      $loaded = Shortcut::load($entity->id());
+      $this->assertEqual($entity->link->uri, $loaded->link->uri);
+      $this->assertEqual($entity->link->options, $loaded->link->options);
+    }
+
+    // Log in as non admin user, to check that access is checked when creating
+    // shortcuts.
+    $this->drupalLogin($this->shortcutUser);
+    $title = $this->randomMachineName();
+    $form_data = [
+      'title[0][value]' => $title,
+      'link[0][uri]' => '/admin',
+    ];
+    $this->drupalPostForm('admin/config/user-interface/shortcut/manage/' . $set->id() . '/add-link', $form_data, t('Save'));
+    $this->assertResponse(200);
+    $this->assertRaw(t("The path '@link_path' is inaccessible.", ['@link_path' => '/admin']));
+
+    $form_data = [
+      'title[0][value]' => $title,
+      'link[0][uri]' => '/node',
+    ];
+    $this->drupalPostForm('admin/config/user-interface/shortcut/manage/' . $set->id() . '/add-link', $form_data, t('Save'));
+    $this->assertLink($title, 0, 'Shortcut link found on the page.');
+
+    // Create a new shortcut set and add a link to it.
+    $this->drupalLogin($this->adminUser);
+    $edit = [
+      'label' => $this->randomMachineName(),
+      'id' => strtolower($this->randomMachineName()),
+    ];
+    $this->drupalPostForm('admin/config/user-interface/shortcut/add-set', $edit, t('Save'));
+    $title = $this->randomMachineName();
+    $form_data = [
+      'title[0][value]' => $title,
+      'link[0][uri]' => '/admin',
+    ];
+    $this->drupalPostForm('admin/config/user-interface/shortcut/manage/' . $edit['id'] . '/add-link', $form_data, t('Save'));
+    $this->assertResponse(200);
+  }
+
+  /**
+   * Tests that the "add to shortcut" and "remove from shortcut" links work.
+   */
+  public function testShortcutQuickLink() {
+    \Drupal::service('theme_handler')->install(['seven']);
+    $this->config('system.theme')->set('admin', 'seven')->save();
+    $this->config('node.settings')->set('use_admin_theme', '1')->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->drupalLogin($this->rootUser);
+    $this->drupalGet('admin/config/system/cron');
+
+    // Test the "Add to shortcuts" link.
+    $this->clickLink('Add to Default shortcuts');
+    $this->assertText('Added a shortcut for Cron.');
+    $this->assertLink('Cron', 0, 'Shortcut link found on page');
+
+    $this->drupalGet('admin/structure');
+    $this->assertLink('Cron', 0, 'Shortcut link found on different page');
+
+    // Test the "Remove from shortcuts" link.
+    $this->clickLink('Cron');
+    $this->clickLink('Remove from Default shortcuts');
+    $this->assertText('The shortcut Cron has been deleted.');
+    $this->assertNoLink('Cron', 'Shortcut link removed from page');
+
+    $this->drupalGet('admin/structure');
+    $this->assertNoLink('Cron', 'Shortcut link removed from different page');
+
+    $this->drupalGet('admin/people');
+
+    // Test the "Add to shortcuts" link for a page generated by views.
+    $this->clickLink('Add to Default shortcuts');
+    $this->assertText('Added a shortcut for People.');
+    $this->assertShortcutQuickLink('Remove from Default shortcuts');
+
+    // Test the "Remove from  shortcuts" link for a page generated by views.
+    $this->clickLink('Remove from Default shortcuts');
+    $this->assertText('The shortcut People has been deleted.');
+    $this->assertShortcutQuickLink('Add to Default shortcuts');
+
+    // Test two pages which use same route name but different route parameters.
+    $this->drupalGet('node/add/page');
+    // Add Shortcut for Basic Page.
+    $this->clickLink('Add to Default shortcuts');
+    $this->assertText('Added a shortcut for Create Basic page.');
+    // Assure that Article does not have its shortcut indicated as set.
+    $this->drupalGet('node/add/article');
+    $link = $this->xpath('//a[normalize-space()=:label]', [':label' => 'Remove from Default shortcuts']);
+    $this->assertTrue(empty($link), 'Link Remove to Default shortcuts not found for Create Article page.');
+    // Add Shortcut for Article.
+    $this->clickLink('Add to Default shortcuts');
+    $this->assertText('Added a shortcut for Create Article.');
+
+    $this->config('system.theme')->set('default', 'seven')->save();
+    $this->drupalGet('node/' . $this->node->id());
+    $title = $this->node->getTitle();
+
+    // Test the "Add to shortcuts" link for node view route.
+    $this->clickLink('Add to Default shortcuts');
+    $this->assertText(new FormattableMarkup('Added a shortcut for @title.', ['@title' => $title]));
+    $this->assertShortcutQuickLink('Remove from Default shortcuts');
+
+    // Test the "Remove from shortcuts" link for node view route.
+    $this->clickLink('Remove from Default shortcuts');
+    $this->assertText(new FormattableMarkup('The shortcut @title has been deleted.', ['@title' => $title]));
+    $this->assertShortcutQuickLink('Add to Default shortcuts');
+
+    \Drupal::service('module_installer')->install(['block_content']);
+    BlockContentType::create([
+      'id' => 'basic',
+      'label' => 'Basic block',
+      'revision' => FALSE,
+    ])->save();
+    // Test page with HTML tags in title.
+    $this->drupalGet('admin/structure/block/block-content/manage/basic');
+    $page_title = new FormattableMarkup('Edit %label custom block type', ['%label' => 'Basic block']);
+    $this->assertRaw($page_title);
+    // Add shortcut to this page.
+    $this->clickLink('Add to Default shortcuts');
+    $this->assertRaw(new FormattableMarkup('Added a shortcut for %title.', [
+      '%title' => trim(strip_tags($page_title)),
+    ]));
+
+  }
+
+  /**
+   * Tests that shortcut links can be renamed.
+   */
+  public function testShortcutLinkRename() {
+    $set = $this->set;
+
+    // Attempt to rename shortcut link.
+    $new_link_name = $this->randomMachineName();
+
+    $shortcuts = $set->getShortcuts();
+    $shortcut = reset($shortcuts);
+    $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id(), ['title[0][value]' => $new_link_name], t('Save'));
+    $saved_set = ShortcutSet::load($set->id());
+    $titles = $this->getShortcutInformation($saved_set, 'title');
+    $this->assertTrue(in_array($new_link_name, $titles), 'Shortcut renamed: ' . $new_link_name);
+    $this->assertLink($new_link_name, 0, 'Renamed shortcut link appears on the page.');
+    $this->assertText(t('The shortcut @link has been updated.', ['@link' => $new_link_name]));
+  }
+
+  /**
+   * Tests that changing the path of a shortcut link works.
+   */
+  public function testShortcutLinkChangePath() {
+    $set = $this->set;
+
+    // Tests changing a shortcut path.
+    $new_link_path = '/admin/config';
+
+    $shortcuts = $set->getShortcuts();
+    $shortcut = reset($shortcuts);
+    $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id(), ['title[0][value]' => $shortcut->getTitle(), 'link[0][uri]' => $new_link_path], t('Save'));
+    $saved_set = ShortcutSet::load($set->id());
+    $paths = $this->getShortcutInformation($saved_set, 'link');
+    $this->assertTrue(in_array('internal:' . $new_link_path, $paths), 'Shortcut path changed: ' . $new_link_path);
+    $this->assertLinkByHref($new_link_path, 0, 'Shortcut with new path appears on the page.');
+    $this->assertText(t('The shortcut @link has been updated.', ['@link' => $shortcut->getTitle()]));
+  }
+
+  /**
+   * Tests that changing the route of a shortcut link works.
+   */
+  public function testShortcutLinkChangeRoute() {
+    $this->drupalLogin($this->rootUser);
+    $this->drupalGet('admin/content');
+    $this->assertResponse(200);
+    // Disable the view.
+    View::load('content')->disable()->save();
+    /** @var \Drupal\Core\Routing\RouteBuilderInterface $router_builder */
+    $router_builder = \Drupal::service('router.builder');
+    $router_builder->rebuildIfNeeded();
+    $this->drupalGet('admin/content');
+    $this->assertResponse(200);
+  }
+
+  /**
+   * Tests deleting a shortcut link.
+   */
+  public function testShortcutLinkDelete() {
+    $set = $this->set;
+
+    $shortcuts = $set->getShortcuts();
+    $shortcut = reset($shortcuts);
+    $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id() . '/delete', [], 'Delete');
+    $saved_set = ShortcutSet::load($set->id());
+    $ids = $this->getShortcutInformation($saved_set, 'id');
+    $this->assertFalse(in_array($shortcut->id(), $ids), 'Successfully deleted a shortcut.');
+
+    // Delete all the remaining shortcut links.
+    entity_delete_multiple('shortcut', array_filter($ids));
+
+    // Get the front page to check that no exceptions occur.
+    $this->drupalGet('');
+  }
+
+  /**
+   * Tests that the add shortcut link is not displayed for 404/403 errors.
+   *
+   * Tests that the "Add to shortcuts" link is not displayed on a page not
+   * found or a page the user does not have access to.
+   */
+  public function testNoShortcutLink() {
+    // Change to a theme that displays shortcuts.
+    \Drupal::service('theme_handler')->install(['seven']);
+    $this->config('system.theme')
+      ->set('default', 'seven')
+      ->save();
+
+    $this->drupalGet('page-that-does-not-exist');
+    $result = $this->xpath('//a[contains(@class, "shortcut-action--add")]');
+    $this->assertTrue(empty($result), 'Add to shortcuts link was not shown on a page not found.');
+
+    // The user does not have access to this path.
+    $this->drupalGet('admin/modules');
+    $result = $this->xpath('//a[contains(@class, "shortcut-action--add")]');
+    $this->assertTrue(empty($result), 'Add to shortcuts link was not shown on a page the user does not have access to.');
+
+    // Verify that the testing mechanism works by verifying the shortcut link
+    // appears on admin/content.
+    $this->drupalGet('admin/content');
+    $result = $this->xpath('//a[contains(@class, "shortcut-action--remove")]');
+    $this->assertTrue(!empty($result), 'Remove from shortcuts link was shown on a page the user does have access to.');
+
+    // Verify that the shortcut link appears on routing only pages.
+    $this->drupalGet('router_test/test2');
+    $result = $this->xpath('//a[contains(@class, "shortcut-action--add")]');
+    $this->assertTrue(!empty($result), 'Add to shortcuts link was shown on a page the user does have access to.');
+  }
+
+  /**
+   * Tests that the 'access shortcuts' permissions works properly.
+   */
+  public function testAccessShortcutsPermission() {
+    // Change to a theme that displays shortcuts.
+    \Drupal::service('theme_handler')->install(['seven']);
+    $this->config('system.theme')
+      ->set('default', 'seven')
+      ->save();
+
+    // Add cron to the default shortcut set.
+    $this->drupalLogin($this->rootUser);
+    $this->drupalGet('admin/config/system/cron');
+    $this->clickLink('Add to Default shortcuts');
+
+    // Verify that users without the 'access shortcuts' permission can't see the
+    // shortcuts.
+    $this->drupalLogin($this->drupalCreateUser(['access toolbar']));
+    $this->assertNoLink('Shortcuts', 'Shortcut link not found on page.');
+
+    // Verify that users without the 'administer site configuration' permission
+    // can't see the cron shortcuts.
+    $this->drupalLogin($this->drupalCreateUser(['access toolbar', 'access shortcuts']));
+    $this->assertNoLink('Shortcuts', 'Shortcut link not found on page.');
+    $this->assertNoLink('Cron', 'Cron shortcut link not found on page.');
+
+    // Verify that users with the 'access shortcuts' permission can see the
+    // shortcuts.
+    $this->drupalLogin($this->drupalCreateUser([
+      'access toolbar', 'access shortcuts', 'administer site configuration',
+    ]));
+    $this->clickLink('Shortcuts', 0, 'Shortcut link found on page.');
+    $this->assertLink('Cron', 0, 'Cron shortcut link found on page.');
+
+    $this->verifyAccessShortcutsPermissionForEditPages();
+  }
+
+  /**
+   * Tests the shortcuts are correctly ordered by weight in the toolbar.
+   */
+  public function testShortcutLinkOrder() {
+    // Ensure to give permissions to access the shortcuts.
+    $this->drupalLogin($this->drupalCreateUser(['access toolbar', 'access shortcuts', 'access content overview', 'administer content types']));
+    $this->drupalGet(Url::fromRoute('<front>'));
+    $shortcuts = $this->cssSelect('#toolbar-item-shortcuts-tray .toolbar-menu a');
+    $this->assertEqual($shortcuts[0]->getText(), 'Add content');
+    $this->assertEqual($shortcuts[1]->getText(), 'All content');
+    foreach ($this->set->getShortcuts() as $shortcut) {
+      $shortcut->setWeight($shortcut->getWeight() * -1)->save();
+    }
+    $this->drupalGet(Url::fromRoute('<front>'));
+    $shortcuts = $this->cssSelect('#toolbar-item-shortcuts-tray .toolbar-menu a');
+    $this->assertEqual($shortcuts[0]->getText(), 'All content');
+    $this->assertEqual($shortcuts[1]->getText(), 'Add content');
+  }
+
+  /**
+   * Tests that the 'access shortcuts' permission is required for shortcut set
+   * administration page access.
+   */
+  private function verifyAccessShortcutsPermissionForEditPages() {
+    // Create a user with customize links and switch sets permissions  but
+    // without the 'access shortcuts' permission.
+    $test_permissions = [
+      'customize shortcut links',
+      'switch shortcut sets',
+    ];
+    $noaccess_user = $this->drupalCreateUser($test_permissions);
+    $this->drupalLogin($noaccess_user);
+
+    // Verify that set administration pages are inaccessible without the
+    // 'access shortcuts' permission.
+    $edit_paths = [
+      'admin/config/user-interface/shortcut/manage/default/customize',
+      'admin/config/user-interface/shortcut/manage/default',
+      'user/' . $noaccess_user->id() . '/shortcuts',
+    ];
+
+    foreach ($edit_paths as $path) {
+      $this->drupalGet($path);
+      $message = format_string('Access is denied on %s', ['%s' => $path]);
+      $this->assertResponse(403, $message);
+    }
+  }
+
+  /**
+   * Tests that the 'access shortcuts' permission is required to access the
+   * shortcut block.
+   */
+  public function testShortcutBlockAccess() {
+    // Creates a block instance and place in a region through api.
+    $block = $this->drupalPlaceBlock('shortcuts');
+
+    // Verify that users with the 'access shortcuts' permission can see the
+    // shortcut block.
+    $this->drupalLogin($this->shortcutUser);
+    $this->drupalGet('');
+    $this->assertBlockAppears($block);
+
+    $this->drupalLogout();
+
+    // Verify that users without the 'access shortcuts' permission can see the
+    // shortcut block.
+    $this->drupalLogin($this->drupalCreateUser([]));
+    $this->drupalGet('');
+    $this->assertNoBlockAppears($block);
+  }
+
+  /**
+   * Passes if a shortcut quick link with the specified label is found.
+   *
+   * An optional link index may be passed.
+   *
+   * @param string $label
+   *   Text between the anchor tags.
+   * @param int $index
+   *   Link position counting from zero.
+   * @param string $message
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use format_string() to embed variables in the message text, not
+   *   t(). If left blank, a default message will be displayed.
+   * @param string $group
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; most tests do not override
+   *   this default.
+   *
+   * @return bool
+   *   TRUE if the assertion succeeded, FALSE otherwise.
+   */
+  protected function assertShortcutQuickLink($label, $index = 0, $message = '', $group = 'Other') {
+    $links = $this->xpath('//a[normalize-space()=:label]', [':label' => $label]);
+    $message = ($message ? $message : SafeMarkup::format('Shortcut quick link with label %label found.', ['%label' => $label]));
+    return $this->assert(isset($links[$index]), $message, $group);
+  }
+
+}
@@ -0,0 +1,211 @@
+<?php
+
+namespace Drupal\Tests\shortcut\Functional;
+
+use Drupal\shortcut\Entity\ShortcutSet;
+
+/**
+ * Create, view, edit, delete, and change shortcut sets.
+ *
+ * @group shortcut
+ */
+class ShortcutSetsTest extends ShortcutTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var string[]
+   */
+  public static $modules = ['block'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->drupalPlaceBlock('local_actions_block');
+  }
+
+  /**
+   * Tests creating a shortcut set.
+   */
+  public function testShortcutSetAdd() {
+    $this->drupalGet('admin/config/user-interface/shortcut');
+    $this->clickLink(t('Add shortcut set'));
+    $edit = [
+      'label' => $this->randomMachineName(),
+      'id' => strtolower($this->randomMachineName()),
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    $new_set = $this->container->get('entity.manager')->getStorage('shortcut_set')->load($edit['id']);
+    $this->assertIdentical($new_set->id(), $edit['id'], 'Successfully created a shortcut set.');
+    $this->drupalGet('user/' . $this->adminUser->id() . '/shortcuts');
+    $this->assertText($new_set->label(), 'Generated shortcut set was listed as a choice on the user account page.');
+  }
+
+  /**
+   * Tests editing a shortcut set.
+   */
+  public function testShortcutSetEdit() {
+    $set = $this->set;
+    $shortcuts = $set->getShortcuts();
+
+    // Visit the shortcut set edit admin ui.
+    $this->drupalGet('admin/config/user-interface/shortcut/manage/' . $set->id() . '/customize');
+
+    // Test for the page title.
+    $this->assertTitle(t('List links') . ' | Drupal');
+
+    // Test for the table.
+    $element = $this->xpath('//div[@class="layout-content"]//table');
+    $this->assertTrue($element, 'Shortcut entity list table found.');
+
+    // Test the table header.
+    $elements = $this->xpath('//div[@class="layout-content"]//table/thead/tr/th');
+    $this->assertEqual(count($elements), 3, 'Correct number of table header cells found.');
+
+    // Test the contents of each th cell.
+    $expected_items = [t('Name'), t('Weight'), t('Operations')];
+    foreach ($elements as $key => $element) {
+      $this->assertEqual($element->getText(), $expected_items[$key]);
+    }
+
+    // Look for test shortcuts in the table.
+    $weight = count($shortcuts);
+    $edit = [];
+    foreach ($shortcuts as $shortcut) {
+      $title = $shortcut->getTitle();
+
+      // Confirm that a link to the shortcut is found within the table.
+      $this->assertLink($title);
+
+      // Look for a test shortcut weight select form element.
+      $this->assertFieldByName('shortcuts[links][' . $shortcut->id() . '][weight]');
+
+      // Change the weight of the shortcut.
+      $edit['shortcuts[links][' . $shortcut->id() . '][weight]'] = $weight;
+      $weight--;
+    }
+
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    $this->assertRaw(t('The shortcut set has been updated.'));
+
+    \Drupal::entityManager()->getStorage('shortcut')->resetCache();
+    // Check to ensure that the shortcut weights have changed and that
+    // ShortcutSet::.getShortcuts() returns shortcuts in the new order.
+    $this->assertIdentical(array_reverse(array_keys($shortcuts)), array_keys($set->getShortcuts()));
+  }
+
+  /**
+   * Tests switching a user's own shortcut set.
+   */
+  public function testShortcutSetSwitchOwn() {
+    $new_set = $this->generateShortcutSet($this->randomMachineName());
+
+    // Attempt to switch the default shortcut set to the newly created shortcut
+    // set.
+    $this->drupalPostForm('user/' . $this->adminUser->id() . '/shortcuts', ['set' => $new_set->id()], t('Change set'));
+    $this->assertResponse(200);
+    $current_set = shortcut_current_displayed_set($this->adminUser);
+    $this->assertTrue($new_set->id() == $current_set->id(), 'Successfully switched own shortcut set.');
+  }
+
+  /**
+   * Tests switching another user's shortcut set.
+   */
+  public function testShortcutSetAssign() {
+    $new_set = $this->generateShortcutSet($this->randomMachineName());
+
+    \Drupal::entityManager()->getStorage('shortcut_set')->assignUser($new_set, $this->shortcutUser);
+    $current_set = shortcut_current_displayed_set($this->shortcutUser);
+    $this->assertTrue($new_set->id() == $current_set->id(), "Successfully switched another user's shortcut set.");
+  }
+
+  /**
+   * Tests switching a user's shortcut set and creating one at the same time.
+   */
+  public function testShortcutSetSwitchCreate() {
+    $edit = [
+      'set' => 'new',
+      'id' => strtolower($this->randomMachineName()),
+      'label' => $this->randomString(),
+    ];
+    $this->drupalPostForm('user/' . $this->adminUser->id() . '/shortcuts', $edit, t('Change set'));
+    $current_set = shortcut_current_displayed_set($this->adminUser);
+    $this->assertNotEqual($current_set->id(), $this->set->id(), 'A shortcut set can be switched to at the same time as it is created.');
+    $this->assertEqual($current_set->label(), $edit['label'], 'The new set is correctly assigned to the user.');
+  }
+
+  /**
+   * Tests switching a user's shortcut set without providing a new set name.
+   */
+  public function testShortcutSetSwitchNoSetName() {
+    $edit = ['set' => 'new'];
+    $this->drupalPostForm('user/' . $this->adminUser->id() . '/shortcuts', $edit, t('Change set'));
+    $this->assertText(t('The new set label is required.'));
+    $current_set = shortcut_current_displayed_set($this->adminUser);
+    $this->assertEqual($current_set->id(), $this->set->id(), 'Attempting to switch to a new shortcut set without providing a set name does not succeed.');
+    $this->assertFieldByXPath("//input[@name='label' and contains(concat(' ', normalize-space(@class), ' '), ' error ')]", NULL, 'The new set label field has the error class');
+  }
+
+  /**
+   * Tests renaming a shortcut set.
+   */
+  public function testShortcutSetRename() {
+    $set = $this->set;
+
+    $new_label = $this->randomMachineName();
+    $this->drupalGet('admin/config/user-interface/shortcut');
+    $this->clickLink(t('Edit shortcut set'));
+    $this->drupalPostForm(NULL, ['label' => $new_label], t('Save'));
+    $set = ShortcutSet::load($set->id());
+    $this->assertTrue($set->label() == $new_label, 'Shortcut set has been successfully renamed.');
+  }
+
+  /**
+   * Tests unassigning a shortcut set.
+   */
+  public function testShortcutSetUnassign() {
+    $new_set = $this->generateShortcutSet($this->randomMachineName());
+
+    $shortcut_set_storage = \Drupal::entityManager()->getStorage('shortcut_set');
+    $shortcut_set_storage->assignUser($new_set, $this->shortcutUser);
+    $shortcut_set_storage->unassignUser($this->shortcutUser);
+    $current_set = shortcut_current_displayed_set($this->shortcutUser);
+    $default_set = shortcut_default_set($this->shortcutUser);
+    $this->assertTrue($current_set->id() == $default_set->id(), "Successfully unassigned another user's shortcut set.");
+  }
+
+  /**
+   * Tests deleting a shortcut set.
+   */
+  public function testShortcutSetDelete() {
+    $new_set = $this->generateShortcutSet($this->randomMachineName());
+
+    $this->drupalPostForm('admin/config/user-interface/shortcut/manage/' . $new_set->id() . '/delete', [], t('Delete'));
+    $sets = ShortcutSet::loadMultiple();
+    $this->assertFalse(isset($sets[$new_set->id()]), 'Successfully deleted a shortcut set.');
+  }
+
+  /**
+   * Tests deleting the default shortcut set.
+   */
+  public function testShortcutSetDeleteDefault() {
+    $this->drupalGet('admin/config/user-interface/shortcut/manage/default/delete');
+    $this->assertResponse(403);
+  }
+
+  /**
+   * Tests creating a new shortcut set with a defined set name.
+   */
+  public function testShortcutSetCreateWithSetName() {
+    $random_name = $this->randomMachineName();
+    $new_set = $this->generateShortcutSet($random_name, $random_name);
+    $sets = ShortcutSet::loadMultiple();
+    $this->assertTrue(isset($sets[$random_name]), 'Successfully created a shortcut set with a defined set name.');
+    $this->drupalGet('user/' . $this->adminUser->id() . '/shortcuts');
+    $this->assertText($new_set->label(), 'Generated shortcut set was listed as a choice on the user account page.');
+  }
+
+}
@@ -0,0 +1,133 @@
+<?php
+
+namespace Drupal\Tests\shortcut\Functional;
+
+use Drupal\shortcut\Entity\Shortcut;
+use Drupal\shortcut\Entity\ShortcutSet;
+use Drupal\shortcut\ShortcutSetInterface;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Defines base class for shortcut test cases.
+ */
+abstract class ShortcutTestBase extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'toolbar', 'shortcut'];
+
+  /**
+   * User with permission to administer shortcuts.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
+   * User with permission to use shortcuts, but not administer them.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $shortcutUser;
+
+  /**
+   * Generic node used for testing.
+   *
+   * @var \Drupal\node\NodeInterface
+   */
+  protected $node;
+
+  /**
+   * Site-wide default shortcut set.
+   *
+   * @var \Drupal\shortcut\ShortcutSetInterface
+   */
+  protected $set;
+
+  protected function setUp() {
+    parent::setUp();
+
+    if ($this->profile != 'standard') {
+      // Create Basic page and Article node types.
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+
+      // Populate the default shortcut set.
+      $shortcut = Shortcut::create([
+        'shortcut_set' => 'default',
+        'title' => t('Add content'),
+        'weight' => -20,
+        'link' => [
+          'uri' => 'internal:/node/add',
+        ],
+      ]);
+      $shortcut->save();
+
+      $shortcut = Shortcut::create([
+        'shortcut_set' => 'default',
+        'title' => t('All content'),
+        'weight' => -19,
+        'link' => [
+          'uri' => 'internal:/admin/content',
+        ],
+      ]);
+      $shortcut->save();
+    }
+
+    // Create users.
+    $this->adminUser = $this->drupalCreateUser(['access toolbar', 'administer shortcuts', 'view the administration theme', 'create article content', 'create page content', 'access content overview', 'administer users', 'link to any page', 'edit any article content']);
+    $this->shortcutUser = $this->drupalCreateUser(['customize shortcut links', 'switch shortcut sets', 'access shortcuts', 'access content']);
+
+    // Create a node.
+    $this->node = $this->drupalCreateNode(['type' => 'article']);
+
+    // Log in as admin and grab the default shortcut set.
+    $this->drupalLogin($this->adminUser);
+    $this->set = ShortcutSet::load('default');
+    \Drupal::entityManager()->getStorage('shortcut_set')->assignUser($this->set, $this->adminUser);
+  }
+
+  /**
+   * Creates a generic shortcut set.
+   */
+  public function generateShortcutSet($label = '', $id = NULL) {
+    $set = ShortcutSet::create([
+      'id' => isset($id) ? $id : strtolower($this->randomMachineName()),
+      'label' => empty($label) ? $this->randomString() : $label,
+    ]);
+    $set->save();
+    return $set;
+  }
+
+  /**
+   * Extracts information from shortcut set links.
+   *
+   * @param \Drupal\shortcut\ShortcutSetInterface $set
+   *   The shortcut set object to extract information from.
+   * @param string $key
+   *   The array key indicating what information to extract from each link:
+   *    - 'title': Extract shortcut titles.
+   *    - 'link': Extract shortcut paths.
+   *    - 'id': Extract the shortcut ID.
+   *
+   * @return array
+   *   Array of the requested information from each link.
+   */
+  public function getShortcutInformation(ShortcutSetInterface $set, $key) {
+    $info = [];
+    \Drupal::entityManager()->getStorage('shortcut')->resetCache();
+    foreach ($set->getShortcuts() as $shortcut) {
+      if ($key == 'link') {
+        $info[] = $shortcut->link->uri;
+      }
+      else {
+        $info[] = $shortcut->{$key}->value;
+      }
+    }
+    return $info;
+  }
+
+}
@@ -0,0 +1,127 @@
+<?php
+
+namespace Drupal\Tests\shortcut\Functional;
+
+use Drupal\content_translation\Tests\ContentTranslationUITestBase;
+use Drupal\Core\Entity\EntityChangedInterface;
+use Drupal\Core\Language\Language;
+
+/**
+ * Tests the shortcut translation UI.
+ *
+ * @group Shortcut
+ */
+class ShortcutTranslationUITest extends ContentTranslationUITestBase {
+
+  /**
+   * {inheritdoc}
+   */
+  protected $defaultCacheContexts = ['languages:language_interface', 'session', 'theme', 'user', 'url.path', 'url.query_args', 'url.site'];
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'language',
+    'content_translation',
+    'link',
+    'shortcut',
+    'toolbar'
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->entityTypeId = 'shortcut';
+    $this->bundle = 'default';
+    parent::setUp();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getTranslatorPermissions() {
+    return array_merge(parent::getTranslatorPermissions(), ['access shortcuts', 'administer shortcuts', 'access toolbar']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createEntity($values, $langcode, $bundle_name = NULL) {
+    $values['link']['uri'] = 'internal:/user';
+    return parent::createEntity($values, $langcode, $bundle_name);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNewEntityValues($langcode) {
+    return ['title' => [['value' => $this->randomMachineName()]]] + parent::getNewEntityValues($langcode);
+  }
+
+  protected function doTestBasicTranslation() {
+    parent::doTestBasicTranslation();
+
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    foreach ($this->langcodes as $langcode) {
+      if ($entity->hasTranslation($langcode)) {
+        $language = new Language(['id' => $langcode]);
+        // Request the front page in this language and assert that the right
+        // translation shows up in the shortcut list with the right path.
+        $this->drupalGet('<front>', ['language' => $language]);
+        $expected_path = \Drupal::urlGenerator()->generateFromRoute('user.page', [], ['language' => $language]);
+        $label = $entity->getTranslation($langcode)->label();
+        $elements = $this->xpath('//nav[contains(@class, "toolbar-lining")]/ul[@class="toolbar-menu"]/li/a[contains(@href, :href) and normalize-space(text())=:label]', [':href' => $expected_path, ':label' => $label]);
+        $this->assertTrue(!empty($elements), format_string('Translated @language shortcut link @label found.', ['@label' => $label, '@language' => $language->getName()]));
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function doTestTranslationEdit() {
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    $languages = $this->container->get('language_manager')->getLanguages();
+
+    foreach ($this->langcodes as $langcode) {
+      // We only want to test the title for non-english translations.
+      if ($langcode != 'en') {
+        $options = ['language' => $languages[$langcode]];
+        $url = $entity->urlInfo('edit-form', $options);
+        $this->drupalGet($url);
+
+        $title = t('@title [%language translation]', [
+          '@title' => $entity->getTranslation($langcode)->label(),
+          '%language' => $languages[$langcode]->getName(),
+        ]);
+        $this->assertRaw($title);
+      }
+    }
+  }
+
+  /**
+   * Tests the basic translation workflow.
+   */
+  protected function doTestTranslationChanged() {
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+
+    $this->assertFalse(
+      $entity instanceof EntityChangedInterface,
+      format_string('%entity is not implementing EntityChangedInterface.', ['%entity' => $this->entityTypeId])
+    );
+  }
+
+}