- phpC(dis)I fixes II

.gitignore

@@ -10,12 +10,14 @@ documents/
 .project
 .buildpath
 application/config/development/
+tests/codeception/_output/*
+tests/codeception/_support/*
+tests/codeception/tests/_output/*
+tests/codeception/tests/_support/*
 tests/codeception/codeception.yml
 tests/codeception/tests/api.suite.yml
 tests/codeception/tests/functional.suite.yml
 tests/codeception/tests/acceptance.suite.yml
-tests/codeception/_support/_generated
-tests/codeception/_output/*
 !/tests/codeception/_output/.placeholder
 /submodules/d3
 composer.lock

tests/codeception/_support/AcceptanceHelper.php

@@ -1,10 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom actions
-// all public methods declared in helper class will be available in $I
-
-class AcceptanceHelper extends \Codeception\Module
-{
-
-}

tests/codeception/_support/AcceptanceTester.php

@@ -1,26 +0,0 @@
-<?php
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class AcceptanceTester extends \Codeception\Actor
-{
-    use _generated\AcceptanceTesterActions;
-
-   /**
-    * Define custom actions here
-    */
-}

tests/codeception/_support/ApiTester.php

@@ -1,26 +0,0 @@
-<?php
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class ApiTester extends \Codeception\Actor
-{
-    use _generated\ApiTesterActions;
-
-   /**
-    * Define custom actions here
-    */
-}

tests/codeception/_support/FunctionalHelper.php

@@ -1,10 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom actions
-// all public methods declared in helper class will be available in $I
-
-class FunctionalHelper extends \Codeception\Module
-{
-
-}

tests/codeception/_support/FunctionalTester.php

@@ -1,26 +0,0 @@
-<?php
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class FunctionalTester extends \Codeception\Actor
-{
-    use _generated\FunctionalTesterActions;
-
-   /**
-    * Define custom actions here
-    */
-}

tests/codeception/_support/Helper/Api.php

@@ -1,10 +0,0 @@
-<?php
-namespace Helper;
-
-// here you can define custom actions
-// all public methods declared in helper class will be available in $I
-
-class Api extends \Codeception\Module
-{
-
-}

tests/codeception/_support/UnitHelper.php

@@ -1,10 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom actions
-// all public methods declared in helper class will be available in $I
-
-class UnitHelper extends \Codeception\Module
-{
-
-}

tests/codeception/_support/UnitTester.php

@@ -1,26 +0,0 @@
-<?php
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class UnitTester extends \Codeception\Actor
-{
-    use _generated\UnitTesterActions;
-
-   /**
-    * Define custom actions here
-    */
-}

tests/codeception/tests/acceptance.suite.dist.yml

@@ -7,12 +7,10 @@
 class_name: AcceptanceTester
 modules:
     enabled:
-        - PhpBrowser
-        - AcceptanceHelper
         - Db
+        - PhpBrowser:
+            url: 'http://admin:1q2w3@demo.fhcomplete.org/fhcomplete/'
     config:
-        PhpBrowser:
-            url: 'http://admin:1q2w3@localhost/build/fhcomplete/'
         Db:
             dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
             user: 'fhcomplete'
@@ -20,4 +18,4 @@ modules:
             dump: _data/dump.sql
             populate: true
             cleanup: false
-            reconnect: false
+            reconnect: false

tests/codeception/tests/api.suite.dist.yml

@@ -1,7 +1,6 @@
 class_name: ApiTester
 modules:
     enabled:
-        - \Helper\Api
         - Db
         - REST:
             # API URL

tests/codeception/tests/functional.suite.dist.yml

@@ -6,4 +6,5 @@
 
 class_name: FunctionalTester
 modules:
-    enabled: [Filesystem, FunctionalHelper]
+    enabled:
+        - Filesystem

tests/codeception/tests/unit.suite.dist.yml

@@ -3,4 +3,5 @@
 # suite for unit (internal) tests.
 class_name: UnitTester
 modules:
-    enabled: [Asserts, UnitHelper]
+    enabled:
+        - Asserts