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

修复Request Test中isAjax和isPjax错误的测试用例

Browse Source
This commit is contained in:
Gaozhen Ying
2017-09-08 10:56:11 +08:00
committed by ThinkPHP
parent 627cfe5616
commit 6d82fe4a56
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/thinkphp/library/think/config/ConfigInitTrait.php
View File

@@ -34,11 +34,11 @@ trait ConfigInitTrait
{ {
self::$internalConfigFoo = \Closure::bind(function($value = null) { self::$internalConfigFoo = \Closure::bind(function($value = null) {
return !is_null($value) ? Config::$config = $value : Config::$config; return !is_null($value) ? Config::$config = $value : Config::$config;
}, null, Config::class); }, null, '\\Think\\Config');
self::$internalRangeFoo = \Closure::bind(function($value = null) { self::$internalRangeFoo = \Closure::bind(function($value = null) {
return !is_null($value) ? Config::$range = $value : Config::$range; return !is_null($value) ? Config::$range = $value : Config::$range;
}, null, Config::class); }, null, '\\Think\\Config');
self::$originConfig = call_user_func(self::$internalConfigFoo); self::$originConfig = call_user_func(self::$internalConfigFoo);
self::$originRange = call_user_func(self::$internalRangeFoo); self::$originRange = call_user_func(self::$internalRangeFoo);

20
tests/thinkphp/library/think/requestTest.php
View File

@@ -157,15 +157,31 @@ class requestTest extends \PHPUnit_Framework_TestCase
public function testIsAjax() public function testIsAjax()
{ {
$request = Request::create(''); $request = Request::create('');
$this->assertFalse($request->isAjax());
$_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest'; $_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest';
$this->assertFalse($request->isAjax());
$this->assertFalse($request->isAjax(true));
$request->server(['HTTP_X_REQUESTED_WITH' => 'xmlhttprequest']);
$this->assertTrue($request->isAjax()); $this->assertTrue($request->isAjax());
} }
public function testIsPjax() public function testIsPjax()
{ {
$request = Request::create(''); $request = Request::create('');
$this->assertFalse($request->isPjax());
$_SERVER['HTTP_X_PJAX'] = true; $_SERVER['HTTP_X_PJAX'] = true;
$this->assertFalse($request->isPjax());
$this->assertFalse($request->isPjax(true));
$request->server(['HTTP_X_PJAX' => true]);
$this->assertTrue($request->isPjax());
$request->server(['HTTP_X_PJAX' => false]);
$this->assertTrue($request->isPjax()); $this->assertTrue($request->isPjax());
} }