Commit 45fdf04e authored by Stephen Mustgrave's avatar Stephen Mustgrave Committed by Greg Boggs
Browse files

Issue #3320167 by smustgrave: Fix 2.x test failure

parent f1d30e62

tests/modules/easy_breadcrumb_test/easy_breadcrumb_test.routing.yml

+5 −5
Original line number Diff line number Diff line 
easy_breadcrumb_test.title_string:

  path: /test/easy-breadcrumb

  path: '/test/easy-breadcrumb'

  defaults:

    _title: 'Easy Breadcrumb'

    _controller: '\Drupal\easy_breadcrumb_test\Controller\TestRouteController::page'

easy_breadcrumb_test.title_formattable_markup:

  path: /test/easy-breadcrumb-formattable

  path: '/test/easy-breadcrumb-formattable'

  defaults:

    _controller: '\Drupal\easy_breadcrumb_test\Controller\TestRouteController::page'

    _title_callback: '\Drupal\easy_breadcrumb_test\Controller\TestRouteController::pageTitleFormattableMarkup'

easy_breadcrumb_test.title_markup:

  path: /test/easy-breadcrumb-markup

  path: '/test/easy-breadcrumb-markup'

  defaults:

    _controller: '\Drupal\easy_breadcrumb_test\Controller\TestRouteController::page'

    _title_callback: '\Drupal\easy_breadcrumb_test\Controller\TestRouteController::pageTitleMarkup'

easy_breadcrumb_test.title_translatable_markup:

  path: /test/easy-breadcrumb-translatable

  path: '/test/easy-breadcrumb-translatable'

  defaults:

    _controller: '\Drupal\easy_breadcrumb_test\Controller\TestRouteController::page'

    _title_callback: '\Drupal\easy_breadcrumb_test\Controller\TestRouteController::pageTitleTranslatableMarkup'

easy_breadcrumb_test.title_render_array:

  path: /test/easy-breadcrumb-render-array

  path: '/test/easy-breadcrumb-render-array'

  defaults:

    _controller: '\Drupal\easy_breadcrumb_test\Controller\TestRouteController::page'

    _title_callback: '\Drupal\easy_breadcrumb_test\Controller\TestRouteController::pageTitleRender'

tests/src/Kernel/EasyBreadcrumbBuilderTest.php

+4 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ class EasyBreadcrumbBuilderTest extends KernelTestBase { 
  /**

   * {@inheritdoc}

   */

  public static $modules = ['easy_breadcrumb', 'system', 'easy_breadcrumb_test'];

  protected static $modules = ['easy_breadcrumb', 'system', 'easy_breadcrumb_test'];



  /**

   * Tests the front page with an invalid path.
@@ -42,7 +42,7 @@ class EasyBreadcrumbBuilderTest extends KernelTestBase { 
      \Drupal::service('request_stack'),

      \Drupal::service('path_processor_manager'),

      \Drupal::service('config.factory'),

      \Drupal::service('title_resolver'),

      \Drupal::service('easy_breadcrumb.title_resolver'),

      \Drupal::service('current_user'),

      \Drupal::service('path.current'),

      \Drupal::service('plugin.manager.menu.link'),
@@ -91,7 +91,7 @@ class EasyBreadcrumbBuilderTest extends KernelTestBase { 
      \Drupal::service('request_stack'),

      \Drupal::service('path_processor_manager'),

      \Drupal::service('config.factory'),

      \Drupal::service('title_resolver'),

      \Drupal::service('easy_breadcrumb.title_resolver'),

      \Drupal::service('current_user'),

      \Drupal::service('path.current'),

      \Drupal::service('plugin.manager.menu.link'),
@@ -104,7 +104,7 @@ class EasyBreadcrumbBuilderTest extends KernelTestBase { 
      \Drupal::service('path.matcher')

    );



    $request = Request::create($url->getInternalPath());

    $request = Request::create('/' . $url->getInternalPath());

    $router = \Drupal::service('router.no_access_checks');

    $route_match = new RouteMatch($route_name, $router->match($url->getInternalPath())['_route_object']);

    $result = $breadcrumb_builder->getTitleString($request, $route_match, []);