Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
}
},
"autoload-dev": {
"classmap": ["tests"]
"psr-4": {
"Tests\\": "tests/"
}
},
"extra": {
"branch-alias": {
Expand Down
19 changes: 18 additions & 1 deletion src/Auditable.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Request;
use Ramsey\Uuid\Uuid;

Expand Down Expand Up @@ -76,7 +77,9 @@ trait Auditable
*/
public static function bootAuditable()
{
static::observe(new AuditObserver());
if (static::isAuditEnabled()) {
static::observe(new AuditObserver());
}
}

/**
Expand Down Expand Up @@ -411,4 +414,18 @@ public function cleanHiddenAuditAttributes(array $attributes)

return $attributes;
}

/**
* Determine whether audit enabled.
*
* @return bool
*/
public static function isAuditEnabled()
{
if (App::runningInConsole() && !Config::get('auditing.audit_console')) {
return false;
}

return true;
}
}
30 changes: 30 additions & 0 deletions tests/AbstractTestCase.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

namespace Tests;

use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Config;
use Mockery;
use PHPUnit_Framework_TestCase;

abstract class AbstractTestCase extends PHPUnit_Framework_TestCase
{
public function tearDown()
{
Mockery::close();

parent::tearDown();
}

public function setUp()
{
App::shouldReceive('runningInConsole')
->andReturn(true);

Config::shouldReceive('get')
->with('auditing.audit_console')
->andReturn(true);

parent::setUp();
}
}
10 changes: 4 additions & 6 deletions tests/AuditObserverTest.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<?php

namespace Tests;

use Mockery;
use OwenIt\Auditing\AuditObserver;

class AuditObserverTest extends PHPUnit_Framework_TestCase
class AuditObserverTest extends AbstractTestCase
{
public function tearDown()
{
Mockery::close();
}

public function test_saving_handler_prepare_audit()
{
$observer = new AuditObserver();
Expand Down
27 changes: 21 additions & 6 deletions tests/AuditableTest.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<?php

namespace Tests;

use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Config;
use OwenIt\Auditing\Auditable;

class AuditableTest extends PHPUnit_Framework_TestCase
class AuditableTest extends AbstractTestCase
{
public function tearDown()
{
Mockery::close();
}

public function testItGetsTransformAudit()
{
$attributes = ['name' => 'Anterio', 'password' => '12345'];
Expand Down Expand Up @@ -72,6 +71,22 @@ public function testItGetsLogCustomMessage()

$this->assertEquals('{user.name} {type} a post {elapsed_time}', $logCustomMessage);
}

public function testItRunAuditingEnableConsole()
{
App::shouldReceive('runningInConsole')->once()->andReturn(true);
Config::shouldReceive('get')->once()->with('auditing.audit_console')->andReturn(true);

$model = new ModelAuditableTestRaw();

$this->assertTrue($model->isAuditEnabled());
}

public function testItRunAuditingDisabledConsole()
{
$model = new ModelAuditableTestRaw();
$this->assertTrue($model->isAuditEnabled());
}
}

class ModelAuditableTestRaw
Expand Down
10 changes: 4 additions & 6 deletions tests/AuditingQueuedAuditTest.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<?php

namespace Tests;

use Mockery;
use OwenIt\Auditing\AuditQueuedModels;

class AuditingQueuedAuditTest extends PHPUnit_Framework_TestCase
class AuditingQueuedAuditTest extends AbstractTestCase
{
public function tearDown()
{
Mockery::close();
}

public function testQueueAudit()
{
$job = new AuditQueuedModels('auditable');
Expand Down
13 changes: 3 additions & 10 deletions tests/AuditingTest.php
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
<?php

namespace Tests;

use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Config;
use OwenIt\Auditing\Auditing;

class AuditingTest extends PHPUnit_Framework_TestCase
class AuditingTest extends AbstractTestCase
{
public function tearDown()
{
Mockery::close();
}

public function tearUp()
{
}

public function testItGetsCustomMessages()
{
$auditing = new Auditing();
Expand Down