Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-09 01:26:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

"CClientScript" has been updated allowing to register scripts with HTML options.

Browse Source
This commit is contained in:
Paul Klimov
2013-03-06 13:25:31 +02:00
parent aa7fffe1b1
commit 4299c0d309
2 changed files with 97 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
tests/framework/web/CClientScriptTest.php
View File

@@ -155,6 +155,36 @@ class CClientScriptTest extends CTestCase
$returnedClientScript = $this->_clientScript->registerScript($id, $script, $position);
$this->assertEquals($assertion, $returnedClientScript->scripts[$position][$id]);
}
public function providerScriptsWithHtmlOptions()
{
return array(
array(
'jsId',
"function() {alert('alert')}",
CClientScript::POS_HEAD,
array('defer'=>true),
array(
'content'=>"function() {alert('alert')}",
'defer'=>true,
)
),
);
}
/**
* @dataProvider providerScriptsWithHtmlOptions
*
* @param string $id
* @param string $script
* @param integer $position
* @param array $htmlOptions
* @param string $assertion
*/
public function testRegisterScriptWithHtmlOptions($id, $script, $position, $htmlOptions, $assertion) {
$returnedClientScript = $this->_clientScript->registerScript($id, $script, $position, $htmlOptions);
$this->assertEquals($assertion, $returnedClientScript->scripts[$position][$id]);
}
public function providerRegisterCss()
{
@@ -343,6 +373,28 @@ class CClientScriptTest extends CTestCase
array(),
CHtml::script("function() {alert('script')}")
),
// With HTML options
array(
'option_js_id',
"function() {alert('script')}",
CClientScript::POS_HEAD,
array('defer'=>true),
CHtml::script("function() {alert('script')}",array('defer'=>true))
),
array(
'option_js_id',
"function() {alert('script')}",
CClientScript::POS_BEGIN,
array('defer'=>true),
CHtml::script("function() {alert('script')}",array('defer'=>true))
),
array(
'option_js_id',
"function() {alert('script')}",
CClientScript::POS_END,
array('defer'=>true),
CHtml::script("function() {alert('script')}",array('defer'=>true))
),
);
}