only in patch2: unchanged: --- a/core/modules/simpletest/src/TestDiscovery.php +++ b/core/modules/simpletest/src/TestDiscovery.php @@ -105,6 +105,7 @@ public function registerTestNamespaces() { $this->testNamespaces['Drupal\\Tests\\'] = [$this->root . '/core/tests/Drupal/Tests']; $this->testNamespaces['Drupal\\KernelTests\\'] = [$this->root . '/core/tests/Drupal/KernelTests']; $this->testNamespaces['Drupal\\FunctionalTests\\'] = [$this->root . '/core/tests/Drupal/FunctionalTests']; + $this->testNamespaces['Drupal\\FunctionalJavascriptTests\\'] = [$this->root . '/core/tests/Drupal/FunctionalJavascriptTests']; $this->availableExtensions = array(); foreach ($this->getExtensions() as $name => $extension) { @@ -123,6 +124,7 @@ public function registerTestNamespaces() { $this->testNamespaces["Drupal\\Tests\\$name\\Unit\\"][] = "$base_path/tests/src/Unit"; $this->testNamespaces["Drupal\\Tests\\$name\\Kernel\\"][] = "$base_path/tests/src/Kernel"; $this->testNamespaces["Drupal\\Tests\\$name\\Functional\\"][] = "$base_path/tests/src/Functional"; + $this->testNamespaces["Drupal\\Tests\\$name\\FunctionalJavascript\\"][] = "$base_path/tests/src/FunctionalJavascript"; } foreach ($this->testNamespaces as $prefix => $paths) { only in patch2: unchanged: --- a/core/tests/bootstrap.php +++ b/core/tests/bootstrap.php @@ -104,6 +104,8 @@ function drupal_phpunit_populate_class_loader() { // Start with classes in known locations. $loader->add('Drupal\\Tests', __DIR__); $loader->add('Drupal\\KernelTests', __DIR__); + $loader->add('Drupal\\FunctionalTests', __DIR__); + $loader->add('Drupal\\FunctionalJavascriptTests', __DIR__); if (!isset($GLOBALS['namespaces'])) { // Scan for arbitrary extension namespaces from core and contrib.