fix test

Dominus77 · May 2, 2018 · 79019d4 · 79019d4
1 parent 70b50e7
commit 79019d4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/SocialLikes.php b/SocialLikes.php
@@ -66,7 +66,7 @@ class SocialLikes extends \yii\base\Widget
     public function init()
     {
         parent::init();
-        $this->id = $this->id ? $this->id : $this->getId();
+        $this->id = $this->id ?: $this->getId();
         $containerOptions = [
             'id' => $this->id,
         ];
@@ -150,12 +150,13 @@ protected function registerClientButton($view)
     /**
      * @param \yii\web\View $view
      */
-    protected function registerClientOptions($view)
+    public function registerClientOptions($view)
     {
         if (!empty($this->clientOptions)) {
             $options = Json::encode($this->clientOptions);
+            $id = $this->containerOptions['id'];
             $script = new JsExpression("
-                var container = document.getElementById('{$this->id}');
+                var container = document.getElementById('{$id}');
                 var socialLikes = SocialLikesNext.default;
                 socialLikes(container, {$options});
             ");

diff --git a/tests/functional/SocialLikesTest.php b/tests/functional/SocialLikesTest.php
@@ -19,9 +19,6 @@ public function testGetClientOptions()
         $widget = new SocialLikes([
             'theme' => \dominus77\sociallikesnext\SocialLikes::THEME_FLAT,
             'title' => true,
-            'clientOptions' => [
-                'options' => true,
-            ],
             'containerOptions' => [
                 'class' => 'social-likes_vertical',
                 'data-url' => 'http://landscapists.info/',
@@ -32,9 +29,6 @@ public function testGetClientOptions()
         $clientOptions = [
             'theme' => 'flat',
             'title' => true,
-            'clientOptions' => [
-                'options' => true,
-            ],
             'containerOptions' => [
                 'class' => 'social-likes_vertical',
                 'data-url' => 'http://landscapists.info/',
@@ -78,4 +72,14 @@ public function testRun()
         ]);
         $this->assertEquals($widget->run(), null);
     }
+
+    public function testRegisterClientOptions()
+    {
+        $view = \Yii::$app->getView();
+        $widget = new SocialLikes();
+        $widget->clientOptions = [
+            'title' => 'GitHub'
+        ];
+        $this->assertEquals($widget->registerClientOptions($view), null);
+    }
 }
diff --git a/tests/functional/TestCase.php b/tests/functional/TestCase.php
@@ -101,8 +101,8 @@ protected function mockWebApplication($config = [], $appClass = '\yii\web\Applic
      */
     protected function getVendorPath()
     {
-        //return dirname(dirname(dirname(dirname(__DIR__)))) . '/yii2-developer.loc/vendor';
-        return dirname(dirname(__DIR__)) . '/vendor';
+        return dirname(dirname(dirname(dirname(__DIR__)))) . '/yii2-developer.loc/vendor';
+        //return dirname(dirname(__DIR__)) . '/vendor';
     }
 
     /**

diff --git a/tests/functional/bootstrap.php b/tests/functional/bootstrap.php
@@ -5,9 +5,9 @@
 define('YII_DEBUG', true);
 $_SERVER['SCRIPT_NAME'] = '/' . __DIR__;
 $_SERVER['SCRIPT_FILENAME'] = __FILE__;
-//require_once(__DIR__ . '/../../../../yii2-developer.loc/vendor/autoload.php');
-//require_once(__DIR__ . '/../../../../yii2-developer.loc/vendor/yiisoft/yii2/Yii.php');
-require_once(__DIR__ . '/../../vendor/autoload.php');
-require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
+require_once(__DIR__ . '/../../../../yii2-developer.loc/vendor/autoload.php');
+require_once(__DIR__ . '/../../../../yii2-developer.loc/vendor/yiisoft/yii2/Yii.php');
+//require_once(__DIR__ . '/../../vendor/autoload.php');
+//require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
 Yii::setAlias('@tests', __DIR__);
 require_once(__DIR__ . '/TestCase.php');
diff --git a/tests/functional/views/layouts/rawlayout.php b/tests/functional/views/layouts/rawlayout.php
@@ -3,4 +3,3 @@
 ?>
 
 <?php $this->beginPage(); ?>1<?php $this->head(); ?>2<?php $this->beginBody(); ?>3<?php $this->endBody(); ?>4<?php $this->endPage(); ?>
-