From 10747196a2b9f933f3b10c93d0f401bed07f6c27 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 11 Jul 2014 19:24:33 +0400
Subject: [PATCH] Codeceoption adjustments

- Removed hacks since these are no longer required: https://github.com/Codeception/Codeception/commit/71db233985531f298264dc4ca0160d2aa1c83b7f
- Removed unused helper classes
- Added 2.0 style "actor" to config

Thanks to @Ragazzo and @DavertMik for helping with it.
---
 apps/advanced/backend/codeception.yml                |  1 +
 apps/advanced/backend/tests/_helpers/CodeHelper.php  | 12 ------------
 apps/advanced/backend/tests/_helpers/TestHelper.php  | 12 ------------
 apps/advanced/backend/tests/_helpers/WebHelper.php   | 12 ------------
 apps/advanced/backend/tests/acceptance.suite.yml     |  1 -
 apps/advanced/backend/tests/functional.suite.yml     |  1 -
 apps/advanced/backend/tests/unit.suite.yml           |  2 --
 apps/advanced/common/codeception.yml                 |  1 +
 apps/advanced/common/tests/_helpers/CodeHelper.php   | 12 ------------
 apps/advanced/common/tests/unit.suite.yml            |  3 ---
 apps/advanced/console/codeception.yml                |  1 +
 apps/advanced/console/tests/_helpers/CodeHelper.php  | 12 ------------
 apps/advanced/console/tests/unit.suite.yml           |  2 --
 apps/advanced/frontend/codeception.yml               |  1 +
 apps/advanced/frontend/tests/_helpers/CodeHelper.php | 12 ------------
 apps/advanced/frontend/tests/_helpers/TestHelper.php | 12 ------------
 apps/advanced/frontend/tests/_helpers/WebHelper.php  | 12 ------------
 apps/advanced/frontend/tests/acceptance.suite.yml    |  1 -
 apps/advanced/frontend/tests/functional.suite.yml    |  1 -
 apps/advanced/frontend/tests/unit.suite.yml          |  2 --
 apps/basic/codeception.yml                           |  1 +
 apps/basic/tests/_helpers/CodeHelper.php             | 10 ----------
 apps/basic/tests/_helpers/TestHelper.php             | 10 ----------
 apps/basic/tests/_helpers/WebHelper.php              | 10 ----------
 apps/basic/tests/acceptance.suite.yml                |  1 -
 apps/basic/tests/functional.suite.yml                |  1 -
 apps/basic/tests/unit.suite.yml                      |  3 ---
 27 files changed, 5 insertions(+), 144 deletions(-)
 delete mode 100644 apps/advanced/backend/tests/_helpers/CodeHelper.php
 delete mode 100644 apps/advanced/backend/tests/_helpers/TestHelper.php
 delete mode 100644 apps/advanced/backend/tests/_helpers/WebHelper.php
 delete mode 100644 apps/advanced/common/tests/_helpers/CodeHelper.php
 delete mode 100644 apps/advanced/console/tests/_helpers/CodeHelper.php
 delete mode 100644 apps/advanced/frontend/tests/_helpers/CodeHelper.php
 delete mode 100644 apps/advanced/frontend/tests/_helpers/TestHelper.php
 delete mode 100644 apps/advanced/frontend/tests/_helpers/WebHelper.php
 delete mode 100644 apps/basic/tests/_helpers/CodeHelper.php
 delete mode 100644 apps/basic/tests/_helpers/TestHelper.php
 delete mode 100644 apps/basic/tests/_helpers/WebHelper.php

diff --git a/apps/advanced/backend/codeception.yml b/apps/advanced/backend/codeception.yml
index 5b1f44130a..6d2019c859 100644
--- a/apps/advanced/backend/codeception.yml
+++ b/apps/advanced/backend/codeception.yml
@@ -1,3 +1,4 @@
+actor: Tester
 paths:
     tests: tests
     log: tests/_log
diff --git a/apps/advanced/backend/tests/_helpers/CodeHelper.php b/apps/advanced/backend/tests/_helpers/CodeHelper.php
deleted file mode 100644
index 3d7f130c40..0000000000
--- a/apps/advanced/backend/tests/_helpers/CodeHelper.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for CodeGuy
-
-class CodeHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../unit/_bootstrap.php';
-    }
-}
diff --git a/apps/advanced/backend/tests/_helpers/TestHelper.php b/apps/advanced/backend/tests/_helpers/TestHelper.php
deleted file mode 100644
index b68c002ce4..0000000000
--- a/apps/advanced/backend/tests/_helpers/TestHelper.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for TestGuy
-
-class TestHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../functional/_bootstrap.php';
-    }
-}
diff --git a/apps/advanced/backend/tests/_helpers/WebHelper.php b/apps/advanced/backend/tests/_helpers/WebHelper.php
deleted file mode 100644
index a876df00c8..0000000000
--- a/apps/advanced/backend/tests/_helpers/WebHelper.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for WebGuy
-
-class WebHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../acceptance/_bootstrap.php';
-    }
-}
diff --git a/apps/advanced/backend/tests/acceptance.suite.yml b/apps/advanced/backend/tests/acceptance.suite.yml
index 1eca29816c..fa31ffbe95 100644
--- a/apps/advanced/backend/tests/acceptance.suite.yml
+++ b/apps/advanced/backend/tests/acceptance.suite.yml
@@ -11,7 +11,6 @@
 class_name: WebGuy
 modules:
     enabled:
-        - WebHelper
         - PhpBrowser
         - common\tests\_helpers\FixtureHelper
 # you can use WebDriver instead of PhpBrowser to test javascript and ajax.
diff --git a/apps/advanced/backend/tests/functional.suite.yml b/apps/advanced/backend/tests/functional.suite.yml
index 5242b9b7b4..3c828f5c15 100644
--- a/apps/advanced/backend/tests/functional.suite.yml
+++ b/apps/advanced/backend/tests/functional.suite.yml
@@ -10,7 +10,6 @@ class_name: TestGuy
 modules:
     enabled:
       - Filesystem
-      - TestHelper
       - Yii2
       - common\tests\_helpers\FixtureHelper
     config:
diff --git a/apps/advanced/backend/tests/unit.suite.yml b/apps/advanced/backend/tests/unit.suite.yml
index 04873a876e..f0573a843a 100644
--- a/apps/advanced/backend/tests/unit.suite.yml
+++ b/apps/advanced/backend/tests/unit.suite.yml
@@ -4,5 +4,3 @@
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
 class_name: CodeGuy
-modules:
-    enabled: [CodeHelper]
diff --git a/apps/advanced/common/codeception.yml b/apps/advanced/common/codeception.yml
index 5b1f44130a..6d2019c859 100644
--- a/apps/advanced/common/codeception.yml
+++ b/apps/advanced/common/codeception.yml
@@ -1,3 +1,4 @@
+actor: Tester
 paths:
     tests: tests
     log: tests/_log
diff --git a/apps/advanced/common/tests/_helpers/CodeHelper.php b/apps/advanced/common/tests/_helpers/CodeHelper.php
deleted file mode 100644
index 3d7f130c40..0000000000
--- a/apps/advanced/common/tests/_helpers/CodeHelper.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for CodeGuy
-
-class CodeHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../unit/_bootstrap.php';
-    }
-}
diff --git a/apps/advanced/common/tests/unit.suite.yml b/apps/advanced/common/tests/unit.suite.yml
index a634606af8..f0573a843a 100644
--- a/apps/advanced/common/tests/unit.suite.yml
+++ b/apps/advanced/common/tests/unit.suite.yml
@@ -4,6 +4,3 @@
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
 class_name: CodeGuy
-modules:
-    enabled:
-      - CodeHelper
diff --git a/apps/advanced/console/codeception.yml b/apps/advanced/console/codeception.yml
index 5b1f44130a..6d2019c859 100644
--- a/apps/advanced/console/codeception.yml
+++ b/apps/advanced/console/codeception.yml
@@ -1,3 +1,4 @@
+actor: Tester
 paths:
     tests: tests
     log: tests/_log
diff --git a/apps/advanced/console/tests/_helpers/CodeHelper.php b/apps/advanced/console/tests/_helpers/CodeHelper.php
deleted file mode 100644
index 3d7f130c40..0000000000
--- a/apps/advanced/console/tests/_helpers/CodeHelper.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for CodeGuy
-
-class CodeHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../unit/_bootstrap.php';
-    }
-}
diff --git a/apps/advanced/console/tests/unit.suite.yml b/apps/advanced/console/tests/unit.suite.yml
index 04873a876e..f0573a843a 100644
--- a/apps/advanced/console/tests/unit.suite.yml
+++ b/apps/advanced/console/tests/unit.suite.yml
@@ -4,5 +4,3 @@
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
 class_name: CodeGuy
-modules:
-    enabled: [CodeHelper]
diff --git a/apps/advanced/frontend/codeception.yml b/apps/advanced/frontend/codeception.yml
index 5b1f44130a..6d2019c859 100644
--- a/apps/advanced/frontend/codeception.yml
+++ b/apps/advanced/frontend/codeception.yml
@@ -1,3 +1,4 @@
+actor: Tester
 paths:
     tests: tests
     log: tests/_log
diff --git a/apps/advanced/frontend/tests/_helpers/CodeHelper.php b/apps/advanced/frontend/tests/_helpers/CodeHelper.php
deleted file mode 100644
index 3d7f130c40..0000000000
--- a/apps/advanced/frontend/tests/_helpers/CodeHelper.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for CodeGuy
-
-class CodeHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../unit/_bootstrap.php';
-    }
-}
diff --git a/apps/advanced/frontend/tests/_helpers/TestHelper.php b/apps/advanced/frontend/tests/_helpers/TestHelper.php
deleted file mode 100644
index b68c002ce4..0000000000
--- a/apps/advanced/frontend/tests/_helpers/TestHelper.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for TestGuy
-
-class TestHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../functional/_bootstrap.php';
-    }
-}
diff --git a/apps/advanced/frontend/tests/_helpers/WebHelper.php b/apps/advanced/frontend/tests/_helpers/WebHelper.php
deleted file mode 100644
index a876df00c8..0000000000
--- a/apps/advanced/frontend/tests/_helpers/WebHelper.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for WebGuy
-
-class WebHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../acceptance/_bootstrap.php';
-    }
-}
diff --git a/apps/advanced/frontend/tests/acceptance.suite.yml b/apps/advanced/frontend/tests/acceptance.suite.yml
index 1eca29816c..fa31ffbe95 100644
--- a/apps/advanced/frontend/tests/acceptance.suite.yml
+++ b/apps/advanced/frontend/tests/acceptance.suite.yml
@@ -11,7 +11,6 @@
 class_name: WebGuy
 modules:
     enabled:
-        - WebHelper
         - PhpBrowser
         - common\tests\_helpers\FixtureHelper
 # you can use WebDriver instead of PhpBrowser to test javascript and ajax.
diff --git a/apps/advanced/frontend/tests/functional.suite.yml b/apps/advanced/frontend/tests/functional.suite.yml
index 5242b9b7b4..3c828f5c15 100644
--- a/apps/advanced/frontend/tests/functional.suite.yml
+++ b/apps/advanced/frontend/tests/functional.suite.yml
@@ -10,7 +10,6 @@ class_name: TestGuy
 modules:
     enabled:
       - Filesystem
-      - TestHelper
       - Yii2
       - common\tests\_helpers\FixtureHelper
     config:
diff --git a/apps/advanced/frontend/tests/unit.suite.yml b/apps/advanced/frontend/tests/unit.suite.yml
index 04873a876e..f0573a843a 100644
--- a/apps/advanced/frontend/tests/unit.suite.yml
+++ b/apps/advanced/frontend/tests/unit.suite.yml
@@ -4,5 +4,3 @@
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
 class_name: CodeGuy
-modules:
-    enabled: [CodeHelper]
diff --git a/apps/basic/codeception.yml b/apps/basic/codeception.yml
index 864fba0bff..496ebd9c3f 100644
--- a/apps/basic/codeception.yml
+++ b/apps/basic/codeception.yml
@@ -1,3 +1,4 @@
+actor: Tester
 paths:
     tests: tests
     log: tests/_log
diff --git a/apps/basic/tests/_helpers/CodeHelper.php b/apps/basic/tests/_helpers/CodeHelper.php
deleted file mode 100644
index 8ed57692d1..0000000000
--- a/apps/basic/tests/_helpers/CodeHelper.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-class CodeHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../unit/_bootstrap.php';
-    }
-}
diff --git a/apps/basic/tests/_helpers/TestHelper.php b/apps/basic/tests/_helpers/TestHelper.php
deleted file mode 100644
index 65f807666c..0000000000
--- a/apps/basic/tests/_helpers/TestHelper.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-class TestHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../functional/_bootstrap.php';
-    }
-}
diff --git a/apps/basic/tests/_helpers/WebHelper.php b/apps/basic/tests/_helpers/WebHelper.php
deleted file mode 100644
index c332c4ac48..0000000000
--- a/apps/basic/tests/_helpers/WebHelper.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-class WebHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../acceptance/_bootstrap.php';
-    }
-}
diff --git a/apps/basic/tests/acceptance.suite.yml b/apps/basic/tests/acceptance.suite.yml
index 2e35aa558d..bd10f82a16 100644
--- a/apps/basic/tests/acceptance.suite.yml
+++ b/apps/basic/tests/acceptance.suite.yml
@@ -11,7 +11,6 @@
 class_name: WebGuy
 modules:
     enabled:
-        - WebHelper
         - PhpBrowser
 # you can use WebDriver instead of PhpBrowser to test javascript and ajax.
 # This will require you to install selenium. See http://codeception.com/docs/04-AcceptanceTests#Selenium
diff --git a/apps/basic/tests/functional.suite.yml b/apps/basic/tests/functional.suite.yml
index 0d400afcbc..916ef1aaad 100644
--- a/apps/basic/tests/functional.suite.yml
+++ b/apps/basic/tests/functional.suite.yml
@@ -10,7 +10,6 @@ class_name: TestGuy
 modules:
     enabled:
       - Filesystem
-      - TestHelper
       - Yii2
     config:
         Yii2:
diff --git a/apps/basic/tests/unit.suite.yml b/apps/basic/tests/unit.suite.yml
index be2874d74a..f0573a843a 100644
--- a/apps/basic/tests/unit.suite.yml
+++ b/apps/basic/tests/unit.suite.yml
@@ -4,6 +4,3 @@
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
 class_name: CodeGuy
-modules:
-    enabled:
-        - CodeHelper