Skip to content

Commit 6f7421f

Browse files
author
Eugene Tupikov
committed
Merge remote-tracking branch 'origin/master'
2 parents d9f3455 + fb3df46 commit 6f7421f

File tree

2 files changed

+43
-13
lines changed

2 files changed

+43
-13
lines changed

src/assets/MultipleInputAsset.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ class MultipleInputAsset extends AssetBundle
2020
'yii\web\JqueryAsset'
2121
];
2222

23-
public function init()
23+
public function __construct($config = [])
2424
{
25-
$this->sourcePath = __DIR__ . '/src/';
26-
27-
$this->js = [
28-
YII_DEBUG ? 'js/jquery.multipleInput.js' : 'js/jquery.multipleInput.min.js'
29-
];
30-
31-
$this->css = [
32-
YII_DEBUG ? 'css/multiple-input.css' : 'css/multiple-input.min.css'
33-
];
34-
35-
parent::init();
25+
$config = array_merge([
26+
'sourcePath' => __DIR__ . '/src/',
27+
'js' => [
28+
YII_DEBUG ? 'js/jquery.multipleInput.js' : 'js/jquery.multipleInput.min.js'
29+
],
30+
'css' => [
31+
YII_DEBUG ? 'css/multiple-input.css' : 'css/multiple-input.min.css'
32+
],
33+
], $config);
34+
35+
parent::__construct($config);
3636
}
3737

3838

39-
}
39+
}

tests/unit/MultipleInputAssetTest.php

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
3+
namespace unclead\multipleinput\tests\unit;
4+
use unclead\multipleinput\assets\MultipleInputAsset;
5+
6+
/**
7+
* Class MultipleInputAssetTest
8+
* @package unclead\multipleinput\tests\unit
9+
*/
10+
class MultipleInputAssetTest extends TestCase
11+
{
12+
public function testConstuctor() {
13+
$asset = new MultipleInputAsset();
14+
$this->assertIsString($asset->sourcePath);
15+
$this->assertCount(1, $asset->js);
16+
$this->assertCount(1, $asset->css);
17+
}
18+
19+
public function testSetEmptyJsViaConfig()
20+
{
21+
$asset = new MultipleInputAsset([
22+
'js' => [],
23+
'css' => [],
24+
'sourcePath' => 'test',
25+
]);
26+
$this->assertEquals('test', $asset->sourcePath);
27+
$this->assertCount(0, $asset->js);
28+
$this->assertCount(0, $asset->css);
29+
}
30+
}

0 commit comments

Comments
 (0)