Improve codeception variable usage to simplify usage

.env.dist

@@ -11,7 +11,6 @@
 # For more information, see the Automated Testing Documentation.
 # https://docs.suitecrm.com/developer/automatedtesting/
 
-
 #== Install Test Suite:
 
 # MYSQL or MSSQL
@@ -29,7 +28,6 @@ DATABASE_USER=automated_tests
 # Database password
 DATABASE_PASSWORD=automated_tests
 
-
 #== Acceptance, API, and Install Test Suites:
 
 # URL of the SuiteCRM instance which the tester needs to access
@@ -41,7 +39,6 @@ INSTANCE_ADMIN_USER=admin
 # Admin password for SuiteCRM instance
 INSTANCE_ADMIN_PASSWORD=password
 
-
 #== API Test Suite:
 
 # API Client ID
@@ -50,3 +47,11 @@ INSTANCE_CLIENT_ID=suitecrm_client
 # API Client Secret
 INSTANCE_CLIENT_SECRET=secret
 
+# Default web browser for acceptance and install tests
+BROWSER=chrome
+
+# Webdriver hostname (Selenium, Local or Cloud Testing)
+WEBDRIVER_HOST=127.0.0.1
+
+# Webdriver port (Selenium, Local or Cloud Testing)
+WEBDRIVER_PORT=4444

codeception.dist.yml

@@ -50,3 +50,4 @@ coverage:
     - modules/AOR_Charts/lib/*
 params:
   - env
+  - .env.test

tests/SuiteCRM/Test/Driver/WebDriver.php

@@ -47,15 +47,6 @@
  */
 class WebDriver extends \Codeception\Module\WebDriver
 {
-    public function _initialize()
-    {
-        $config = $this->_getConfig();
-        $this->config['host'] = $config['host'];
-        $this->config['port'] = $config['port'];
-
-        parent::_initialize();
-    }
-
     protected function initialWindowSize()
     {
         $config = $this->_getConfig();

tests/acceptance.suite.yml

@@ -14,5 +14,23 @@ modules:
         - \SuiteCRM\Test\Driver\WebDriver
     config:
         \SuiteCRM\Test\Driver\WebDriver:
-            url: "https://demo.suiteondemand.com"
-            browser: chrome
+            url: '%INSTANCE_URL%'
+            browser: '%BROWSER%'
+            host: '%WEBDRIVER_HOST%'
+            port: '%WEBDRIVER_PORT%'
+env:
+    chrome:
+        modules:
+            config:
+                \SuiteCRM\Test\Driver\WebDriver:
+                    browser: chrome
+    firefox:
+        modules:
+            config:
+                \SuiteCRM\Test\Driver\WebDriver:
+                    browser: firefox
+    edge:
+        modules:
+            config:
+                \SuiteCRM\Test\Driver\WebDriver:
+                    browser: MicrosoftEdge

tests/acceptance/_bootstrap.php

@@ -2,6 +2,7 @@
 // Here you can initialize variables that will be available to your tests
 
 /* bootstrap composer's autoloader */
+chdir(__DIR__.'/../../');
 require_once __DIR__ . '/../../vendor/autoload.php';
 global $sugar_config, $db;
 

tests/api/_bootstrap.php

@@ -1,5 +1,6 @@
 <?php
 /* bootstrap composer's autoloader */
+chdir(__DIR__.'/../../');
 require_once __DIR__.'/../../vendor/autoload.php';
 global $sugar_config, $db;
 require_once __DIR__ .'/../../include/utils.php';

tests/install.suite.yml

@@ -7,8 +7,24 @@ modules:
         - \SuiteCRM\Test\Driver\WebDriver
         - Filesystem
     config:
-      \SuiteCRM\Test\Driver\WebDriver:
-        url: "https://demo.suiteondemand.com/"
-        browser: chrome
-        restart: true
-        wait: 1
+        \SuiteCRM\Test\Driver\WebDriver:
+            url: '%INSTANCE_URL%'
+            browser: '%BROWSER%'
+            restart: true
+            wait: 1
+env:
+    chrome:
+        modules:
+            config:
+                \SuiteCRM\Test\Driver\WebDriver:
+                    browser: chrome
+    firefox:
+        modules:
+            config:
+                \SuiteCRM\Test\Driver\WebDriver:
+                    browser: firefox
+    edge:
+        modules:
+            config:
+                \SuiteCRM\Test\Driver\WebDriver:
+                    browser: MicrosoftEdge

tests/unit.suite.yml

@@ -0,0 +1,4 @@
+bootstrap: _bootstrap.php
+modules:
+  enabled:
+    - Asserts

tests/unit/_bootstrap.php

@@ -1,7 +1,7 @@
 <?php
 // Here you can initialize variables that will be available to your test
 //echo "CWD:" . getcwd() . "\n";
-chdir('../');
+chdir(__DIR__.'/../../');
 if (!defined('sugarEntry')) {
     define('sugarEntry', true);
     define('SUITE_PHPUNIT_RUNNER', true);