From e124b41977504067f6e1b6b3bf2e39c9b1d31324 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 8 Oct 2019 13:57:50 +0200
Subject: Tests: TestCase: Initialize $this->app on every run

---
 tests/Unit/Controllers/AuthControllerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/Unit/Controllers/AuthControllerTest.php')

diff --git a/tests/Unit/Controllers/AuthControllerTest.php b/tests/Unit/Controllers/AuthControllerTest.php
index 6c237264..50ce014d 100644
--- a/tests/Unit/Controllers/AuthControllerTest.php
+++ b/tests/Unit/Controllers/AuthControllerTest.php
@@ -12,9 +12,9 @@ use Engelsystem\Http\Validation\Validator;
 use Engelsystem\Models\User\Settings;
 use Engelsystem\Models\User\User;
 use Engelsystem\Test\Unit\HasDatabase;
+use Engelsystem\Test\Unit\TestCase;
 use Illuminate\Support\Collection;
 use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
-- 
cgit v1.2.3-54-g00ecf


From 810068dcf811b17805ee9958b877a827bf8125ed Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 8 Oct 2019 14:18:51 +0200
Subject: Fixes: AuthController session error merging and StatsTest

---
 src/Controllers/AuthController.php            | 2 +-
 tests/Unit/Controllers/AuthControllerTest.php | 4 ++--
 tests/Unit/Controllers/Metrics/StatsTest.php  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests/Unit/Controllers/AuthControllerTest.php')

diff --git a/src/Controllers/AuthController.php b/src/Controllers/AuthController.php
index c69c2377..7892064b 100644
--- a/src/Controllers/AuthController.php
+++ b/src/Controllers/AuthController.php
@@ -88,7 +88,7 @@ class AuthController extends BaseController
         $user = $this->auth->authenticate($data['login'], $data['password']);
 
         if (!$user instanceof User) {
-            $this->session->set('errors', $this->session->get('errors', []) + ['auth.not-found']);
+            $this->session->set('errors', array_merge($this->session->get('errors', []), ['auth.not-found']));
 
             return $this->showLogin();
         }
diff --git a/tests/Unit/Controllers/AuthControllerTest.php b/tests/Unit/Controllers/AuthControllerTest.php
index 50ce014d..a12ed6d6 100644
--- a/tests/Unit/Controllers/AuthControllerTest.php
+++ b/tests/Unit/Controllers/AuthControllerTest.php
@@ -13,7 +13,6 @@ use Engelsystem\Models\User\Settings;
 use Engelsystem\Models\User\User;
 use Engelsystem\Test\Unit\HasDatabase;
 use Engelsystem\Test\Unit\TestCase;
-use Illuminate\Support\Collection;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -66,6 +65,7 @@ class AuthControllerTest extends TestCase
         $session = new Session(new MockArraySessionStorage());
         /** @var Validator|MockObject $validator */
         $validator = new Validator();
+        $session->set('errors', [['bar' => 'some.bar.error']]);
 
         $user = new User([
             'name'          => 'foo',
@@ -89,7 +89,7 @@ class AuthControllerTest extends TestCase
 
         $response->expects($this->once())
             ->method('withView')
-            ->with('pages/login', ['errors' => Collection::make(['auth.not-found'])])
+            ->with('pages/login', ['errors' => collect(['some.bar.error', 'auth.not-found'])])
             ->willReturn($response);
         $response->expects($this->once())
             ->method('redirectTo')
diff --git a/tests/Unit/Controllers/Metrics/StatsTest.php b/tests/Unit/Controllers/Metrics/StatsTest.php
index fa78d8c3..9204f7db 100644
--- a/tests/Unit/Controllers/Metrics/StatsTest.php
+++ b/tests/Unit/Controllers/Metrics/StatsTest.php
@@ -155,8 +155,8 @@ class StatsTest extends TestCase
         $this->initDatabase();
         $this->addUsers();
 
-        (new PasswordReset(['use_id' => 1, 'token' => 'loremIpsum123']))->save();
-        (new PasswordReset(['use_id' => 3, 'token' => '5omeR4nd0mTok3N']))->save();
+        (new PasswordReset(['user_id' => 1, 'token' => 'loremIpsum123']))->save();
+        (new PasswordReset(['user_id' => 3, 'token' => '5omeR4nd0mTok3N']))->save();
 
         $stats = new Stats($this->database);
         $this->assertEquals(2, $stats->passwordResets());
-- 
cgit v1.2.3-54-g00ecf