Move AcceptanceHelper to the codeception default location for helpers (…

…joomla#111) * Use default path for the AcceptanceHelper * Use codeception defaults for helper files * Order enabled modules alphabetical
yvesh · Dec 12, 2016 · a08f163 · a08f163
1 parent 65d5171
commit a08f163
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 50 deletions.
diff --git a/tests/codeception/_support/AcceptanceHelper.php b/tests/codeception/_support/AcceptanceHelper.php
diff --git a/tests/codeception/_support/Helper/Acceptance.php b/tests/codeception/_support/Helper/Acceptance.php
@@ -6,8 +6,9 @@
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
-
 namespace Helper;
+use Codeception\Configuration;
+use Codeception\Module;
 
 /**
  * Helper class for Acceptance.
@@ -18,7 +19,24 @@
  *
  * @since    __DEPLOY_VERSION__
  */
-class Acceptance extends \Codeception\Module
+class Acceptance extends Module
 {
+	protected static $acceptanceSuiteConfiguration = [];
+
+	/**
+	 * Function to get Configuration from the acceptance.suite.yml to be used by a test
+	 *
+	 * @return  array
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getSuiteConfiguration()
+	{
+		if (empty(self::$acceptanceSuiteConfiguration))
+		{
+			self::$acceptanceSuiteConfiguration = Configuration::suiteSettings('acceptance', Configuration::config());
+		}
 
+		return self::$acceptanceSuiteConfiguration;
+	}
 }
diff --git a/tests/codeception/acceptance.suite.dist.yml b/tests/codeception/acceptance.suite.dist.yml
@@ -7,10 +7,10 @@
 class_name: AcceptanceTester
 modules:
     enabled:
-        - JoomlaBrowser
-        - AcceptanceHelper
         - Asserts
-        - \Helper\JoomlaDb
+        - JoomlaBrowser
+        - Helper\Acceptance
+        - Helper\JoomlaDb
     config:
         JoomlaBrowser:
             url: 'http://localhost/tests/codeception/joomla-cms3'     # the url that points to the joomla installation at /tests/system/joomla-cms
@@ -30,10 +30,10 @@ modules:
             sample data: 'Default English (GB) Sample Data'    # Default Sample Data
             admin email: '[email protected]'      # email Id of the Admin
             language: 'English (United Kingdom)'   # Language in which you want the Application to be Installed
-        AcceptanceHelper:
+        Helper\Acceptance:
             url: 'http://localhost/tests/codeception/joomla-cms3' # the url that points to the joomla installation at /tests/system/joomla-cms - we need it twice here
             MicrosoftEdgeInsiders: false                  # set this to true, if you are on Windows Insiders
-        \Helper\JoomlaDb:                                 # http://codeception.com/docs/modules/Db
+        Helper\JoomlaDb:                                 # http://codeception.com/docs/modules/Db
           dsn: 'mysql:host=localhost;dbname=test_joomla'  # PDO DSN
           user: 'root'                                    # MySQL Server user
           password: ''                                    # MySQL Server password