mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-29 15:22:15 +09:00
Merge branch 'develop' into refactor/minify-on-the-fly
This commit is contained in:
commit
371f4a60b0
35 changed files with 2215 additions and 686 deletions
|
|
@ -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');
|
||||
|
|
|
|||
|
|
@ -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';
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue