Fix tests

Author: yajra

composer.json

@@ -32,7 +32,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Yajra\\DataTables\\Tests\\": "tests/"
+      "Yajra\\DataTables\\Html\\Tests\\": "tests/"
     }
   },
   "extra": {

phpunit.xml

@@ -8,16 +8,10 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="Package Test Suite">
             <directory suffix=".php">./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <blacklist>
-            <directory suffix=".php">./vendor</directory>
-        </blacklist>
-    </filter>
 </phpunit>

src/Html/Builder.php

@@ -55,7 +55,7 @@ class Builder
      * @param  Factory  $view
      * @param  HtmlBuilder  $html
      */
-    public function __construct(protected Repository $config, protected Factory $view, protected HtmlBuilder $html)
+    public function __construct(public Repository $config, public Factory $view, public HtmlBuilder $html)
     {
         /** @var array $defaults */
         $defaults = $this->config->get('datatables-html.table', []);
@@ -74,28 +74,26 @@ public function __construct(protected Repository $config, protected Factory $vie
      * @param  string|null  $script
      * @param  array  $attributes
      * @return \Illuminate\Support\HtmlString
-     * @throws \Exception
      */
     public function scripts(string $script = null, array $attributes = ['type' => 'text/javascript']): HtmlString
     {
         $script = $script ?: $this->generateScripts();
         $attributes = $this->html->attributes($attributes);
 
-        return new HtmlString("<script{$attributes}>{$script}</script>\n");
+        return new HtmlString("<script{$attributes}>$script</script>");
     }
 
     /**
      * Get generated raw scripts.
      *
      * @return \Illuminate\Support\HtmlString
-     * @throws \Exception
      */
     public function generateScripts(): HtmlString
     {
         $parameters = $this->generateJson();
 
         return new HtmlString(
-            sprintf($this->template(), $this->getTableAttribute('id'), $parameters)
+            trim(sprintf($this->template(), $this->getTableAttribute('id'), $parameters))
         );
     }
 
@@ -172,7 +170,7 @@ public function table(array $attributes = [], bool $drawFooter = false, bool $dr
         $th = $this->compileTableHeaders();
         $htmlAttr = $this->html->attributes($this->tableAttributes);
 
-        $tableHtml = '<table '.$htmlAttr.'>';
+        $tableHtml = '<table'.$htmlAttr.'>';
         $searchHtml = $drawSearch ? '<tr class="search-filter">'.implode('',
                 $this->compileTableSearchHeaders()).'</tr>' : '';
         $tableHtml .= '<thead><tr>'.implode('', $th).'</tr>'.$searchHtml.'</thead>';

src/Html/HasTable.php

@@ -129,12 +129,19 @@ protected function compileTableHeaders(): array
         $th = [];
 
         $this->collection->each(function (Column $column) use (&$th) {
-            $thAttr = $this->html->attributes(array_merge(
-                Arr::only($column->toArray(), ['class', 'id', 'title', 'width', 'style', 'data-class', 'data-hide']),
-                $column->getAttributes(),
+            $only = Arr::only(
+                $column->toArray(),
+                ['class', 'id', 'title', 'width', 'style', 'data-class', 'data-hide']
+            );
+
+            $attributes = array_merge(
+                $only,
+                $column->attributes,
                 isset($column['titleAttr']) ? ['title' => $column['titleAttr']] : []
-            ));
-            $th[] = '<th '.$thAttr.'>'.$column['title'].'</th>';
+            );
+
+            $thAttr = $this->html->attributes($attributes);
+            $th[] = '<th'.$thAttr.'>'.$column['title'].'</th>';
         });
 
         return $th;

tests/HtmlBuilderTest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Yajra\DataTables\Html\Tests;
+
+use Orchestra\Testbench\TestCase as BaseTestCase;
+
+abstract class TestCase extends BaseTestCase
+{
+    /**
+     * Set up the environment.
+     *
+     * @param  \Illuminate\Foundation\Application  $app
+     */
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('app.debug', true);
+        $app['config']->set('database.default', 'sqlite');
+        $app['config']->set('database.connections.sqlite', [
+            'driver' => 'sqlite',
+            'database' => ':memory:',
+            'prefix' => '',
+        ]);
+    }
+
+    protected function getPackageProviders($app): array
+    {
+        return [
+            \Yajra\DataTables\DataTablesServiceProvider::class,
+            \Yajra\DataTables\HtmlServiceProvider::class,
+        ];
+    }
+}

tests/TestCase.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Yajra\DataTables\Html\Tests;
+
 use Illuminate\Support\Arr;
 use Mockery as m;
 use Yajra\DataTables\Factory;