From b878740f80ce7cfe2a0bc53956e3f7e4e0aa2f78 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sun, 10 Nov 2019 21:30:26 +0100
Subject: News: Bug fixes, cleanup, comments & formatting

Use more magically available methods and properties
Fixed atom feed and stats not using the new model
---
 tests/Unit/Controllers/Metrics/StatsTest.php | 42 ++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 12 deletions(-)

(limited to 'tests/Unit/Controllers/Metrics/StatsTest.php')

diff --git a/tests/Unit/Controllers/Metrics/StatsTest.php b/tests/Unit/Controllers/Metrics/StatsTest.php
index 9204f7db..54add688 100644
--- a/tests/Unit/Controllers/Metrics/StatsTest.php
+++ b/tests/Unit/Controllers/Metrics/StatsTest.php
@@ -5,6 +5,7 @@ namespace Engelsystem\Test\Unit\Controllers\Metrics;
 use Carbon\Carbon;
 use Engelsystem\Controllers\Metrics\Stats;
 use Engelsystem\Models\LogEntry;
+use Engelsystem\Models\News;
 use Engelsystem\Models\User\PasswordReset;
 use Engelsystem\Models\User\PersonalData;
 use Engelsystem\Models\User\State;
@@ -26,7 +27,6 @@ class StatsTest extends TestCase
      */
     public function testNewUsers()
     {
-        $this->initDatabase();
         $this->addUsers();
 
         $stats = new Stats($this->database);
@@ -38,7 +38,6 @@ class StatsTest extends TestCase
      */
     public function testVouchers()
     {
-        $this->initDatabase();
         $this->addUsers();
 
         $stats = new Stats($this->database);
@@ -50,7 +49,6 @@ class StatsTest extends TestCase
      */
     public function testTshirts()
     {
-        $this->initDatabase();
         $this->addUsers();
 
         $stats = new Stats($this->database);
@@ -63,7 +61,6 @@ class StatsTest extends TestCase
      */
     public function testTshirtSizes()
     {
-        $this->initDatabase();
         $this->addUsers();
 
         $stats = new Stats($this->database);
@@ -75,12 +72,30 @@ class StatsTest extends TestCase
         ]), $sizes);
     }
 
+
+    /**
+     * @covers \Engelsystem\Controllers\Metrics\Stats::announcements
+     */
+    public function testAnnouncements()
+    {
+        $this->addUsers();
+        $newsData = ['title' => 'Test', 'text' => 'Foo Bar', 'user_id' => 1];
+
+        (new News($newsData))->save();
+        (new News($newsData))->save();
+        (new News($newsData + ['is_meeting' => true]))->save();
+
+        $stats = new Stats($this->database);
+        $this->assertEquals(3, $stats->announcements());
+        $this->assertEquals(2, $stats->announcements(false));
+        $this->assertEquals(1, $stats->announcements(true));
+    }
+
     /**
      * @covers \Engelsystem\Controllers\Metrics\Stats::arrivedUsers
      */
     public function testArrivedUsers()
     {
-        $this->initDatabase();
         $this->addUsers();
 
         $stats = new Stats($this->database);
@@ -92,8 +107,6 @@ class StatsTest extends TestCase
      */
     public function testSessions()
     {
-        $this->initDatabase();
-
         $this->database
             ->getConnection()
             ->table('sessions')
@@ -114,8 +127,6 @@ class StatsTest extends TestCase
      */
     public function testDatabase()
     {
-        $this->initDatabase();
-
         $stats = new Stats($this->database);
 
         $read = $stats->databaseRead();
@@ -132,8 +143,6 @@ class StatsTest extends TestCase
      */
     public function testLogEntries()
     {
-        $this->initDatabase();
-
         (new LogEntry(['level' => LogLevel::INFO, 'message' => 'Some info']))->save();
         (new LogEntry(['level' => LogLevel::INFO, 'message' => 'Another info']))->save();
         (new LogEntry(['level' => LogLevel::CRITICAL, 'message' => 'A critical error!']))->save();
@@ -152,7 +161,6 @@ class StatsTest extends TestCase
      */
     public function testPasswordResets()
     {
-        $this->initDatabase();
         $this->addUsers();
 
         (new PasswordReset(['user_id' => 1, 'token' => 'loremIpsum123']))->save();
@@ -203,4 +211,14 @@ class StatsTest extends TestCase
             ->associate($user)
             ->save();
     }
+
+    /**
+     * Set up the environment
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->initDatabase();
+    }
 }
-- 
cgit v1.2.3-54-g00ecf