Adjusted testing namespaces in application templates

apps/advanced/tests/codeception/backend/_bootstrap.php

@@ -18,4 +18,4 @@ $_SERVER['SCRIPT_FILENAME'] = YII_TEST_BACKEND_ENTRY_FILE;
 $_SERVER['SCRIPT_NAME'] = YII_BACKEND_TEST_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';
 
-Yii::setAlias('@codeception', dirname(__DIR__));
+Yii::setAlias('@tests', dirname(dirname(__DIR__)));

apps/advanced/tests/codeception/backend/acceptance.suite.yml

@@ -12,7 +12,7 @@ class_name: AcceptanceTester
 modules:
     enabled:
         - PhpBrowser
-        - codeception\common\_support\FixtureHelper
+        - tests\codeception\common\_support\FixtureHelper
 # 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
 # "restart" option is used by the WebDriver to start each time per test-file new session and cookies,

apps/advanced/tests/codeception/backend/acceptance/LoginCept.php

 <?php
 
-use codeception_backend\AcceptanceTester;
-use codeception\common\_pages\LoginPage;
+use tests\codeception\backend\AcceptanceTester;
+use tests\codeception\common\_pages\LoginPage;
 
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure login page works');

apps/advanced/tests/codeception/backend/codeception.yml

-namespace: codeception_backend
+namespace: tests\codeception\backend
 actor: Tester
 paths:
     tests: .

apps/advanced/tests/codeception/backend/functional.suite.yml

@@ -11,7 +11,7 @@ modules:
     enabled:
       - Filesystem
       - Yii2
-      - codeception\common\_support\FixtureHelper
+      - tests\codeception\common\_support\FixtureHelper
     config:
         Yii2:
             configFile: '../config/backend/functional.php'

apps/advanced/tests/codeception/backend/functional/LoginCept.php

 <?php
 
-use codeception_backend\FunctionalTester;
-use codeception\common\_pages\LoginPage;
+use tests\codeception\backend\FunctionalTester;
+use tests\codeception\common\_pages\LoginPage;
 
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure login page works');

apps/advanced/tests/codeception/backend/unit/DbTestCase.php

@@ -4,5 +4,5 @@ namespace backend\tests\unit;
 
 class DbTestCase extends \yii\codeception\DbTestCase
 {
-    public $appConfig = '@codeception/config/backend/unit.php';
+    public $appConfig = '@tests/codeception/config/backend/unit.php';
 }

apps/advanced/tests/codeception/backend/unit/TestCase.php

@@ -4,5 +4,5 @@ namespace backend\tests\unit;
 
 class TestCase extends \yii\codeception\TestCase
 {
-    public $appConfig = '@codeception/config/backend/unit.php';
+    public $appConfig = '@tests/codeception/config/backend/unit.php';
 }

apps/advanced/tests/codeception/common/_bootstrap.php

@@ -11,4 +11,4 @@ require(YII_APP_BASE_PATH . '/common/config/aliases.php');
 // set correct script paths
 $_SERVER['SERVER_NAME'] = 'localhost';
 
-Yii::setAlias('@codeception', dirname(__DIR__));
\ No newline at end of file
+Yii::setAlias('@tests', dirname(dirname(__DIR__)));
\ No newline at end of file

apps/advanced/tests/codeception/common/_pages/LoginPage.php

 <?php
 
-namespace codeception\common\_pages;
+namespace tests\codeception\common\_pages;
 
 use yii\codeception\BasePage;
 

apps/advanced/tests/codeception/common/_support/FixtureHelper.php

 <?php
 
-namespace codeception\common\_support;
+namespace tests\codeception\common\_support;
 
-use codeception\common\fixtures\UserFixture;
+use tests\codeception\common\fixtures\UserFixture;
 use Codeception\Module;
 use yii\test\FixtureTrait;
 
@@ -53,7 +53,7 @@ class FixtureHelper extends Module
         return [
             'user' => [
                 'class' => UserFixture::className(),
-                'dataFile' => '@codeception/common/fixtures/data/init_login.php',
+                'dataFile' => '@tests/codeception/common/fixtures/data/init_login.php',
             ],
         ];
     }

apps/advanced/tests/codeception/common/codeception.yml

-namespace: codeception_common
+namespace: tests\codeception\common
 actor: Tester
 paths:
     tests: .

apps/advanced/tests/codeception/common/fixtures/UserFixture.php

 <?php
 
-namespace codeception\common\fixtures;
+namespace tests\codeception\common\fixtures;
 
 use yii\test\ActiveFixture;
 

apps/advanced/tests/codeception/common/unit/DbTestCase.php

 <?php
 
-namespace codeception\common\unit;
+namespace tests\codeception\common\unit;
 
 /**
  * @inheritdoc
  */
 class DbTestCase extends \yii\codeception\DbTestCase
 {
-    public $appConfig = '@codeception/config/common/unit.php';
+    public $appConfig = '@tests/codeception/config/common/unit.php';
 }

apps/advanced/tests/codeception/common/unit/TestCase.php

 <?php
 
-namespace common\tests\unit;
+namespace tests\codeception\common\unit;
 
 /**
  * @inheritdoc
  */
 class TestCase extends \yii\codeception\TestCase
 {
-    public $appConfig = '@codeception/config/common/unit.php';
+    public $appConfig = '@tests/codeception/config/common/unit.php';
 }

apps/advanced/tests/codeception/common/unit/models/LoginFormTest.php

 <?php
 
-namespace codeception\common\unit\models;
+namespace tests\codeception\common\unit\models;
 
 use Yii;
-use codeception\common\unit\DbTestCase;
+use tests\codeception\common\unit\DbTestCase;
 use Codeception\Specify;
 use common\models\LoginForm;
-use codeception\common\fixtures\UserFixture;
+use tests\codeception\common\fixtures\UserFixture;
 
 /**
  * Login form test
@@ -86,7 +86,7 @@ class LoginFormTest extends DbTestCase
         return [
             'user' => [
                 'class' => UserFixture::className(),
-                'dataFile' => '@codeception/common/unit/fixtures/data/models/user.php'
+                'dataFile' => '@tests/codeception/common/unit/fixtures/data/models/user.php'
             ],
         ];
     }

apps/advanced/tests/codeception/console/_bootstrap.php

@@ -11,4 +11,4 @@ require(YII_APP_BASE_PATH . '/common/config/aliases.php');
 // set correct script paths
 $_SERVER['SERVER_NAME'] = 'localhost';
 
-Yii::setAlias('@codeception', dirname(__DIR__));
\ No newline at end of file
+Yii::setAlias('@tests', dirname(dirname(__DIR__)));
\ No newline at end of file

apps/advanced/tests/codeception/console/codeception.yml

-namespace: codeception_console
+namespace: tests\codeception\console
 actor: Tester
 paths:
     tests: .

apps/advanced/tests/codeception/console/unit/DbTestCase.php

 <?php
 
-namespace console\tests\unit;
+namespace tests\codeception\console\unit;
 
 /**
  * @inheritdoc
  */
 class DbTestCase extends \yii\codeception\DbTestCase
 {
-    public $appConfig = '@codeception/config/console/config.php';
+    public $appConfig = '@tests/codeception/config/console/config.php';
 }

apps/advanced/tests/codeception/console/unit/TestCase.php

 <?php
 
-namespace console\tests\unit;
+namespace tests\codeception\console\unit;
 
 /**
  * @inheritdoc
  */
 class TestCase extends \yii\codeception\TestCase
 {
-    public $appConfig = '@codeception/config/console/config.php';
+    public $appConfig = '@tests/codeception/config/console/config.php';
 }

apps/advanced/tests/codeception/frontend/_bootstrap.php

@@ -18,4 +18,4 @@ $_SERVER['SCRIPT_FILENAME'] = FRONTEND_ENTRY_FILE;
 $_SERVER['SCRIPT_NAME'] = FRONTEND_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';
 
-Yii::setAlias('@codeception', dirname(__DIR__));
\ No newline at end of file
+Yii::setAlias('@tests', dirname(dirname(__DIR__)));
\ No newline at end of file

apps/advanced/tests/codeception/frontend/_pages/AboutPage.php

 <?php
 
-namespace codeception\frontend\_pages;
+namespace tests\codeception\frontend\_pages;
 
 use yii\codeception\BasePage;
 

apps/advanced/tests/codeception/frontend/_pages/ContactPage.php

 <?php
 
-namespace codeception\frontend\_pages;
+namespace tests\codeception\frontend\_pages;
 
 use yii\codeception\BasePage;
 

apps/advanced/tests/codeception/frontend/_pages/SignupPage.php

 <?php
 
-namespace codeception\frontend\_pages;
+namespace tests\codeception\frontend\_pages;
 
 use \yii\codeception\BasePage;
 

apps/advanced/tests/codeception/frontend/acceptance.suite.yml

@@ -12,7 +12,7 @@ class_name: AcceptanceTester
 modules:
     enabled:
         - PhpBrowser
-        - codeception\common\_support\FixtureHelper
+        - tests\codeception\common\_support\FixtureHelper
 # 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
 # "restart" option is used by the WebDriver to start each time per test-file new session and cookies,

apps/advanced/tests/codeception/frontend/acceptance/AboutCept.php

 <?php
-use codeception_frontend\AcceptanceTester;
-use codeception\frontend\_pages\AboutPage;
+use tests\codeception\frontend\AcceptanceTester;
+use tests\codeception\frontend\_pages\AboutPage;
 
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that about works');

apps/advanced/tests/codeception/frontend/acceptance/ContactCept.php

 <?php
-use codeception_frontend\AcceptanceTester;
-use codeception\frontend\_pages\ContactPage;
+use tests\codeception\frontend\AcceptanceTester;
+use tests\codeception\frontend\_pages\ContactPage;
 
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that contact works');

apps/advanced/tests/codeception/frontend/acceptance/HomeCept.php

 <?php
-use codeception_frontend\AcceptanceTester;
+use tests\codeception\frontend\AcceptanceTester;
 
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that home page works');

apps/advanced/tests/codeception/frontend/acceptance/LoginCept.php

 <?php
-use codeception_frontend\AcceptanceTester;
-use codeception\common\_pages\LoginPage;
+use tests\codeception\frontend\AcceptanceTester;
+use tests\codeception\common\_pages\LoginPage;
 
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure login page works');

apps/advanced/tests/codeception/frontend/acceptance/SignupCest.php

 <?php
 
-namespace codeception\frontend\acceptance;
+namespace tests\codeception\frontend\acceptance;
 
-use codeception\frontend\_pages\SignupPage;
+use tests\codeception\frontend\_pages\SignupPage;
 use common\models\User;
 
 class SignupCest

apps/advanced/tests/codeception/frontend/codeception.yml

-namespace: codeception_frontend
+namespace: tests\codeception\frontend
 actor: Tester
 paths:
     tests: .

apps/advanced/tests/codeception/frontend/functional.suite.yml

@@ -11,7 +11,7 @@ modules:
     enabled:
       - Filesystem
       - Yii2
-      - codeception\common\_support\FixtureHelper
+      - tests\codeception\common\_support\FixtureHelper
     config:
         Yii2:
             configFile: '../config/frontend/functional.php'

apps/advanced/tests/codeception/frontend/functional/AboutCept.php

 <?php
-use codeception_frontend\FunctionalTester;
-use codeception\frontend\_pages\AboutPage;
+use tests\codeception\frontend\FunctionalTester;
+use tests\codeception\frontend\_pages\AboutPage;
 
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that about works');

apps/advanced/tests/codeception/frontend/functional/ContactCept.php

 <?php
-use codeception_frontend\FunctionalTester;
-use codeception\frontend\_pages\ContactPage;
+use tests\codeception\frontend\FunctionalTester;
+use tests\codeception\frontend\_pages\ContactPage;
 
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that contact works');

apps/advanced/tests/codeception/frontend/functional/HomeCept.php

 <?php
-use codeception_frontend\FunctionalTester;
+use tests\codeception\frontend\FunctionalTester;
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);

apps/advanced/tests/codeception/frontend/functional/LoginCept.php

 <?php
-use codeception_frontend\FunctionalTester;
-use codeception\common\_pages\LoginPage;
+use tests\codeception\frontend\FunctionalTester;
+use tests\codeception\common\_pages\LoginPage;
 
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure login page works');

apps/advanced/tests/codeception/frontend/functional/SignupCest.php

 <?php
 
-namespace codeception\frontend\functional;
+namespace tests\codeception\frontend\functional;
 
-use codeception\frontend\_pages\SignupPage;
+use tests\codeception\frontend\_pages\SignupPage;
 use common\models\User;
 
 class SignupCest

apps/advanced/tests/codeception/frontend/unit/DbTestCase.php

 <?php
 
-namespace codeception\frontend\unit;
+namespace tests\codeception\frontend\unit;
 
 /**
  * @inheritdoc
  */
 class DbTestCase extends \yii\codeception\DbTestCase
 {
-    public $appConfig = '@codeception/config/frontend/unit.php';
+    public $appConfig = '@tests/codeception/config/frontend/unit.php';
 }

apps/advanced/tests/codeception/frontend/unit/TestCase.php

 <?php
 
-namespace codeception\frontend\unit;
+namespace tests\codeception\frontend\unit;
 
 /**
  * @inheritdoc
  */
 class TestCase extends \yii\codeception\TestCase
 {
-    public $appConfig = '@codeception/config/frontend/unit.php';
+    public $appConfig = '@tests/codeception/config/frontend/unit.php';
 }

apps/advanced/tests/codeception/frontend/unit/models/ContactFormTest.php

 <?php
 
-namespace codeception\frontend\unit\models;
+namespace tests\codeception\frontend\unit\models;
 
 use Yii;
-use codeception\frontend\unit\TestCase;
+use tests\codeception\frontend\unit\TestCase;
 use frontend\models\ContactForm;
 
 class ContactFormTest extends TestCase

apps/advanced/tests/codeception/frontend/unit/models/PasswordResetRequestFormTest.php

 <?php
 
-namespace codeception\frontend\tests\models;
+namespace tests\codeception\frontend\models;
 
 use Yii;
-use codeception\frontend\unit\DbTestCase;
+use tests\codeception\frontend\unit\DbTestCase;
 use frontend\models\PasswordResetRequestForm;
-use codeception\common\fixtures\UserFixture;
+use tests\codeception\common\fixtures\UserFixture;
 use common\models\User;
 use Codeception\Specify;
 
@@ -75,7 +75,7 @@ class PasswordResetRequestFormTest extends DbTestCase
         return [
             'user' => [
                 'class' => UserFixture::className(),
-                'dataFile' => '@codeception/frontend/unit/fixtures/data/models/user.php'
+                'dataFile' => '@tests/codeception/frontend/unit/fixtures/data/models/user.php'
             ],
         ];
     }

apps/advanced/tests/codeception/frontend/unit/models/ResetPasswordFormTest.php

 <?php
 
-namespace codeception\frontend\unit\models;
+namespace tests\codeception\frontend\unit\models;
 
-use codeception\frontend\unit\DbTestCase;
-use codeception\common\fixtures\UserFixture;
+use tests\codeception\frontend\unit\DbTestCase;
+use tests\codeception\common\fixtures\UserFixture;
 use frontend\models\ResetPasswordForm;
 
 class ResetPasswordFormTest extends DbTestCase
@@ -36,7 +36,7 @@ class ResetPasswordFormTest extends DbTestCase
         return [
             'user' => [
                 'class' => UserFixture::className(),
-                'dataFile' => '@codeception/frontend/unit/fixtures/data/models/user.php'
+                'dataFile' => '@tests/codeception/frontend/unit/fixtures/data/models/user.php'
             ],
         ];
     }

apps/advanced/tests/codeception/frontend/unit/models/SignupFormTest.php

 <?php
 
-namespace codeception\frontend\unit\models;
+namespace tests\codeception\frontend\unit\models;
 
-use codeception\frontend\unit\DbTestCase;
-use codeception\common\fixtures\UserFixture;
+use tests\codeception\frontend\unit\DbTestCase;
+use tests\codeception\common\fixtures\UserFixture;
 use Codeception\Specify;
 use frontend\models\SignupForm;
 
@@ -45,7 +45,7 @@ class SignupFormTest extends DbTestCase
         return [
             'user' => [
                 'class' => UserFixture::className(),
-                'dataFile' => '@codeception/frontend/unit/fixtures/data/models/user.php',
+                'dataFile' => '@tests/codeception/frontend/unit/fixtures/data/models/user.php',
             ],
         ];
     }

apps/basic/tests/codeception/_bootstrap.php

@@ -12,4 +12,4 @@ $_SERVER['SCRIPT_FILENAME'] = YII_TEST_ENTRY_FILE;
 $_SERVER['SCRIPT_NAME'] = YII_TEST_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';
 
-Yii::setAlias('@codeception', __DIR__);
+Yii::setAlias('@tests', dirname(__DIR__));

apps/basic/tests/codeception/_pages/AboutPage.php

 <?php
 
-namespace codeception\_pages;
+namespace tests\codeception\_pages;
 
 use yii\codeception\BasePage;
 

apps/basic/tests/codeception/_pages/ContactPage.php

 <?php
 
-namespace codeception\_pages;
+namespace tests\codeception\_pages;
 
 use yii\codeception\BasePage;
 

apps/basic/tests/codeception/_pages/LoginPage.php

 <?php
 
-namespace codeception\_pages;
+namespace tests\codeception\_pages;
 
 use yii\codeception\BasePage;
 

apps/basic/tests/codeception/acceptance/AboutCept.php

 <?php
 
-use codeception\_pages\AboutPage;
+use tests\codeception\_pages\AboutPage;
 
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that about works');

apps/basic/tests/codeception/acceptance/ContactCept.php

 <?php
 
-use codeception\_pages\ContactPage;
+use tests\codeception\_pages\ContactPage;
 
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that contact works');

apps/basic/tests/codeception/acceptance/LoginCept.php

 <?php
 
-use codeception\_pages\LoginPage;
+use tests\codeception\_pages\LoginPage;
 
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that login works');

apps/basic/tests/codeception/functional/AboutCept.php

 <?php
 
-use codeception\_pages\AboutPage;
+use tests\codeception\_pages\AboutPage;
 
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that about works');

apps/basic/tests/codeception/functional/ContactCept.php

 <?php
 
-use codeception\_pages\ContactPage;
+use tests\codeception\_pages\ContactPage;
 
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that contact works');

apps/basic/tests/codeception/functional/LoginCept.php

 <?php
 
-use codeception\_pages\LoginPage;
+use tests\codeception\_pages\LoginPage;
 
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that login works');

apps/basic/tests/codeception/unit/models/ContactFormTest.php

 <?php
 
-namespace codeception\unit\models;
+namespace tests\codeception\unit\models;
 
 use Yii;
 use yii\codeception\TestCase;

apps/basic/tests/codeception/unit/models/LoginFormTest.php

 <?php
 
-namespace codeception\unit\models;
+namespace tests\codeception\unit\models;
 
 use Yii;
 use yii\codeception\TestCase;

apps/basic/tests/codeception/unit/models/UserTest.php

 <?php
 
-namespace codeception\unit\models;
+namespace tests\codeception\unit\models;
 
 use yii\codeception\TestCase;
 

extensions/codeception/TestCase.php

@@ -31,7 +31,7 @@ class TestCase extends Test
      * The application configuration array may contain an optional `class` element which specifies the class
      * name of the application instance to be created. By default, a [[\yii\web\Application]] instance will be created.
      */
-    public $appConfig = '@codeception/config/unit.php';
+    public $appConfig = '@tests/codeception/config/unit.php';
 
 
     /**