Merge branch 'main' into codex/remove-danish-locale-from-taskfactory

Author: michal78

phpunit.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php"
+         colors="true"
+         verbose="true">
+    <testsuites>
+        <testsuite name="Package Tests">
+            <directory suffix="Test.php">./tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

src/Models/Task.php

@@ -108,7 +108,7 @@ public function scopeOverdue($query): mixed
      */
     public function scopeDueToday($query): mixed
     {
-        return $query->where('due_date', now()->format('Y-m-d'));
+        return $query->whereDate('due_date', '=', now());
     }
 
     /**
@@ -117,7 +117,7 @@ public function scopeDueToday($query): mixed
      */
     public function scopeDueTomorrow($query): mixed
     {
-        return $query->where('due_date', now()->addDay()->format('Y-m-d'));
+        return $query->whereDate('due_date', '=', now()->addDay());
     }
 
     /**
@@ -126,7 +126,7 @@ public function scopeDueTomorrow($query): mixed
      */
     public function scopeDueThisWeek($query): mixed
     {
-        return $query->whereBetween('due_date', [now()->startOfWeek()->format('Y-m-d'), now()->endOfWeek()->format('Y-m-d')]);
+        return $query->whereBetween('due_date', [now()->startOfWeek(), now()->endOfWeek()]);
     }
 
     /**
@@ -135,7 +135,7 @@ public function scopeDueThisWeek($query): mixed
      */
     public function scopeDueNextWeek($query): mixed
     {
-        return $query->whereBetween('due_date', [now()->addWeek()->startOfWeek()->format('Y-m-d'), now()->addWeek()->endOfWeek()->format('Y-m-d')]);
+        return $query->whereBetween('due_date', [now()->addWeek()->startOfWeek(), now()->addWeek()->endOfWeek()]);
     }
 
     /**
@@ -144,7 +144,7 @@ public function scopeDueNextWeek($query): mixed
      */
     public function scopeDueThisMonth($query): mixed
     {
-        return $query->whereBetween('due_date', [now()->startOfMonth()->format('Y-m-d'), now()->endOfMonth()->format('Y-m-d')]);
+        return $query->whereBetween('due_date', [now()->startOfMonth(), now()->endOfMonth()]);
     }
 
     /**
@@ -153,7 +153,7 @@ public function scopeDueThisMonth($query): mixed
      */
     public function scopeDueNextMonth($query): mixed
     {
-        return $query->whereBetween('due_date', [now()->addMonth()->startOfMonth()->format('Y-m-d'), now()->addMonth()->endOfMonth()->format('Y-m-d')]);
+        return $query->whereBetween('due_date', [now()->addMonth()->startOfMonth(), now()->addMonth()->endOfMonth()]);
     }
 
     /**
@@ -162,7 +162,7 @@ public function scopeDueNextMonth($query): mixed
      */
     public function scopeDueThisYear($query): mixed
     {
-        return $query->whereBetween('due_date', [now()->startOfYear()->format('Y-m-d'), now()->endOfYear()->format('Y-m-d')]);
+        return $query->whereBetween('due_date', [now()->startOfYear(), now()->endOfYear()]);
     }
 
     /**
@@ -171,7 +171,7 @@ public function scopeDueThisYear($query): mixed
      */
     public function scopeDueNextYear($query): mixed
     {
-        return $query->whereBetween('due_date', [now()->addYear()->startOfYear()->format('Y-m-d'), now()->addYear()->endOfYear()->format('Y-m-d')]);
+        return $query->whereBetween('due_date', [now()->addYear()->startOfYear(), now()->addYear()->endOfYear()]);
     }
 
     /**
@@ -252,7 +252,7 @@ public function scopeDueOnOrBetween($query, $from, $to): mixed
      */
     public function scopeDueOnOrBeforeToday($query): mixed
     {
-        return $query->where('due_date', '<=', now()->format('Y-m-d'));
+        return $query->whereDate('due_date', '<=', now());
     }
 
     /**
@@ -261,7 +261,7 @@ public function scopeDueOnOrBeforeToday($query): mixed
      */
     public function scopeDueOnOrAfterToday($query): mixed
     {
-        return $query->where('due_date', '>=', now()->format('Y-m-d'));
+        return $query->whereDate('due_date', '>=', now());
     }
 
     /**

tests/HasTasksTest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Michal78\Tasks\Tests;
+
+use Michal78\Tasks\Models\Task;
+
+class HasTasksTest extends TestCase
+{
+    public function test_model_can_create_and_retrieve_tasks()
+    {
+        $user = User::create(['name' => 'Test User']);
+
+        $task = $user->addTask(['name' => 'Test Task']);
+
+        $this->assertInstanceOf(Task::class, $task);
+        $this->assertEquals($user->id, $task->owner_id);
+        $this->assertEquals(User::class, $task->owner_class);
+
+        $this->assertCount(1, $user->tasks);
+        $this->assertTrue($user->tasks->first()->is($task));
+        $this->assertCount(1, $user->pendingTasks());
+    }
+}

tests/TestCase.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Michal78\Tasks\Tests;
+
+use Orchestra\Testbench\TestCase as Orchestra;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Michal78\Tasks\TasksServiceProvider;
+
+abstract class TestCase extends Orchestra
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Schema::create('users', function (Blueprint $table) {
+            $table->id();
+            $table->string('name')->nullable();
+            $table->timestamps();
+        });
+
+        // run package migrations
+        $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
+    }
+
+    protected function getPackageProviders($app)
+    {
+        return [
+            TasksServiceProvider::class,
+        ];
+    }
+
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('database.default', 'testing');
+        $app['config']->set('database.connections.testing', [
+            'driver' => 'sqlite',
+            'database' => ':memory:',
+            'prefix' => '',
+        ]);
+    }
+}

tests/User.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Michal78\Tasks\Tests;
+
+use Illuminate\Database\Eloquent\Model;
+use Michal78\Tasks\Traits\HasTasks;
+
+class User extends Model
+{
+    use HasTasks;
+
+    protected $table = 'users';
+
+    protected $guarded = [];
+}