commit 5e3a0484f336ad9830acd99033b6c429320346d1 Author: Joel Pittet Date: Mon Aug 31 23:16:00 2015 -0700 more test and fix contextual diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module index ef240d9..b1c37f8 100644 --- a/core/modules/contextual/contextual.module +++ b/core/modules/contextual/contextual.module @@ -83,8 +83,7 @@ function contextual_help($route_name, RouteMatchInterface $route_match) { $output .= '
'; $output .= t('Contextual links for an area on a page are displayed using a contextual links button. There are two ways to make the contextual links button visible:'); $output .= '
    '; - $sample_picture = '' . t('contextual links button') . ''; - $output .= '
  1. ' . t('Hovering over the area of interest will temporarily make the contextual links button visible (which looks like a pencil in most themes, and is normally displayed in the upper right corner of the area). The icon typically looks like this: @picture', array('@picture' => $sample_picture)) . '
  2. '; + $output .= '
  3. ' . t('Hovering over the area of interest will temporarily make the contextual links button visible (which looks like a pencil in most themes, and is normally displayed in the upper right corner of the area). The icon typically looks like this: contextual links button', array('@picture_url' => file_create_url('core/misc/icons/bebebe/pencil.svg'))) . '
  4. '; $output .= '
  5. ' . t('If you have the Toolbar module enabled, clicking the contextual links button in the toolbar (which looks like a pencil) will make all contextual links buttons on the page visible. Clicking this button again will toggle them to invisible.', array('@toolbar' => (\Drupal::moduleHandler()->moduleExists('toolbar')) ? \Drupal::url('help.page', array('name' => 'toolbar')) : '#')) . '
  6. '; $output .= '
'; $output .= t('Once the contextual links button for the area of interest is visible, click the button to display the links.'); diff --git a/core/modules/help/src/Tests/HelpTest.php b/core/modules/help/src/Tests/HelpTest.php index 6debc5b..d7ddab2 100644 --- a/core/modules/help/src/Tests/HelpTest.php +++ b/core/modules/help/src/Tests/HelpTest.php @@ -113,9 +113,11 @@ protected function verifyHelp($response = 200) { foreach ($admin_tasks as $task) { $this->assertLink($task['title']); } - // Ensure there are no double escaped '&'s or '<'s characters. + // Ensure there are no double escaped '& or '< characters. $this->assertNoEscaped('&'); $this->assertNoEscaped('<'); + // Ensure there are no escaped '< characters. + $this->assertNoEscaped('<'); } } }