Tests for Group Division

.github/workflows/ci.yml

@@ -62,8 +62,6 @@ jobs:
           DB_DATABASE: database/database.sqlite
         run: |
           php artisan db:seed
-      # - name: Execute tests (Unit and Feature tests) via PHPUnit
-      #   env:
-      #     DB_CONNECTION: sqlite
-      #     DB_DATABASE: database/database.sqlite
-      #   run: vendor/bin/phpunit
+      - name: Execute tests (Unit and Feature tests) via Pest
+        run: |
+          ./vendor/bin/pest

.gitignore

@@ -336,10 +336,6 @@ dist
 # Generated files
 .phpunit.cache
 
-# PHPUnit
-/app/phpunit.xml
-/phpunit.xml
-
 # Build data
 /build/
 

README.md

@@ -113,7 +113,7 @@ npm run lint:fix
 You can run the tests with:
 
 ```sh
-vendor/bin/phpunit
+php artisan test
 ```
 
 ### build

app/Helpers/GroupBalancedDivision.php

@@ -112,35 +112,38 @@ protected function assignNonDrinkers()
     {
         $nonDrinkerRegs = $this->registrations->where('drinks_alcohol', '=', false);
 
-        $nonDrinkerFillRates = $this->calcFillRate($nonDrinkerRegs);
+        // check if there are any non drinkers
+        if ($nonDrinkerRegs->count() > 0) {
+            $nonDrinkerFillRates = $this->calcFillRate($nonDrinkerRegs);
 
-        // If you can satisfy minNonDrinkers requirement with a balanced fill, do it first
-        if (array_sum($nonDrinkerFillRates[min(array_keys($nonDrinkerFillRates))]) > $this->minNonDrinkers) {
-            $this->assignBalanced($nonDrinkerRegs, $nonDrinkerRegs);
-        }
-
-        // Assign yet unassigned non-drinkers
-        $nonDrinkerRegs = $nonDrinkerRegs->where('group_id', '=', null)
-            ->shuffle();
+            // If you can satisfy minNonDrinkers requirement with a balanced fill, do it first
+            if (array_sum($nonDrinkerFillRates[min(array_keys($nonDrinkerFillRates))]) > $this->minNonDrinkers) {
+                $this->assignBalanced($nonDrinkerRegs, $nonDrinkerRegs);
+            }
 
-        // If chunking by minNonDrinkers would give more chunks than groups, increase chunk size by 1 until it fits
-        $nonDrinkersPerGroup = $this->minNonDrinkers;
-        while (($nonDrinkerRegs->count() / $nonDrinkersPerGroup) > $this->groups->count()) {
-            $nonDrinkersPerGroup++;
-        }
-        $chunks = $nonDrinkerRegs->chunk($nonDrinkersPerGroup);
+            // Assign yet unassigned non-drinkers
+            $nonDrinkerRegs = $nonDrinkerRegs->where('group_id', '=', null)
+                ->shuffle();
 
-        // Assign each chunk to a group
-        foreach ($this->groups as $group) {
-            if ($chunks->count() == 0) {
-                return;
+            // If chunking by minNonDrinkers would give more chunks than groups, increase chunk size by 1 until it fits
+            $nonDrinkersPerGroup = $this->minNonDrinkers;
+            while (($nonDrinkerRegs->count() / $nonDrinkersPerGroup) > $this->groups->count()) {
+                $nonDrinkersPerGroup++;
             }
-            $chunk = $chunks->pop();
+            $chunks = $nonDrinkerRegs->chunk($nonDrinkersPerGroup);
 
-            foreach ($chunk as $registration) {
-                $registration->group_id = $group->id;
-                $registration->queue_position = null;
-                $registration->save();
+            // Assign each chunk to a group
+            foreach ($this->groups as $group) {
+                if ($chunks->count() == 0) {
+                    return;
+                }
+                $chunk = $chunks->pop();
+
+                foreach ($chunk as $registration) {
+                    $registration->group_id = $group->id;
+                    $registration->queue_position = null;
+                    $registration->save();
+                }
             }
         }
     }

composer.json

@@ -24,7 +24,7 @@
     "laravel/sail": "^1.26",
     "mockery/mockery": "^1.6",
     "nunomaduro/collision": "^8.0",
-    "phpunit/phpunit": "^11.0.1",
+    "pestphp/pest": "^3.0",
     "scrumble-nl/laravel-model-ts-type": "^10.4"
   },
   "autoload": {
@@ -62,7 +62,10 @@
   "config": {
     "optimize-autoloader": true,
     "preferred-install": "dist",
-    "sort-packages": true
+    "sort-packages": true,
+    "allow-plugins": {
+      "pestphp/pest-plugin": true
+    }
   },
   "minimum-stability": "stable",
   "prefer-stable": true