Merge pull request #36 from danielme85/dev

Dev

Author: danielme85

.circleci/config.yml

@@ -17,19 +17,10 @@ jobs:
           name: Wait for Database Connection
           command: dockerize -wait tcp://localhost:3306 -timeout 1m
       - run: mysql -h 127.0.0.1 -u root -e "create database testing"
-
-      - restore_cache:
-          keys:
-            - composer-v1-{{ checksum "composer.json" }}
 
       - run: composer install --no-interaction
       - run: composer require jenssegers/mongodb --dev
       - run: composer require pcov/clobber --dev
-
-      - save_cache:
-          key: composer-v1-{{ checksum "composer.json" }}
-          paths:
-            - vendor
 
       - run:
           name: Run phpunit

src/migrations/2018_08_11_003343_create_log_table.php

@@ -13,7 +13,7 @@ class CreateLogTable extends Migration
      */
     public function up()
     {
-        if (!Schema::connection(config('logtodb.connection'))->hasTable(config('logtodb.collection'))) {
+        if (Schema::connection(config('logtodb.connection'))->hasTable(config('logtodb.collection')) === false) {
             Schema::connection(config('logtodb.connection'))->create(config('logtodb.collection'), function (Blueprint $table) {
                 $table->increments('id');
                 $table->text('message')->nullable();

tests/LogToDbTest.php

@@ -18,12 +18,11 @@ protected function setUp(): void
         parent::setUp();
 
         if (!$this->migrated) {
-            $this->loadMigrationsFrom(__DIR__ . '/../src/migrations');
+            $this->loadMigrationsFrom(__DIR__.'/../src/migrations');
             if ($this->artisan('migrate', [
                 '--database' => 'mysql'])) {
                 $this->migrated = true;
             }
-
         }
     }
 
@@ -106,6 +105,8 @@ protected function getEnvironmentSetUp($app)
                 'name' => 'limited',
             ]
         ]);
+
+        $app['config']->set('logtodb', include __DIR__.'/../src/config/logtodb.php');
     }
 
     /**
@@ -126,24 +127,6 @@ protected function getPackageProviders($app)
         ];
     }
 
-    /**
-     * Test the vendor:publish command for the migration file.
-     *
-     * @group publish
-     */
-    public function testVendorPublish()
-    {
-        $this->artisan('vendor:publish', [
-            '--tag' => 'migrations',
-            '--provider' => 'danielme85\LaravelLogToDB\ServiceProvider'
-        ])->assertExitCode(0);
-
-        $this->artisan('vendor:publish', [
-            '--tag' => 'config',
-            '--provider' => 'danielme85\LaravelLogToDB\ServiceProvider'
-        ])->assertExitCode(0);
-    }
-
     /**
      * Basic test to see if class can be instanced.
      *
@@ -159,7 +142,6 @@ public function testClassInit()
         LogToDB::model('mongodb')->truncate();
     }
 
-
     /**
      * Run basic log levels
      *
@@ -356,16 +338,6 @@ public function testSaveNewLogEventJob()
         $this->assertNotEmpty($logToDb->model()->where('message', '=', 'job-test')->get());
     }
 
-    /**
-     * Test exception on save new log job.
-     * @group job
-     */
-    public function testExceptionOnSaveNewLogEvent()
-    {
-        $this->expectException(DBLogException::class);
-        $job = new SaveNewLogEvent(false, []);
-        $job->handle();
-    }
 
     /**
      * Test model interaction
@@ -374,6 +346,8 @@ public function testExceptionOnSaveNewLogEvent()
      */
     public function testModelInteraction()
     {
+        LogToDB::model()->truncate();
+        LogToDB::model('mongodb')->truncate();
 
         for ($i=1; $i<=10; $i++) {
             Log::debug("This is debug log message...");
@@ -447,6 +421,7 @@ public function testModelInteraction()
         $logs = $modelMongo->where('level_name', '=', 'DEBUG')->get()->toArray();
         $this->assertNotEmpty($logs);
         $this->assertEquals('DEBUG', $logs[0]['level_name']);
+        $this->assertCount(10, $logs);
 
         //Same tests for mongoDB
         $modelMongo = LogToDB::model('mongodb', 'mongodb', 'log');
@@ -457,6 +432,7 @@ public function testModelInteraction()
         $logs = $modelMongo->where('level_name', '=', 'DEBUG')->get()->toArray();
         $this->assertNotEmpty($logs);
         $this->assertEquals('DEBUG', $logs[0]['level_name']);
+        $this->assertCount(10, $logs);
 
         //Same tests for mongoDB
         $modelMongo = LogToDB::model(null, 'mongodb');
@@ -467,10 +443,9 @@ public function testModelInteraction()
         $logs = $modelMongo->where('level_name', '=', 'DEBUG')->get()->toArray();
         $this->assertNotEmpty($logs);
         $this->assertEquals('DEBUG', $logs[0]['level_name']);
-
+        $this->assertCount(10, $logs);
     }
 
-
     /**
      * $group model
      */