Merge pull request #7 from coldfrontlabs/codeception4

Add support for codeception 4 + DrupalFinder

Author: guncha25

README.md

@@ -24,13 +24,12 @@ If codeception was not previously set up:
 Provides full bootstrapping in to Drupal before test. Allows using drupal API in test cases.
 
 ### Configuration
-- root: Drupal root. Defaults to codeception root + `/web`.
 - server: Server and execution environment information.
+- root: Drupal root. Uses DrupalFinder to detect the Drupal root. Falls back to codeception root + `/web`. (optional)
 
 ```
 modules:
     - DrupalBootstrap:
-        root: './web'
         server:
             SERVER_PORT: null
             REQUEST_URI: '/'
@@ -229,7 +228,7 @@ Includes:
     - FormField: Fields that can be set to cardinality unlimited
     - MTOFormField: Single value fields.
     - ParagraphFormField: Paragraph form fields.
-    
+
 ### Usage
 
 Create paragraph field with machine name field_page_elements.

composer.json

@@ -9,8 +9,10 @@
         }
     ],
     "require": {
-        "codeception/codeception": "^2.3 || ^3.0",
-        "fzaninotto/faker": "^1.8"
+        "codeception/codeception": "^4.0",
+        "fzaninotto/faker": "^1.8",
+        "codeception/module-webdriver": "^1.1",
+        "webflo/drupal-finder": "^1.2"
     },
     "require-dev": {
         "composer/installers": "^1",

src/Codeception/Module/DrupalBootstrap.php

@@ -8,6 +8,8 @@
 use Codeception\TestDrupalKernel;
 use Symfony\Component\HttpFoundation\Request;
 use Drupal\Core\DrupalKernel;
+use DrupalFinder\DrupalFinder;
+
 
 /**
  * Class DrupalBootstrap.
@@ -46,7 +48,19 @@ class DrupalBootstrap extends Module {
   public function __construct(ModuleContainer $container, $config = NULL) {
     parent::__construct($container, $config);
     if (!isset($this->config['root'])) {
-      $this->_setConfig(['root' => Configuration::projectDir() . 'web']);
+
+      $drupalFinder = new DrupalFinder();
+
+      $drupalFinder->locateRoot(getcwd());
+      $drupalRoot = $drupalFinder->getDrupalRoot();
+
+      // Autodetect Drupal root.
+      if ($drupalRoot) {
+        $this->_setConfig(['root' => $drupalRoot]);
+      }
+      else {
+        $this->_setConfig(['root' => Configuration::projectDir() . 'web']);
+      }
     }
     chdir($this->_getConfig('root'));
     $request = Request::createFromGlobals();