Merge branch 'develop' into refactor/minify-on-the-fly

This commit is contained in:
Kijin Sung 2016-01-09 15:19:08 +09:00
commit 371f4a60b0
35 changed files with 2215 additions and 686 deletions

View file

@ -27,7 +27,8 @@ class ContextTest extends \Codeception\TestCase\Test
public function testSetGetVars()
{
$this->assertEquals(Context::get('var1'), null);
context::set('var1', 'val1');
Context::getInstance()->context = new stdClass;
Context::set('var1', 'val1');
$this->assertEquals(Context::get('var1'), 'val1');
Context::set('var2', 'val2');

View file

@ -10,7 +10,7 @@ class ValidatorTest extends \Codeception\TestCase\Test
public function _before()
{
global $lang;
if(!$lang) $lang = new stdClass();
$lang->filter = new stdClass();
$lang->filter->isnull = 'isnull';
$lang->filter->outofrange = 'outofrange';