.../EntityResourceRestTestCoverageTest.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceRestTestCoverageTest.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceRestTestCoverageTest.php index 18121c1..1c9a00a 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceRestTestCoverageTest.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceRestTestCoverageTest.php @@ -31,23 +31,24 @@ protected function setUp() { parent::setUp(); $all_modules = system_rebuild_module_data(); - $all_modules = array_filter($all_modules, function ($module) { + $stable_core_modules = array_filter($all_modules, function ($module) { // Filter contrib, hidden, already enabled modules and modules in the - // Testing package. - if ($module->origin !== 'core' || !empty($module->info['hidden']) || $module->status == TRUE || $module->info['package'] == 'Testing') { + // Testing and experimental packages. + if ($module->origin !== 'core' || !empty($module->info['hidden']) || $module->status == TRUE || $module->info['package'] == 'Testing' || $module->info['package'] == 'Core (Experimental)') { return FALSE; } return TRUE; }); - \Drupal::service('module_installer')->install(array_keys($all_modules)); + $this->container->get('module_installer')->install(array_keys($stable_core_modules)); + $this->rebuildContainer(); - $this->definitions = \Drupal::entityTypeManager()->getDefinitions(); + $this->definitions = $this->container->get('entity_type.manager')->getDefinitions(); // Remove definitions for which the REST resource plugin definition was // removed via hook_rest_resource_alter(). Entity types which are never // exposed via REST also don't need test coverage. - $resource_plugin_ids = array_keys(\Drupal::service('plugin.manager.rest')->getDefinitions()); + $resource_plugin_ids = array_keys($this->container->get('plugin.manager.rest')->getDefinitions()); foreach (array_keys($this->definitions) as $entity_type_id) { if (!in_array("entity:$entity_type_id", $resource_plugin_ids, TRUE)) { unset($this->definitions[$entity_type_id]); @@ -129,7 +130,6 @@ public function testEntityTypeRestTestCoverage() { * An information about progress of REST test coverage. */ protected function getLlamaMessage($good, $all) { - $a = $all; $g = $good; @@ -141,8 +141,8 @@ protected function getLlamaMessage($good, $all) { ☼ ________________________ / Hi! \\ - | What about a few of cool | - | REST tests? | + | It's llame to not have | + | complete REST tests! | | | | Progress: $g/$a. | | ________________________/