[6.x] Stop tests depending on other tests having run first

.gitattributes

@@ -21,4 +21,5 @@ phpstan.dist.neon export-ignore
 phpunit.bat export-ignore
 phpunit.dist.xml export-ignore
 SECURITY.md export-ignore
+testbench.yaml export-ignore
 translator export-ignore

testbench.yaml

@@ -0,0 +1,44 @@
+# Everything the test suite is known to write into the testbench skeleton
+# (vendor/orchestra/testbench-core/laravel). Tests/TestCase clears these once per
+# process before snapshotting the skeleton, so a suite run never inherits leftovers
+# from a previous one. It's also what `vendor/bin/testbench package:purge-skeleton`
+# removes.
+purge:
+    directories:
+        - addons
+        - app/Actions
+        - app/Dictionaries
+        - app/Fieldtypes
+        - app/Modifiers
+        - app/Scopes
+        - app/Tags
+        - app/Widgets
+        - config/statamic
+        - public/diskimgroot
+        - public/glide
+        - public/imgcache
+        - public/static
+        - public/testimages
+        - public/vendor
+        - resources/addons
+        - resources/blueprints
+        - resources/content
+        - resources/css
+        - resources/dictionaries
+        - resources/fieldsets
+        - resources/forms
+        - resources/js
+        - resources/users
+        - storage/framework/testing/disks
+        - storage/statamic
+    files:
+        - app/Providers/AppServiceProvider.php
+        - composer.json.bak
+        - composer.lock
+        - package.json
+        - public/*.jpg
+        - resources/*.svg
+        - resources/preferences.yaml
+        - resources/sites.yaml
+        - storage/logs/*.log
+        - vite-cp.config.js

tests/Actions/DuplicateFormTest.php

@@ -7,11 +7,13 @@
 use Statamic\Facades\Form;
 use Statamic\Facades\User;
 use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
 class DuplicateFormTest extends TestCase
 {
     use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
 
     public function setUp(): void
     {

tests/Antlers/ParserTestCase.php

@@ -2,6 +2,7 @@
 
 namespace Tests\Antlers;
 
+use Statamic\Contracts\View\Antlers\Parser as ParserContract;
 use Statamic\Facades\YAML;
 use Statamic\Fields\Blueprint;
 use Statamic\Fields\BlueprintRepository;
@@ -46,6 +47,14 @@ protected function setUp(): void
         parent::setUp();
 
         GlobalRuntimeState::resetGlobalState();
+
+        // The guarded/allowed path lists on GlobalRuntimeState are only populated as a side
+        // effect of resolving the real parser, and resetGlobalState() doesn't clear them. The
+        // tests here build their own parsers, so without this they'd run against whatever the
+        // last test to resolve one happened to leave behind - or against empty lists, which
+        // silently drop every modifier in user content, if nothing has resolved one yet.
+        app(ParserContract::class);
+
         GlobalRuntimeState::$throwErrorOnAccessViolation = false;
         GlobalRuntimeState::$allowPhpInContent = false;
         GlobalRuntimeState::$allowMethodsInContent = false;

tests/Assets/AssetTest.php

@@ -2112,6 +2112,10 @@ public function it_doesnt_process_or_error_when_uploading_non_glideable_file_wit
 
         $this->container->sourcePreset('small');
 
+        // Glide only creates its temp directory when it actually processes an image, so
+        // create it up front. Otherwise there'd be nothing for the assertion below to check.
+        app('files')->makeDirectory($glideDir = storage_path('statamic/glide/tmp'), 0777, true, true);
+
         $asset = (new Asset)->container($this->container)->path("path/to/file.{$extension}")->syncOriginal();
 
         Facades\AssetContainer::shouldReceive('findByHandle')->with('test_container')->andReturn($this->container);
@@ -2123,7 +2127,6 @@ public function it_doesnt_process_or_error_when_uploading_non_glideable_file_wit
         $return = $asset->upload(UploadedFile::fake()->createWithContent("file.{$extension}", '<svg width="20" height="30"></svg>'));
 
         $this->assertEquals($asset, $return);
-        $this->assertDirectoryExists($glideDir = storage_path('statamic/glide/tmp'));
         $this->assertEmpty(app('files')->allFiles($glideDir)); // no temp files
         Storage::disk('test')->assertExists("path/to/file.{$extension}");
         $this->assertEquals("path/to/file.{$extension}", $asset->path());

tests/CP/Navigation/NavTest.php

@@ -27,9 +27,6 @@ public function setUp(): void
 
         Route::any('wordpress-importer', ['as' => 'statamic.cp.wordpress-importer.index']);
         Route::any('security-droids', ['as' => 'statamic.cp.security-droids.index']);
-
-        // TODO: Other tests are leaving behind forms without titles that are causing failures here?
-        Facades\Form::shouldReceive('all')->andReturn(collect());
     }
 
     #[Test]

tests/Console/Commands/MakeAddonTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Console\Commands;
 
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Facades\Process;
 use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
@@ -19,6 +20,10 @@ public function setUp(): void
 
         $this->markTestSkippedInWindows();
 
+        // Without this, the addon's `npm install` runs for real. Since the testbench app
+        // has no package.json, npm walks up and installs against this repo's own one.
+        Process::fake();
+
         $this->files = app(Filesystem::class);
         $this->fakeSuccessfulComposerRequire();
     }

tests/Feature/Blueprints/ViewBlueprintListingTest.php

@@ -51,15 +51,17 @@ public function it_lets_you_edit_a_custom_namespace_blueprint()
 
         Facades\Blueprint::addNamespace($namespace, 'resources/content/'.$namespace);
 
+        $this->createBlueprint($namespace, $handle)->save();
+
         $this
             ->actingAs($user)
             ->get(cp_route('blueprints.additional.edit', [$namespace, $handle]))
             ->assertOk()
             ->assertInertia(fn ($page) => $page->component('blueprints/Edit'));
     }
 
-    private function createBlueprint($handle)
+    private function createBlueprint($namespace, $handle)
     {
-        return tap(new Blueprint)->setHandle($handle);
+        return tap(new Blueprint)->setHandle($handle)->setNamespace($namespace);
     }
 }

tests/Modifiers/ArrayAccessType.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Tests\Modifiers;
+
+use ArrayAccess;
+
+class ArrayAccessType implements ArrayAccess
+{
+    private $data;
+
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    #[\ReturnTypeWillChange]
+    public function offsetGet($offset)
+    {
+        return $this->data[$offset];
+    }
+
+    #[\ReturnTypeWillChange]
+    public function offsetExists($offset)
+    {
+        return isset($this->data[$offset]);
+    }
+
+    #[\ReturnTypeWillChange]
+    public function offsetSet($offset, $value)
+    {
+        //
+    }
+
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($offset)
+    {
+        //
+    }
+}

tests/Modifiers/Item.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Tests\Modifiers;
+
+use Statamic\Data\ContainsData;
+use Statamic\Support\Traits\FluentlyGetsAndSets;
+
+// Represents an object that doesn't have origins and therefore wouldn't have a "value" method.
+// So a "get" method would need to be used. e.g. a form Submission.
+class Item
+{
+    use ContainsData, FluentlyGetsAndSets;
+
+    public function __construct($data)
+    {
+        $this->data($data);
+    }
+}

tests/Modifiers/ItemWithOrigin.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Tests\Modifiers;
+
+use Statamic\Data\ContainsData;
+use Statamic\Data\HasOrigin;
+use Statamic\Support\Traits\FluentlyGetsAndSets;
+
+// Represents an object that could have an origin and therefore a "value" method. e.g. an Entry.
+class ItemWithOrigin
+{
+    use ContainsData, FluentlyGetsAndSets, HasOrigin;
+
+    public function __construct($data, $origin = null)
+    {
+        $this->data($data);
+        $this->origin = $origin;
+    }
+
+    public function origin($origin = null)
+    {
+        // Bypass the logic to load the origin. Just use what was passed in.
+        return $this->origin;
+    }
+
+    public function getOriginByString($origin)
+    {
+        // Required by trait
+    }
+}

tests/Modifiers/PluckTest.php

@@ -2,16 +2,12 @@
 
 namespace Tests\Modifiers;
 
-use ArrayAccess;
 use Illuminate\Support\Collection;
 use Mockery;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Contracts\Query\Builder;
-use Statamic\Data\ContainsData;
-use Statamic\Data\HasOrigin;
 use Statamic\Entries\EntryCollection;
 use Statamic\Modifiers\Modify;
-use Statamic\Support\Traits\FluentlyGetsAndSets;
 use Tests\TestCase;
 
 class PluckTest extends TestCase
@@ -168,72 +164,3 @@ private function modify($value, $key)
         return Modify::value($value)->pluck([$key])->fetch();
     }
 }
-
-// Represents an object that doesn't have origins and therefore wouldn't have a "value" method.
-// So a "get" method would need to be used. e.g. a form Submission.
-class Item
-{
-    use ContainsData, FluentlyGetsAndSets;
-
-    public function __construct($data)
-    {
-        $this->data($data);
-    }
-}
-
-// Represents an object that could have an origin and therefore a "value" method. e.g. an Entry.
-class ItemWithOrigin
-{
-    use ContainsData, FluentlyGetsAndSets, HasOrigin;
-
-    public function __construct($data, $origin = null)
-    {
-        $this->data($data);
-        $this->origin = $origin;
-    }
-
-    public function origin($origin = null)
-    {
-        // Bypass the logic to load the origin. Just use what was passed in.
-        return $this->origin;
-    }
-
-    public function getOriginByString($origin)
-    {
-        // Required by trait
-    }
-}
-
-class ArrayAccessType implements ArrayAccess
-{
-    private $data;
-
-    public function __construct($data)
-    {
-        $this->data = $data;
-    }
-
-    #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
-    {
-        return $this->data[$offset];
-    }
-
-    #[\ReturnTypeWillChange]
-    public function offsetExists($offset)
-    {
-        return isset($this->data[$offset]);
-    }
-
-    #[\ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
-    {
-        //
-    }
-
-    #[\ReturnTypeWillChange]
-    public function offsetUnset($offset)
-    {
-        //
-    }
-}