mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

去除 MODULE_NAME CONTROLLER_NAME ACTION_NAME 常量

Browse Source
This commit is contained in:
thinkphp
2016-06-01 18:34:36 +08:00
parent 4a4c53bf6b
commit ac0cb9be42
11 changed files with 123 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/thinkphp/library/think/controllerTest.php
View File

@@ -18,6 +18,7 @@ namespace tests\thinkphp\library\think;
use ReflectionClass;
use think\Controller;
use think\Request;
use think\View;
require_once CORE_PATH . '../../helper.php';
@@ -93,16 +94,16 @@ class controllerTest extends \PHPUnit_Framework_TestCase
{
public function testInitialize()
{
$foo = new Foo;
$foo = new Foo(Request::instance());
$this->assertEquals('abcd', $foo->test);
}
public function testBeforeAction()
{
$obj = new Bar;
$obj = new Bar(Request::instance());
$this->assertEquals(7, $obj->test);
$obj = new Baz;
$obj = new Baz(Request::instance());
$this->assertEquals(19, $obj->test);
}
@@ -118,7 +119,7 @@ class controllerTest extends \PHPUnit_Framework_TestCase
public function testFetch()
{
$controller = new Foo;
$controller = new Foo(Request::instance());
$view = $this->getView($controller);
$template = dirname(__FILE__) . '/display.html';
$viewFetch = $view->fetch($template, ['name' => 'ThinkPHP']);
@@ -138,7 +139,7 @@ class controllerTest extends \PHPUnit_Framework_TestCase
public function testAssign()
{
$controller = new Foo;
$controller = new Foo(Request::instance());
$view = $this->getView($controller);
$controller->assign('abcd', 'dcba');
$controller->assign(['key1' => 'value1', 'key2' => 'value2']);
@@ -148,7 +149,7 @@ class controllerTest extends \PHPUnit_Framework_TestCase
public function testValidate()
{
$controller = new Foo;
$controller = new Foo(Request::instance());
$data = [
'username' => 'username',
'nickname' => 'nickname',