Merge branch 'master' of https://github.com/CaMer0n/phpunit

.gitmodules

@@ -1,8 +1,8 @@
 [submodule "e107"]
 	path = e107
-	url = git@github.com:e107inc/e107.git
+	url = https://github.com/e107inc/e107.git
 	branch = .
 [submodule "lib/cpaneluapi"]
 	path = lib/cpaneluapi
-	url = git@github.com:N1ghteyes/cpanel-UAPI-php-class.git
+	url = https://github.com/N1ghteyes/cpanel-UAPI-php-class.git
 	branch = .

config.sample.yml

@@ -1,5 +1,9 @@
 ---
 
+# Path (absolute or relative) to the app intended to be tested
+# Absolute path begins with "/"; relative path does not begin with "/"
+app_path: 'e107/'
+
 # Configure this section for automated test deployments to cPanel
 cpanel:
 
@@ -22,8 +26,6 @@ manual:
   # URL to the app that you deployed manually; needed for acceptance tests
   url: 'http://set-this-if-running-acceptance-tests-manually.local'
 
-  dir: '/e107'
-
   # Only MySQL/MariaDB is supported
   db:
     # Hostname or IP address; use 'localhost' for a local server

e107

@@ -1 +1 @@
-Subproject commit fd7b9e352e0b72b797c9b109c47dbe0dd8351fc5
+Subproject commit 7ffb60c60b258efea1b1b69f6e49b8f02c12db18

tests/_bootstrap.php

@@ -1,3 +1,11 @@
 <?php
 
-define('APP_PATH', realpath(codecept_root_dir()."/e107")); // TODO use 'dir' value from config.yml
+$params = include(codecept_root_dir()."/lib/config.php");
+
+$app_path = $params['app_path'] ?: codecept_root_dir()."/e107";
+
+// Relative path
+if (substr($app_path, 0, 1) !== '/')
+	$app_path = codecept_root_dir() . "/${app_path}";
+
+define('APP_PATH', realpath($app_path));