Fixes #1604: fixed URL and cookie problems.

Refactored tests.

apps/basic/config/codeception/acceptance.php

@@ -1,11 +0,0 @@
-<?php
-
-// configuration adjustments for codeception acceptance tests. Will be merged with web.php config.
-
-return [
-	'components' => [
-		'db' => [
-			'dsn' => 'mysql:host=localhost;dbname=yii2basic_acceptance',
-		],
-	],
-];

apps/basic/config/codeception/functional.php

@@ -1,17 +0,0 @@
-<?php
-
-// configuration adjustments for codeception functional tests. Will be merged with web.php config.
-
-return [
-	'components' => [
-		'db' => [
-			'dsn' => 'mysql:host=localhost;dbname=yii2basic_functional',
-		],
-		'request' => [
-			'enableCsrfValidation' => false,
-		],
-		'urlManager' => [
-			'baseUrl' => '/web/index.php',
-		],
-	],
-];

apps/basic/config/codeception/unit.php

@@ -1,15 +0,0 @@
-<?php
-
-// configuration adjustments for codeception unit tests. Will be merged with web.php config.
-
-return [
-	'components' => [
-		'fixture'	=>	[
-			'class'		=>	'yii\test\DbFixtureManager',
-			'basePath'	=>	'@tests/unit/fixtures',
-		],
-		'db' => [
-			'dsn' => 'mysql:host=localhost;dbname=yii2basic_unit',
-		],
-	],
-];

apps/basic/tests/README.md

@@ -1,35 +1,28 @@
 This folder contains various tests for the basic application.
 These tests are developed with [Codeception PHP Testing Framework](http://codeception.com/).
 
-To run the tests, follow these steps:
+After creating the basic application, follow these steps to prepare for the tests:
 
-1. Download Codeception([Quickstart step 1](http://codeception.com/quickstart)) and put the codeception.phar in the
+1. In the file `_bootstrap.php`, modify the definition of the constant `TEST_ENTRY_URL` so
-   application base directory (not in this `tests` directory!).
+   that it points to the correct entry script URL.
-2. Adjust the test configuration files based on your environment:
+2. Go to the application base directory and build the test suites:
-   - Configure the URL for [acceptance tests](http://codeception.com/docs/04-AcceptanceTests) in `acceptance.suite.yml`.
-     The URL should point to the `index-test-acceptance.php` file that is located under the `web` directory of the application.
-   - `functional.suite.yml` for [functional testing](http://codeception.com/docs/05-FunctionalTests) and
-     `unit.suite.yml` for [unit testing](http://codeception.com/docs/06-UnitTests) should already work out of the box
-     and should not need to be adjusted.
-   - If you want to run acceptance tests, you need to download [selenium standalone](http://www.seleniumhq.org/download/)
-     and start it with command `java -jar {selenium-standalone-name}.jar`.
-     After that you can use `WebDriver` codeception module that will connect to selenium and launch browser.
-     This also allows you to use [Xvfb](https://en.wikipedia.org/wiki/Xvfb) in your tests which allows you to run tests
-     without showing the running browser on the screen. There is codeception [blog post](http://codeception.com/05-24-2013/jenkins-ci-practice.html)
-     that explains how it works.
 
-3. Go to the application base directory and build the test suites:
    ```
-   php codecept.phar build    // rebuild test scripts, only need to be run once
+   vendor/bin/codecept build
-   ```
-4. Run the tests:
-   ```
-   php codecept.phar run      // run all available tests
-   // you can also run a test suite alone:
-   php codecept.phar run acceptance
-   php codecept.phar run functional
-   php codecept.phar run unit
    ```
 
+Now you can run the tests with the following commands:
+
+```
+# run all available tests
+vendor/bin/codecept run
+# run acceptance tests
+vendor/bin/codecept run acceptance
+# run functional tests
+vendor/bin/codecept run functional
+# run unit tests
+vendor/bin/codecept run unit
+```
+
 Please refer to [Codeception tutorial](http://codeception.com/docs/01-Introduction) for
-more details about writing acceptance, functional and unit tests.
+more details about writing and running acceptance, functional and unit tests.

apps/basic/tests/_bootstrap.php

@@ -1,9 +1,22 @@
 <?php
 
+// the entry script URL (without host info) for functional and acceptance tests
+// PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
+defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/yii2-basic/web/index-test.php');
+
+// the entry script file path for functional and acceptance tests
+defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php');
+
 defined('YII_DEBUG') or define('YII_DEBUG', true);
+
 defined('YII_ENV') or define('YII_ENV', 'test');
 
 require_once(__DIR__ . '/../vendor/autoload.php');
+
 require_once(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
 
+// set correct script paths
+$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+
 Yii::setAlias('@tests', __DIR__);

apps/basic/tests/acceptance.suite.yml

@@ -18,7 +18,7 @@ modules:
 #        - WebDriver
     config:
         PhpBrowser:
-            url: 'http://localhost/basic-app/web/index-test-acceptance.php'
+            url: 'http://localhost'
 #        WebDriver:
-#            url: 'http://localhost/basic-app/web/index-test-acceptance.php'
+#            url: 'http://localhost'
 #            browser: firefox

apps/basic/tests/acceptance/HomeCept.php

@@ -2,7 +2,7 @@
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure that home page works');
-$I->amOnPage('');
+$I->amOnPage(Yii::$app->homeUrl);
 $I->see('My Company');
 $I->seeLink('About');
 $I->click('About');

apps/basic/tests/acceptance/_bootstrap.php

@@ -1,8 +1,3 @@
 <?php
 
-$config = yii\helpers\ArrayHelper::merge(
+new yii\web\Application(require(__DIR__ . '/_config.php'));
-	require(__DIR__ . '/../../config/web.php'),
-	require(__DIR__ . '/../../config/codeception/acceptance.php')
-);
-
-$application = new yii\web\Application($config);

apps/basic/tests/acceptance/_config.php

@@ -0,0 +1,13 @@
+<?php
+
+use yii\helpers\ArrayHelper;
+
+$config = require(__DIR__ . '/../../config/web.php');
+
+return ArrayHelper::merge($config, [
+	'components' => [
+		'db' => [
+			'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance',
+		],
+	],
+]);

apps/basic/tests/functional.suite.yml

@@ -14,5 +14,4 @@ modules:
       - Yii2
     config:
         Yii2:
-            entryScript: 'web/index-test-functional.php'
+            configFile: 'tests/functional/_config.php'
-            url: 'http://localhost/'

apps/basic/tests/functional/HomeCept.php

@@ -2,7 +2,7 @@
 
 $I = new TestGuy($scenario);
 $I->wantTo('ensure that home page works');
-$I->amOnPage('');
+$I->amOnPage(Yii::$app->homeUrl);
 $I->see('My Company');
 $I->seeLink('About');
 $I->click('About');

apps/basic/tests/functional/_bootstrap.php

@@ -1,4 +1,3 @@
 <?php
 
-// create an application instance to support URL creation before running any test
+new yii\web\Application(require(__DIR__ . '/_config.php'));
-Yii::createObject(require(__DIR__ . '/../../web/index-test-functional.php'));

apps/basic/tests/functional/_config.php

@@ -0,0 +1,17 @@
+<?php
+
+use yii\helpers\ArrayHelper;
+
+// set correct script paths
+$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+
+$config = require(__DIR__ . '/../../config/web.php');
+
+return ArrayHelper::merge($config, [
+	'components' => [
+		'db' => [
+			'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
+		],
+	],
+]);

apps/basic/web/index-test-functional.php

@@ -1,11 +0,0 @@
-<?php
-
-// this file is used as the entry script for codeception functional testing
-
-$config = yii\helpers\ArrayHelper::merge(
-	require(__DIR__ . '/../config/web.php'),
-	require(__DIR__ . '/../config/codeception/functional.php')
-);
-
-$config['class'] = 'yii\web\Application';
-return $config;

apps/basic/web/index-test.php

@@ -1,6 +1,9 @@
 <?php
 
 // NOTE: Make sure this file is not accessible when deployed to production
+if (!in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
+	die('You are not allowed to access this file.');
+}
 
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'test');
@@ -8,9 +11,6 @@ defined('YII_ENV') or define('YII_ENV', 'test');
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
 
-$config = yii\helpers\ArrayHelper::merge(
+$config = require(__DIR__ . '/../tests/acceptance/_config.php');
-	require(__DIR__ . '/../config/web.php'),
-	require(__DIR__ . '/../config/codeception/acceptance.php')
-);
 
 (new yii\web\Application($config))->run();