From 19af576f7087f27b3ae85e593a7fc148605623b8 Mon Sep 17 00:00:00 2001 From: freek Date: Mon, 30 Mar 2015 22:34:01 -0700 Subject: [PATCH] refactor --- composer.json | 4 ++- phpspec.yml | 5 ---- phpunit.xml | 17 +++++++++++ .../Activitylog/ActivitylogSupervisor.php | 8 ++++-- tests/ActivityLogSupervisorTest.php | 28 +++++++++++++++++++ 5 files changed, 53 insertions(+), 9 deletions(-) delete mode 100644 phpspec.yml create mode 100644 phpunit.xml create mode 100644 tests/ActivityLogSupervisorTest.php diff --git a/composer.json b/composer.json index ff9e303..c0e4c8c 100644 --- a/composer.json +++ b/composer.json @@ -17,9 +17,11 @@ "require": { "php": ">=5.4.0", "illuminate/support": "5.*" + }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.0", + "mockery/mockery": "0.9.*" }, "autoload": { "classmap": [ diff --git a/phpspec.yml b/phpspec.yml deleted file mode 100644 index 1315bb1..0000000 --- a/phpspec.yml +++ /dev/null @@ -1,5 +0,0 @@ -suites: - spatie_suite: - namespace: Spatie - src_path: src - spec_prefix: spec diff --git a/phpunit.xml b/phpunit.xml new file mode 100644 index 0000000..278f94d --- /dev/null +++ b/phpunit.xml @@ -0,0 +1,17 @@ + + + + + ./tests/ + + + diff --git a/src/Spatie/Activitylog/ActivitylogSupervisor.php b/src/Spatie/Activitylog/ActivitylogSupervisor.php index e9db69f..b21f5b0 100644 --- a/src/Spatie/Activitylog/ActivitylogSupervisor.php +++ b/src/Spatie/Activitylog/ActivitylogSupervisor.php @@ -1,5 +1,6 @@ logHandlers[] = $handler; - if (Config::get('activitylog.alsoLogInDefaultLog')) { + if ($config->get('activitylog.alsoLogInDefaultLog')) { $this->logHandlers[] = new DefaultLaravelHandler(); } } diff --git a/tests/ActivityLogSupervisorTest.php b/tests/ActivityLogSupervisorTest.php new file mode 100644 index 0000000..f2d0d27 --- /dev/null +++ b/tests/ActivityLogSupervisorTest.php @@ -0,0 +1,28 @@ +logHandler = Mockery::mock('\Spatie\Activitylog\Handlers\EloquentHandler'); + $this->config = Mockery::mock('\Illuminate\Config\Repository'); + + $this->config->shouldReceive('get')->andReturn(false); + $this->activityLogSupervisor = new \Spatie\Activitylog\ActivitylogSupervisor($this->logHandler, $this->config); + } + + /** + * @test + */ + public function testGetVisitorsAndPageViews() + { + $this->assertTrue(true); + } +} \ No newline at end of file