Merge branch 'master' into 3.1

composer.json

@@ -94,8 +94,9 @@
         "test": "phpunit -c phpunit.xml",
         "cs": "phpcs --standard=PSR2 src tests",
         "cbf" : "phpcbf --standard=PSR2 src tests",
+        "version": "php -r \"require(__DIR__.\\\"/src/Lavacharts.php\\\");echo \\Khill\\Lavacharts\\Lavacharts::VERSION;\"",
         "lavajs:release" : "gulp --cwd javascript release && git add javascript/dist/lava.js && git commit -m 'Releasing new build of the lava.js module' && git push",
-        "lavajs:dev" : "gulp --cwd javascript",
+        "lavajs:gulp" : "gulp --cwd javascript",
         "lavajs:pull" : "git subtree --prefix=javascript pull lavajs master",
         "lavajs:push" : "git subtree --prefix=javascript push lavajs master"
     },

src/Lavacharts.php

@@ -39,7 +39,7 @@ class Lavacharts
     /**
      * Lavacharts version
      */
-    const VERSION = '3.1.1';
+    const VERSION = '3.1.4';
     /**
      * Locale for the Charts and Dashboards.
@@ -343,7 +343,7 @@ class Lavacharts
         }
         if (is_array($elementId)) {
-            $div = $elementId;
+            $div = $elementId; // @TODO allow missing element ids to use renderable instance's id
         }
         if ($type == 'Dashboard') {

tests/LavachartsTest.php

@@ -99,7 +99,7 @@ class LavachartsTest extends ProvidersTestCase
     /**
      * @depends testCreateDataTableViaAlias
      */
-    public function testDirectRenderChart()
+    public function testRenderChart()
     {
         $this->lava->LineChart('test', $this->partialDataTable);
@@ -107,19 +107,35 @@ class LavachartsTest extends ProvidersTestCase
     }
     /**
-     * @depends testCreateDataTableViaAlias
+     * depends testCreateDataTableViaAlias
      */
-    public function testDirectRenderChartWithDivNoDimensions()
+    public function testRenderChartWithElementIdAndDivWithNoDimensions()
     {
         $this->lava->LineChart('test', $this->partialDataTable);
-        $this->assertTrue(is_string($this->lava->render('LineChart', 'test', 'test-div', true)));
+        $output = $this->lava->render('LineChart', 'test', 'test-div', true);
+
+        $this->assertStringHasString($output, '<div id="test-div"></div>');
+    }
+
+    /**
+     * depends testCreateDataTableViaAlias
+     */
+    public function testRenderChartWithNoElementIdAndDivNoDimensions()
+    {
+        $this->lava->LineChart('test', $this->partialDataTable, [
+            'elementId' => 'test-div'
+        ]);
+
+        $output = $this->lava->render('LineChart', 'test', true);
+
+        $this->assertStringHasString($output, '<div id="test-div"></div>');
     }
     /**
      * @depends testCreateDataTableViaAlias
      */
-    public function testDirectRenderChartWithDivAndDimensions()
+    public function testRenderChartWithDivAndDimensions()
     {
         $this->lava->LineChart('test', $this->partialDataTable);
@@ -134,7 +150,7 @@ class LavachartsTest extends ProvidersTestCase
     /**
      * @depends testCreateDataTableViaAlias
      */
-    public function testDirectRenderChartWithDivAndBadDimensionKeys()
+    public function testRenderChartWithDivAndBadDimensionKeys()
     {
         $this->lava->LineChart('test', $this->partialDataTable);
@@ -150,7 +166,7 @@ class LavachartsTest extends ProvidersTestCase
      * @depends testCreateDataTableViaAlias
      * @expectedException \Khill\Lavacharts\Exceptions\InvalidDivDimensions
      */
-    public function testDirectRenderChartWithDivAndBadDimensionType()
+    public function testRenderChartWithDivAndBadDimensionType()
     {
         $this->lava->LineChart('test', $this->partialDataTable);
@@ -161,7 +177,7 @@ class LavachartsTest extends ProvidersTestCase
      * @depends testCreateDataTableViaAlias
      * @expectedException \Khill\Lavacharts\Exceptions\InvalidConfigValue
      */
-    public function testDirectRenderChartWithDivAndDimensionsWithBadValues()
+    public function testRenderChartWithDivAndDimensionsWithBadValues()
     {
         $this->lava->LineChart('my-chart', $this->partialDataTable);

tests/ProvidersTestCase.php

@@ -33,6 +33,17 @@ abstract class ProvidersTestCase extends \PHPUnit_Framework_TestCase
         $this->partialDataTable = \Mockery::mock(DATATABLE_NS.'DataTable')->makePartial();
     }
+    /**
+     * Checks if a string contains another string
+     *
+     * @param $haystack
+     * @param $needle
+     */
+    public function assetStringHasString($haystack, $needle)
+    {
+        $this->assertTrue(strpos($haystack, $needle) !== false);
+    }
+
     /**
      * Uses reflection to retrieve private member variables from objects.
      *