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

改进Response类 增加think\response\View类 用于渲染模板响应输出

Browse Source
This commit is contained in:
thinkphp
2016-05-16 18:10:46 +08:00
parent 4870d743ac
commit c7c94258d0
9 changed files with 92 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tests/thinkphp/library/think/responseTest.php
View File

@@ -70,7 +70,6 @@ class responseTest extends \PHPUnit_Framework_TestCase
{
Config::set('default_ajax_return', $this->default_ajax_return);
Config::set('default_return_type', $this->default_return_type);
Response::create(Config::get('default_return_type')); // 会影响其他测试
}
/**
@@ -83,63 +82,24 @@ class responseTest extends \PHPUnit_Framework_TestCase
$dataArr["key"] = "value";
//$dataArr->key = "val";
$response = Response::create();
$result = $response->type('json')->send($dataArr);
$response = new \think\response\Json();
$result = $response->send($dataArr);
$this->assertEquals('{"key":"value"}', $result);
$_GET['callback'] = 'callback';
$result = $response->type('jsonp', ['var_jsonp_handler' => 'callback'])->send($dataArr);
$response = new \think\response\Jsonp();
$result = $response->options(['var_jsonp_handler' => 'callback'])->send($dataArr);
$this->assertEquals('callback({"key":"value"});', $result);
$response = new Response();
$response->transform(function () {
return "callbackreturndata";
});
$result = $response->send($dataArr);
$this->assertEquals("callbackreturndata", $result);
$_GET[Config::get('var_jsonp_handler')] = "";
}
/**
* @covers think\Response::transform
* @todo Implement testtransform().
*/
public function testtransform()
{
$response = Response::create();
$response->transform(function () {
return "callbackreturndata";
});
$dataArr = [];
$result = $response->send($dataArr);
$this->assertEquals("callbackreturndata", $result);
$response->transform(null);
}
/**
* @covers think\Response::type
* @todo Implement testType().
*/
public function testType()
{
$type = "json";
Response::create($type);
}
/**
* @covers think\Response::data
* @todo Implement testData().
*/
public function testData()
{
$data = "data";
$response = Response::create();
$response->data($data);
$response->data(null);
}
/**
* @#runInSeparateProcess
* @covers think\Response::redirect