From 98d3a8c050fa39254146724f1aa949d443e21529 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 11 Jul 2014 01:11:50 +0400
Subject: [PATCH] Fixes #4252, Fixes #3171 Fixed Codeception

---
 apps/advanced/backend/tests/_helpers/CodeHelper.php  | 4 ++++
 apps/advanced/backend/tests/_helpers/TestHelper.php  | 4 ++++
 apps/advanced/backend/tests/_helpers/WebHelper.php   | 4 ++++
 apps/advanced/common/tests/_helpers/CodeHelper.php   | 4 ++++
 apps/advanced/common/tests/_helpers/TestHelper.php   | 8 --------
 apps/advanced/common/tests/_helpers/WebHelper.php    | 8 --------
 apps/advanced/console/tests/_helpers/CodeHelper.php  | 4 ++++
 apps/advanced/console/tests/_helpers/TestHelper.php  | 8 --------
 apps/advanced/console/tests/_helpers/WebHelper.php   | 8 --------
 apps/advanced/frontend/tests/_helpers/CodeHelper.php | 4 ++++
 apps/advanced/frontend/tests/_helpers/TestHelper.php | 4 ++++
 apps/advanced/frontend/tests/_helpers/WebHelper.php  | 4 ++++
 apps/basic/tests/_helpers/CodeHelper.php             | 5 ++++-
 apps/basic/tests/_helpers/TestHelper.php             | 5 ++++-
 apps/basic/tests/_helpers/WebHelper.php              | 5 ++++-
 15 files changed, 44 insertions(+), 35 deletions(-)
 delete mode 100644 apps/advanced/common/tests/_helpers/TestHelper.php
 delete mode 100644 apps/advanced/common/tests/_helpers/WebHelper.php
 delete mode 100644 apps/advanced/console/tests/_helpers/TestHelper.php
 delete mode 100644 apps/advanced/console/tests/_helpers/WebHelper.php

diff --git a/apps/advanced/backend/tests/_helpers/CodeHelper.php b/apps/advanced/backend/tests/_helpers/CodeHelper.php
index eea532c3b7..3d7f130c40 100644
--- a/apps/advanced/backend/tests/_helpers/CodeHelper.php
+++ b/apps/advanced/backend/tests/_helpers/CodeHelper.php
@@ -5,4 +5,8 @@ namespace Codeception\Module;
 
 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
index 826e015968..b68c002ce4 100644
--- a/apps/advanced/backend/tests/_helpers/TestHelper.php
+++ b/apps/advanced/backend/tests/_helpers/TestHelper.php
@@ -5,4 +5,8 @@ namespace Codeception\Module;
 
 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
index ee7c81e282..a876df00c8 100644
--- a/apps/advanced/backend/tests/_helpers/WebHelper.php
+++ b/apps/advanced/backend/tests/_helpers/WebHelper.php
@@ -5,4 +5,8 @@ namespace Codeception\Module;
 
 class WebHelper extends \Codeception\Module
 {
+    public function _beforeSuite($settings = [])
+    {
+        include __DIR__.'/../acceptance/_bootstrap.php';
+    }
 }
diff --git a/apps/advanced/common/tests/_helpers/CodeHelper.php b/apps/advanced/common/tests/_helpers/CodeHelper.php
index eea532c3b7..3d7f130c40 100644
--- a/apps/advanced/common/tests/_helpers/CodeHelper.php
+++ b/apps/advanced/common/tests/_helpers/CodeHelper.php
@@ -5,4 +5,8 @@ namespace Codeception\Module;
 
 class CodeHelper extends \Codeception\Module
 {
+    public function _beforeSuite($settings = [])
+    {
+        include __DIR__.'/../unit/_bootstrap.php';
+    }
 }
diff --git a/apps/advanced/common/tests/_helpers/TestHelper.php b/apps/advanced/common/tests/_helpers/TestHelper.php
deleted file mode 100644
index 826e015968..0000000000
--- a/apps/advanced/common/tests/_helpers/TestHelper.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for TestGuy
-
-class TestHelper extends \Codeception\Module
-{
-}
diff --git a/apps/advanced/common/tests/_helpers/WebHelper.php b/apps/advanced/common/tests/_helpers/WebHelper.php
deleted file mode 100644
index ee7c81e282..0000000000
--- a/apps/advanced/common/tests/_helpers/WebHelper.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for WebGuy
-
-class WebHelper extends \Codeception\Module
-{
-}
diff --git a/apps/advanced/console/tests/_helpers/CodeHelper.php b/apps/advanced/console/tests/_helpers/CodeHelper.php
index eea532c3b7..3d7f130c40 100644
--- a/apps/advanced/console/tests/_helpers/CodeHelper.php
+++ b/apps/advanced/console/tests/_helpers/CodeHelper.php
@@ -5,4 +5,8 @@ namespace Codeception\Module;
 
 class CodeHelper extends \Codeception\Module
 {
+    public function _beforeSuite($settings = [])
+    {
+        include __DIR__.'/../unit/_bootstrap.php';
+    }
 }
diff --git a/apps/advanced/console/tests/_helpers/TestHelper.php b/apps/advanced/console/tests/_helpers/TestHelper.php
deleted file mode 100644
index 826e015968..0000000000
--- a/apps/advanced/console/tests/_helpers/TestHelper.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for TestGuy
-
-class TestHelper extends \Codeception\Module
-{
-}
diff --git a/apps/advanced/console/tests/_helpers/WebHelper.php b/apps/advanced/console/tests/_helpers/WebHelper.php
deleted file mode 100644
index ee7c81e282..0000000000
--- a/apps/advanced/console/tests/_helpers/WebHelper.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for WebGuy
-
-class WebHelper extends \Codeception\Module
-{
-}
diff --git a/apps/advanced/frontend/tests/_helpers/CodeHelper.php b/apps/advanced/frontend/tests/_helpers/CodeHelper.php
index eea532c3b7..3d7f130c40 100644
--- a/apps/advanced/frontend/tests/_helpers/CodeHelper.php
+++ b/apps/advanced/frontend/tests/_helpers/CodeHelper.php
@@ -5,4 +5,8 @@ namespace Codeception\Module;
 
 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
index 826e015968..b68c002ce4 100644
--- a/apps/advanced/frontend/tests/_helpers/TestHelper.php
+++ b/apps/advanced/frontend/tests/_helpers/TestHelper.php
@@ -5,4 +5,8 @@ namespace Codeception\Module;
 
 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
index ee7c81e282..a876df00c8 100644
--- a/apps/advanced/frontend/tests/_helpers/WebHelper.php
+++ b/apps/advanced/frontend/tests/_helpers/WebHelper.php
@@ -5,4 +5,8 @@ namespace Codeception\Module;
 
 class WebHelper extends \Codeception\Module
 {
+    public function _beforeSuite($settings = [])
+    {
+        include __DIR__.'/../acceptance/_bootstrap.php';
+    }
 }
diff --git a/apps/basic/tests/_helpers/CodeHelper.php b/apps/basic/tests/_helpers/CodeHelper.php
index 201503ddfe..8ed57692d1 100644
--- a/apps/basic/tests/_helpers/CodeHelper.php
+++ b/apps/basic/tests/_helpers/CodeHelper.php
@@ -3,5 +3,8 @@ namespace Codeception\Module;
 
 class CodeHelper extends \Codeception\Module
 {
-    // here you can define custom methods for CodeGuy
+    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
index ae9418775b..65f807666c 100644
--- a/apps/basic/tests/_helpers/TestHelper.php
+++ b/apps/basic/tests/_helpers/TestHelper.php
@@ -3,5 +3,8 @@ namespace Codeception\Module;
 
 class TestHelper extends \Codeception\Module
 {
-    // here you can define custom methods for TestGuy
+    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
index a8c72502ad..c332c4ac48 100644
--- a/apps/basic/tests/_helpers/WebHelper.php
+++ b/apps/basic/tests/_helpers/WebHelper.php
@@ -3,5 +3,8 @@ namespace Codeception\Module;
 
 class WebHelper extends \Codeception\Module
 {
-    // here you can define custom methods for WebGuy
+    public function _beforeSuite($settings = [])
+    {
+        include __DIR__.'/../acceptance/_bootstrap.php';
+    }
 }