Don't track 404s, improve test coverage

src/Http/Middleware/CacheTracker.php

@@ -64,6 +64,14 @@ public function handle($request, Closure $next)
 
         $response = $next($request);
 
+        if (method_exists($response, 'status') && $response->status() !== 200) {
+            return $response;
+        }
+
+        if ($response->wasStaticallyCached()) {
+            return $response;
+        }
+
         if ($this->content) {
             Tracker::add($url, array_unique($this->content));
         }
@@ -82,7 +90,7 @@ private function isEnabled($request)
         }
 
         // Only GET requests. This disables the cache during live preview.
-        return $request->method() === 'GET' && ! Str::startsWith($request->path(), config('statamic.routes.action', '!').'/');
+        return $request->method() === 'GET' && ! Str::startsWith($request->path(), [config('statamic.routes.action', '!').'/', config('statamic.assets.image_manipulation.route')]);
     }
 
     private function setupAdditionalTracking()

src/Tracker/Manager.php

@@ -105,6 +105,8 @@ private function invalidateUrls($urls)
 
     public function remove(string $url)
     {
+        $this->invalidateUrls([$url]);
+
         $this->cacheStore()->forget(md5($url));
     }
 }

tests/TestCase.php

@@ -3,6 +3,7 @@
 namespace Thoughtco\StatamicCacheTracker\Tests;
 
 use Illuminate\Encryption\Encrypter;
+use Statamic\Facades;
 use Statamic\Testing\AddonTestCase;
 use Statamic\Testing\Concerns\PreventsSavingStacheItemsToDisk;
 use Thoughtco\StatamicCacheTracker\ServiceProvider;
@@ -19,12 +20,32 @@ protected function resolveApplicationConfiguration($app)
     {
         parent::resolveApplicationConfiguration($app);
 
-        $app['config']->set('app.key', 'base64:'.base64_encode(Encrypter::generateKey($app['config']['app.cipher'])));
+        $app['config']->set('app.key', 'base64:' . base64_encode(Encrypter::generateKey($app['config']['app.cipher'])));
 
         // Assume the pro edition within tests
         $app['config']->set('statamic.editions.pro', true);
 
         // enable caching
         $app['config']->set('statamic.static_caching.strategy', 'half');
+
+        // views for front end routing tests
+        $app['config']->set('view.paths', [
+            __DIR__ . '/__fixtures__/resources/views',
+        ]);
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Facades\Collection::make('pages')
+            ->title('Pages')
+            ->routes('{parent_uri}/{slug}')
+            ->save();
+
+        Facades\Entry::make()
+            ->id('home')
+            ->collection('pages')
+            ->save();
     }
 }

tests/Unit/AdditionalTrackerTest.php

@@ -17,7 +17,7 @@ public function tracks_additional_closures()
 
         $this->get('/');
 
-        $this->assertSame(['test::tag'], collect(Tracker::all())->firstWhere('url', 'http://localhost/')['tags']);
+        $this->assertSame(['test::tag', 'pages:home'], collect(Tracker::all())->firstWhere('url', 'http://localhost/')['tags']);
     }
 
     #[Test]
@@ -27,7 +27,7 @@ public function tracks_additional_classes()
 
         $this->get('/');
 
-        $this->assertSame(['additional::tag'], collect(Tracker::all())->firstWhere('url', 'http://localhost/')['tags']);
+        $this->assertSame(['additional::tag', 'pages:home'], collect(Tracker::all())->firstWhere('url', 'http://localhost/')['tags']);
     }
 }
 

tests/Unit/TrackerTest.php

@@ -21,7 +21,7 @@ public function it_tracks_uncached_pages()
 
         $this->get('/');
 
-        $this->assertSame(['test::tag'], collect(Tracker::all())->first()['tags']);
+        $this->assertSame(['test::tag', 'pages:home'], collect(Tracker::all())->first()['tags']);
 
         Event::assertDispatched(ContentTracked::class, 1);
     }
@@ -37,11 +37,11 @@ public function it_doesnt_track_already_cached_pages()
 
         $this->get('/');
 
-        $this->assertSame(['test::tag'], collect(Tracker::all())->first()['tags']);
+        $this->assertSame(['test::tag', 'pages:home'], collect(Tracker::all())->first()['tags']);
 
         $this->get('/');
 
-        $this->assertSame(['test::tag'], collect(Tracker::all())->first()['tags']);
+        $this->assertSame(['test::tag', 'pages:home'], collect(Tracker::all())->first()['tags']);
 
         Event::assertDispatched(ContentTracked::class, 1);
     }
@@ -61,4 +61,12 @@ public function it_doesnt_track_pages_already_in_the_manifest()
 
         $this->assertSame(['some:thing'], collect(Tracker::all())->first()['tags']);
     }
+
+    #[Test]
+    public function it_doesnt_track_404_pages()
+    {
+        $this->get('/i-dont-exist');
+
+        $this->assertCount(0, Tracker::all());
+    }
 }

tests/__fixtures__/resources/views/default.antlers.html

@@ -0,0 +1,3 @@
+<!-- TEMPLATE: default -->
+
+<h1>{{ title }}</h1>

tests/__fixtures__/resources/views/layout.antlers.html

@@ -0,0 +1,3 @@
+<!-- LAYOUT: layout -->
+
+{{ template_content }}