Feature/adjust requirment notification behavior (#32)

* adjust fail notifications

* fix tests

Author: SniperSister

app/Console/Commands/PerformUpdate.php

@@ -35,12 +35,6 @@ public function handle(): int
         /** @var Site $site */
         $site = Site::findOrFail($this->input->getArgument('siteId'));
 
-        if (!$site->update_requirement_state) {
-            $this->output->writeln('Update requirements not met, aborting!');
-
-            return Command::FAILURE;
-        }
-
         UpdateSite::dispatchSync(
             $site,
             $targetVersion

app/Console/Commands/QueueUpdates.php

@@ -39,7 +39,6 @@ public function handle(): int
         $this->output->writeln('Pushing update jobs');
 
         $sites = Site::query()
-            ->where('update_requirement_state', '=', true)
             ->where(
                 'cms_version',
                 'like',

app/Jobs/UpdateSite.php

@@ -51,12 +51,6 @@ public function handle(): void
             return;
         }
 
-        if (!$healthResult->update_requirement_state) {
-            Log::info("Site does not meet requirements, abort");
-
-            return;
-        }
-
         // Do not make a major version update
         $majorVersionCms = (int) $healthResult->cms_version;
         $majorTargetVersion = (int) $this->targetVersion;
@@ -67,6 +61,14 @@ public function handle(): void
             return;
         }
 
+        // Update is available, but let's check if the requirements are met
+        if (!$healthResult->update_requirement_state) {
+            throw new UpdateException(
+                'verify',
+                "Site does not meet requirements"
+            );
+        }
+
         // Store pre-update response code
         $this->preUpdateCode = $this->site->getFrontendStatus();
 

tests/Unit/Jobs/UpdateSiteTest.php

@@ -61,23 +61,17 @@ public function testJobQuitsIfNoUpdateIsAvailable()
 
     public function testJobQuitsIfRequirementsArentMet()
     {
+        $this->expectExceptionMessage("Site does not meet requirements");
+
         $site = $this->getSiteMock(
             [
                 'checkHealth' => $this->getHealthCheckMock(['update_requirement_state' => false])
             ]
         );
 
-        Log::spy();
-
         $object = new UpdateSite($site, "1.0.1");
         $object->handle();
 
-        Log::shouldHaveReceived('info')
-            ->once()
-            ->withArgs(function ($message) {
-                return str_contains($message, 'Site does not meet requirements, abort');
-            });
-
         $this->assertTrue(true);
     }