Merged entity_embed_twig_test into entity_embed_test.

Author: davereid

src/Tests/EntityEmbedHooksTest.php

@@ -24,20 +24,8 @@ class EntityEmbedHooksTest extends EntityEmbedTestBase {
    */
   protected $state;
 
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array(
-    'entity_embed',
-    'entity_embed_test',
-    'node',
-  );
-
   protected function setUp() {
     parent::setUp();
-
     $this->state = $this->container->get('state');
   }
 

src/Tests/EntityEmbedTestBase.php

@@ -22,7 +22,7 @@ abstract class EntityEmbedTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = ['entity_embed', 'node', 'ckeditor'];
+  public static $modules = ['entity_embed', 'entity_embed_test', 'node', 'ckeditor'];
 
   /**
    * The test user.

src/Tests/EntityEmbedTwigTest.php

@@ -14,13 +14,6 @@
  */
 class EntityEmbedTwigTest extends EntityEmbedTestBase {
 
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('entity_embed', 'entity_embed_twig_test', 'entity_reference', 'node');
-
   protected function setUp() {
     parent::setUp();
     \Drupal::service('theme_handler')->install(array('test_theme'));

tests/modules/entity_embed_test/entity_embed_test.module

@@ -7,6 +7,23 @@
 
 use Drupal\Core\Entity\EntityInterface;
 
+/**
+ * Implements hook_theme().
+ */
+function entity_embed_test_theme($existing, $type, $theme, $path) {
+  $items['entity_embed_twig_test'] = array(
+    'template' => 'entity_embed_twig_test',
+    'variables' => array(
+      'entity_type' => '',
+      'id' => '',
+      'display_plugin' => 'default',
+      'display_settings' => array(),
+    ),
+  );
+  return $items;
+}
+
+
 /**
  * Implements hook_entity_embed_display_plugins_alter().
  */

tests/modules/entity_embed_test/entity_embed_test.routing.yml

@@ -0,0 +1,20 @@
+entity_embed_test.entity_embed_twig_test.id:
+  path: '/entity_embed_twig_test/id'
+  defaults:
+    _controller: '\Drupal\entity_embed_test\EntityEmbedTestTwigController::idRender'
+  requirements:
+    _access: 'TRUE'
+
+entity_embed_test.entity_embed_twig_test.label_plugin:
+  path: '/entity_embed_twig_test/label_plugin'
+  defaults:
+    _controller: '\Drupal\entity_embed_test\EntityEmbedTestTwigController::labelPluginRender'
+  requirements:
+    _access: 'TRUE'
+
+entity_embed_test.entity_embed_twig_test.label_plugin_no_link:
+  path: '/entity_embed_twig_test/label_plugin_no_link'
+  defaults:
+    _controller: '\Drupal\entity_embed_test\EntityEmbedTestTwigController::labelPluginNoLinkRender'
+  requirements:
+    _access: 'TRUE'

…st/src/EntityEmbedTwigTestController.php …st/src/EntityEmbedTestTwigController.phptests/modules/entity_embed_twig_test/src/EntityEmbedTwigTestController.php renamed to tests/modules/entity_embed_test/src/EntityEmbedTestTwigController.php tests/modules/entity_embed_twig_test/src/EntityEmbedTwigTestController.php renamed to tests/modules/entity_embed_test/src/EntityEmbedTestTwigController.php

@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\entity_embed_twig_test\EntityEmbedTwigTestController.
+ * Contains \Drupal\entity_embed_test\EntityEmbedTestTwigController.
  */
 
-namespace Drupal\entity_embed_twig_test;
+namespace Drupal\entity_embed_test;
 
 /**
  * Controller routines for Twig theme test routes.
  */
-class EntityEmbedTwigTestController {
+class EntityEmbedTestTwigController {
 
   /**
    * Menu callback for testing entity_embed twig extension using entity ID.