Test

Author: aarondfrancis

bin/check-fixtures

@@ -15,6 +15,32 @@
 $fixturesDir = __DIR__ . '/../tests/Fixtures';
 $errors = [];
 $checked = 0;
+$dimensionErrors = [];
+$dimensionsChecked = 0;
+
+// Required fixture dimensions (must match CI environment)
+const REQUIRED_WIDTH = 180;
+const REQUIRED_HEIGHT = 32;
+
+echo "Checking fixture dimensions (" . REQUIRED_WIDTH . "x" . REQUIRED_HEIGHT . ")...\n\n";
+
+// Check dimensions for all terminal fixtures
+$dimensionsChecked += checkFixtureDimensions($fixturesDir . '/iterm', $dimensionErrors);
+$dimensionsChecked += checkFixtureDimensions($fixturesDir . '/ghostty', $dimensionErrors);
+
+if (count($dimensionErrors) > 0) {
+    echo "DIMENSION ERRORS FOUND:\n\n";
+    foreach ($dimensionErrors as $error) {
+        echo "  ✗ {$error}\n";
+    }
+    echo "\n";
+    echo "Found " . count($dimensionErrors) . " fixture dimension error(s).\n";
+    echo "All fixtures must be generated at " . REQUIRED_WIDTH . "x" . REQUIRED_HEIGHT . ".\n";
+    echo "Resize your terminal and run: composer test:screenshots\n";
+    exit(1);
+}
+
+echo "✓ All {$dimensionsChecked} fixture(s) have correct dimensions.\n\n";
 
 echo "Checking terminal fixture synchronization...\n\n";
 
@@ -134,3 +160,35 @@ function filesMatch(string $file1, string $file2): bool
 {
     return file_get_contents($file1) === file_get_contents($file2);
 }
+
+/**
+ * Check that all fixtures in a directory have the required dimensions.
+ *
+ * @return int Number of fixtures checked
+ */
+function checkFixtureDimensions(string $dir, array &$errors): int
+{
+    $checked = 0;
+
+    if (!is_dir($dir)) {
+        return $checked;
+    }
+
+    $files = findJsonFiles($dir);
+    foreach ($files as $file) {
+        $data = json_decode(file_get_contents($file), true);
+
+        if (!isset($data['width']) || !isset($data['height'])) {
+            continue;
+        }
+
+        $checked++;
+
+        if ($data['width'] !== REQUIRED_WIDTH || $data['height'] !== REQUIRED_HEIGHT) {
+            $relPath = basename(dirname($dir)) . '/' . basename($dir) . '/' . substr($file, strlen($dir) + 1);
+            $errors[] = "{$relPath}: {$data['width']}x{$data['height']} (expected " . REQUIRED_WIDTH . "x" . REQUIRED_HEIGHT . ")";
+        }
+    }
+
+    return $checked;
+}

tests/Support/ComparesVisually.php

@@ -59,19 +59,44 @@ public function assertTerminalMatch(array|string $content, bool $iterate = false
         }
 
         $this->uniqueTestIdentifier = $this->uniqueTestIdentifier();
-        [$path, $function] = $this->uniqueTestIdentifier;
 
-        $fixturePath = $this->terminalFixturePath();
-        $fixtureExists = $this->fixtureStore()->loadTerminalFixture($fixturePath, $content) !== null;
-        $fixturesInSync = $this->fixtureStore()->fixturesAreInSync($path, $function);
+        // First, try fixture comparison (fast path)
+        if ($this->tryFixtureMatch($content)) {
+            $this->assertTrue(true);
+            return;
+        }
 
-        if ($this->visualConfig()->shouldRunVisualTest($fixtureExists, $fixturesInSync)) {
+        // Fixture didn't match or doesn't exist - fall back to visual comparison if enabled
+        if ($this->visualConfig()->canRunVisualTest()) {
             $this->terminalEnv()->withOutput(fn() => $this->assertVisualMatch($content));
         } else {
+            // No visual testing available - run fixture match which will skip or fail appropriately
             $this->assertFixtureMatch($content);
         }
     }
 
+    /**
+     * Try to match against a fixture. Returns true if fixture exists and matches.
+     * Returns false if fixture doesn't exist or doesn't match (caller should fall back to visual).
+     */
+    protected function tryFixtureMatch(array $content): bool
+    {
+        $fixturePath = $this->terminalFixturePath();
+        $fixture = $this->fixtureStore()->loadTerminalFixture($fixturePath, $content);
+
+        if (!$fixture) {
+            return false;
+        }
+
+        $screen = new Screen($fixture->width, $fixture->height);
+
+        foreach ($content as $c) {
+            $screen->write($c);
+        }
+
+        return $fixture->output === $screen->output();
+    }
+
     protected function assertFixtureMatch(array $content): void
     {
         $fixturePath = $this->terminalFixturePath();

tests/Support/VisualFixtureStore.php

@@ -39,6 +39,12 @@ public function terminalFixturePath(string $relativePath, string $function): str
             }
         }
 
+        // In CI (no terminal), prefer iTerm fixtures since we assert iTerm and Ghostty are identical
+        $itermPath = "{$this->config->fixturesRoot}/iterm/{$relativePath}/{$function}.json";
+        if (file_exists($itermPath)) {
+            return $itermPath;
+        }
+
         return "{$this->config->fixturesRoot}/{$relativePath}/{$function}.json";
     }
 

tests/Support/VisualTestConfig.php

@@ -113,6 +113,11 @@ public function shouldRunVisualTest(bool $fixtureExists, bool $fixturesInSync =
         return false;
     }
 
+    public function canRunVisualTest(): bool
+    {
+        return $this->mode !== self::MODE_DISABLED && $this->hasValidTerminal();
+    }
+
     public function titleBarHeight(): int
     {
         return match ($this->terminal) {