upgrades core to 8.4.2

core/modules/contextual/tests/modules/contextual_test/contextual_test.info.yml

@@ -0,0 +1,14 @@
+name: 'Contextual Test'
+type: module
+description: 'Provides test contextual links.'
+package: Testing
+# version: VERSION
+# core: 8.x
+dependencies:
+  - contextual
+
+# Information added by Drupal.org packaging script on 2017-11-03
+version: '8.4.2'
+core: '8.x'
+project: 'drupal'
+datestamp: 1509719929

core/modules/contextual/tests/modules/contextual_test/contextual_test.links.contextual.yml

@@ -0,0 +1,4 @@
+contextual_test:
+  title: 'Test Link'
+  route_name: 'contextual_test'
+  group: 'contextual_test'

core/modules/contextual/tests/modules/contextual_test/contextual_test.module

@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Provides test contextual link on blocks.
+ */
+
+use Drupal\Core\Block\BlockPluginInterface;
+
+/**
+ * Implements hook_block_view_alter().
+ */
+function contextual_test_block_view_alter(array &$build, BlockPluginInterface $block) {
+  $build['#contextual_links']['contextual_test'] = [
+    'route_parameters' => [],
+  ];
+}

core/modules/contextual/tests/modules/contextual_test/contextual_test.routing.yml

@@ -0,0 +1,6 @@
+contextual_test:
+  path: '/contextual-tests'
+  defaults:
+    _controller: '\Drupal\contextual_test\Controller\TestController::render'
+  requirements:
+    _access: 'TRUE'

core/modules/contextual/tests/modules/contextual_test/src/Controller/TestController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Drupal\contextual_test\Controller;
+
+/**
+ * Test controller to provide a callback for the contextual link.
+ */
+class TestController {
+
+  /**
+   * Callback for the contextual link.
+   *
+   * @return array
+   *   Render array.
+   */
+  public function render() {
+    return [
+      '#type' => 'markup',
+      '#markup' => 'Everything is contextual!',
+    ];
+  }
+
+}

core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinkClickTrait.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\Tests\contextual\FunctionalJavascript;
+
+/**
+ * Functions for testing contextual links.
+ */
+trait ContextualLinkClickTrait {
+
+  /**
+   * Clicks a contextual link.
+   *
+   * @param string $selector
+   *   The selector for the element that contains the contextual link.
+   * @param string $link_locator
+   *   The link id, title, or text.
+   * @param bool $force_visible
+   *   If true then the button will be forced to visible so it can be clicked.
+   */
+  protected function clickContextualLink($selector, $link_locator, $force_visible = TRUE) {
+    if ($force_visible) {
+      $this->toggleContextualTriggerVisibility($selector);
+    }
+
+    $element = $this->getSession()->getPage()->find('css', $selector);
+    $element->find('css', '.contextual button')->press();
+    $element->findLink($link_locator)->click();
+
+    if ($force_visible) {
+      $this->toggleContextualTriggerVisibility($selector);
+    }
+  }
+
+  /**
+   * Toggles the visibility of a contextual trigger.
+   *
+   * @param string $selector
+   *   The selector for the element that contains the contextual link.
+   */
+  protected function toggleContextualTriggerVisibility($selector) {
+    // Hovering over the element itself with should be enough, but does not
+    // work. Manually remove the visually-hidden class.
+    $this->getSession()->executeScript("jQuery('{$selector} .contextual .trigger').toggleClass('visually-hidden');");
+  }
+
+}

core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinksTest.php

@@ -12,6 +12,8 @@ use Drupal\user\Entity\Role;
  */
 class ContextualLinksTest extends JavascriptTestBase {
 
+  use ContextualLinkClickTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -23,6 +25,7 @@ class ContextualLinksTest extends JavascriptTestBase {
   protected function setUp() {
     parent::setUp();
 
+    $this->drupalLogin($this->createUser(['access contextual links']));
     $this->placeBlock('system_branding_block', ['id' => 'branding']);
   }
 
@@ -30,10 +33,6 @@ class ContextualLinksTest extends JavascriptTestBase {
    * Tests the visibility of contextual links.
    */
   public function testContextualLinksVisibility() {
-    $this->drupalLogin($this->drupalCreateUser([
-      'access contextual links'
-    ]));
-
     $this->drupalGet('user');
     $contextualLinks = $this->assertSession()->waitForElement('css', '.contextual button');
     $this->assertEmpty($contextualLinks);
@@ -59,4 +58,27 @@ class ContextualLinksTest extends JavascriptTestBase {
     $this->assertNotEmpty($contextualLinks);
   }
 
+  /**
+   * Test clicking contextual links.
+   */
+  public function testContextualLinksClick() {
+    $this->container->get('module_installer')->install(['contextual_test']);
+    // Test clicking contextual link without toolbar.
+    $this->drupalGet('user');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->clickContextualLink('#block-branding', 'Test Link');
+    $this->assertSession()->pageTextContains('Everything is contextual!');
+
+    // Test clicking contextual link with toolbar.
+    $this->container->get('module_installer')->install(['toolbar']);
+    $this->grantPermissions(Role::load(Role::AUTHENTICATED_ID), ['access toolbar']);
+    $this->drupalGet('user');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+
+    // Click "Edit" in toolbar to show contextual links.
+    $this->getSession()->getPage()->find('css', '.contextual-toolbar-tab button')->press();
+    $this->clickContextualLink('#block-branding', 'Test Link', FALSE);
+    $this->assertSession()->pageTextContains('Everything is contextual!');
+  }
+
 }

core/modules/contextual/tests/src/FunctionalJavascript/EditModeTest.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Drupal\Tests\contextual\FunctionalJavascript;
+
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+
+/**
+ * Tests edit mode.
+ *
+ * @group contextual
+ */
+class EditModeTest extends JavascriptTestBase {
+
+  /**
+   * CSS selector for Drupal's announce element.
+   */
+  const ANNOUNCE_SELECTOR = '#drupal-live-announce';
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'node',
+    'block',
+    'user',
+    'system',
+    'breakpoint',
+    'toolbar',
+    'contextual',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->drupalLogin($this->createUser([
+      'administer blocks',
+      'access contextual links',
+      'access toolbar',
+    ]));
+    $this->placeBlock('system_powered_by_block', ['id' => 'powered']);
+  }
+
+  /**
+   * Tests that Drupal.announce messages appear.
+   */
+  public function testAnnounceEditMode() {
+    $web_assert = $this->assertSession();
+    $this->drupalGet('user');
+
+    // After the page loaded we need to additionally wait until the settings
+    // tray Ajax activity is done.
+    $web_assert->assertWaitOnAjaxRequest();
+
+    // Enable edit mode.
+    $this->pressToolbarEditButton();
+    $this->assertAnnounceEditMode();
+    // Disable edit mode.
+    $this->pressToolbarEditButton();
+    $this->assertAnnounceLeaveEditMode();
+    // Enable edit mode again.
+    $this->pressToolbarEditButton();
+    // Finally assert that the 'edit mode enabled' announcement is still correct
+    // after toggling the edit mode at least once.
+    $this->assertAnnounceEditMode();
+  }
+
+  /**
+   * Presses the toolbar edit mode.
+   */
+  protected function pressToolbarEditButton() {
+    $edit_button = $this->getSession()->getPage()->find('css', '#toolbar-bar div.contextual-toolbar-tab button');
+    $edit_button->press();
+  }
+
+  /**
+   * Asserts that the correct message was announced when entering edit mode.
+   */
+  protected function assertAnnounceEditMode() {
+    $web_assert = $this->assertSession();
+    // Wait for contextual trigger button.
+    $web_assert->waitForElementVisible('css', '.contextual trigger');
+    $web_assert->elementContains('css', static::ANNOUNCE_SELECTOR, 'Tabbing is constrained to a set of');
+    $web_assert->elementNotContains('css', static::ANNOUNCE_SELECTOR, 'Tabbing is no longer constrained by the Contextual module.');
+  }
+
+  /**
+   * Assert that the correct message was announced when leaving edit mode.
+   */
+  protected function assertAnnounceLeaveEditMode() {
+    $web_assert = $this->assertSession();
+    $page = $this->getSession()->getPage();
+    // Wait till all the contextual links are hidden.
+    $page->waitFor(1, function () use ($page, $web_assert) {
+      return empty($page->find('css', '.contextual .trigger.visually-hidden'));
+    });
+    $web_assert->elementContains('css', static::ANNOUNCE_SELECTOR, 'Tabbing is no longer constrained by the Contextual module.');
+    $web_assert->elementNotContains('css', static::ANNOUNCE_SELECTOR, 'Tabbing is constrained to a set of');
+  }
+
+}