Remove the fork, depend on webflo/drupal-finder

jhedstrom · Nov 16, 2022 · fb19d31 · fb19d31
1 parent 2541dcc
commit fb19d31
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 91 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,8 @@
     "behat/mink-browserkit-driver": "^2.1.0",
     "behat/mink-selenium2-driver": "~1.1",
     "drupal/drupal-driver": "dev-master",
-    "symfony/http-client": "~4.4 || ^5 || ^6"
+    "symfony/http-client": "~4.4 || ^5 || ^6",
+    "webflo/drupal-finder": "^1.2"
   },
   "require-dev": {
     "composer/installers": "^2",

diff --git a/src/Drupal/DocumentElement.php b/src/Drupal/DocumentElement.php
diff --git a/src/Drupal/DrupalExtension/ServiceContainer/DrupalExtension.php b/src/Drupal/DrupalExtension/ServiceContainer/DrupalExtension.php
@@ -8,6 +8,7 @@
 use Behat\Testwork\ServiceContainer\ServiceProcessor;
 use Drupal\DrupalExtension\Compiler\DriverPass;
 use Drupal\DrupalExtension\Compiler\EventSubscriberPass;
+use DrupalFinder\DrupalFinder;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -67,8 +68,13 @@ public function load(ContainerBuilder $container, array $config)
         // of the page, pieces of texts inside the <head> section.
         // @see https://github.com/minkphp/MinkBrowserKitDriver/issues/153
         // @see https://www.drupal.org/project/drupal/issues/3175718
-        require_once(__DIR__ . '/../../DocumentElement.php');
-        class_alias('\Drupal\DocumentElement', '\Behat\Mink\Element\DocumentElement', true);
+        $drupalFinder = new DrupalFinder();
+        if (!$drupalFinder->locateRoot(getcwd())) {
+            throw new \RuntimeException('Cannot locate Drupal');
+        }
+        $drupalRoot = $drupalFinder->getDrupalRoot();
+        require_once($drupalRoot . '/core/tests/Drupal/Tests/DocumentElement.php');
+        class_alias('\Drupal\Tests\DocumentElement', '\Behat\Mink\Element\DocumentElement', true);
 
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/config'));
         $loader->load('services.yml');