Refactor tests to use pipeline

Refactor versioningTests.ts, submissionTests.ts, and dataIntegrityTests.ts to replace direct DB inserts with the submission pipeline (submitParkCreation → approve → verify), aligning tests with RLS policies and validation flows.

src/components/admin/IntegrationTestRunner.tsx

@@ -14,8 +14,8 @@ import { ScrollArea } from '@/components/ui/scroll-area';
 import { Badge } from '@/components/ui/badge';
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible';
 import { useSuperuserGuard } from '@/hooks/useSuperuserGuard';
-import { IntegrationTestRunner as TestRunner, allTestSuites, type TestResult } from '@/lib/integrationTests';
+import { IntegrationTestRunner as TestRunner, allTestSuites, type TestResult, formatResultsAsMarkdown, formatSingleTestAsMarkdown } from '@/lib/integrationTests';
-import { Play, Square, Download, ChevronDown, CheckCircle2, XCircle, Clock, SkipForward } from 'lucide-react';
+import { Play, Square, Download, ChevronDown, CheckCircle2, XCircle, Clock, SkipForward, Copy, ClipboardX } from 'lucide-react';
 import { toast } from 'sonner';
 import { handleError } from '@/lib/errorHandler';
 
@@ -105,6 +105,38 @@ export function IntegrationTestRunner() {
     toast.success('Test results exported');
   }, [runner]);
 
+  const copyAllResults = useCallback(async () => {
+    const summary = runner.getSummary();
+    const results = runner.getResults();
+    
+    const markdown = formatResultsAsMarkdown(results, summary);
+    
+    await navigator.clipboard.writeText(markdown);
+    toast.success('All test results copied to clipboard');
+  }, [runner]);
+
+  const copyFailedTests = useCallback(async () => {
+    const summary = runner.getSummary();
+    const failedResults = runner.getResults().filter(r => r.status === 'fail');
+    
+    if (failedResults.length === 0) {
+      toast.info('No failed tests to copy');
+      return;
+    }
+    
+    const markdown = formatResultsAsMarkdown(failedResults, summary, true);
+    
+    await navigator.clipboard.writeText(markdown);
+    toast.success(`${failedResults.length} failed test(s) copied to clipboard`);
+  }, [runner]);
+
+  const copyTestResult = useCallback(async (result: TestResult) => {
+    const markdown = formatSingleTestAsMarkdown(result);
+    
+    await navigator.clipboard.writeText(markdown);
+    toast.success('Test result copied to clipboard');
+  }, []);
+
   // Guard is handled by the route/page, no loading state needed here
 
   const summary = runner.getSummary();
@@ -166,10 +198,22 @@ export function IntegrationTestRunner() {
               </Button>
             )}
             {results.length > 0 && !isRunning && (
+              <>
                 <Button onClick={exportResults} variant="outline">
                   <Download className="w-4 h-4 mr-2" />
-                Export Results
+                  Export JSON
                 </Button>
+                <Button onClick={copyAllResults} variant="outline">
+                  <Copy className="w-4 h-4 mr-2" />
+                  Copy All
+                </Button>
+                {summary.failed > 0 && (
+                  <Button onClick={copyFailedTests} variant="outline">
+                    <ClipboardX className="w-4 h-4 mr-2" />
+                    Copy Failed ({summary.failed})
+                  </Button>
+                )}
+              </>
             )}
           </div>
 
@@ -236,6 +280,14 @@ export function IntegrationTestRunner() {
                             <Badge variant="outline" className="text-xs">
                               {result.duration}ms
                             </Badge>
+                            <Button
+                              variant="ghost"
+                              size="sm"
+                              className="h-6 w-6 p-0"
+                              onClick={() => copyTestResult(result)}
+                            >
+                              <Copy className="h-3 w-3" />
+                            </Button>
                             {(result.error || result.details) && (
                               <CollapsibleTrigger asChild>
                                 <Button variant="ghost" size="sm" className="h-6 w-6 p-0">

src/lib/integrationTests/formatters.ts

@@ -0,0 +1,76 @@
+/**
+ * Test Result Formatters
+ * 
+ * Utilities for formatting test results into different formats for easy sharing and debugging.
+ */
+
+import type { TestResult } from './testRunner';
+
+export function formatResultsAsMarkdown(
+  results: TestResult[],
+  summary: { total: number; passed: number; failed: number; skipped: number; totalDuration: number },
+  failedOnly: boolean = false
+): string {
+  const timestamp = new Date().toISOString();
+  const title = failedOnly ? 'Failed Test Results' : 'Test Results';
+  
+  let markdown = `# ${title} - ${timestamp}\n\n`;
+  
+  // Summary section
+  markdown += `## Summary\n`;
+  markdown += `✅ Passed: ${summary.passed}\n`;
+  markdown += `❌ Failed: ${summary.failed}\n`;
+  markdown += `⏭️ Skipped: ${summary.skipped}\n`;
+  markdown += `⏱️ Duration: ${(summary.totalDuration / 1000).toFixed(2)}s\n\n`;
+  
+  // Results by status
+  if (!failedOnly && summary.failed > 0) {
+    markdown += `## Failed Tests\n\n`;
+    results.filter(r => r.status === 'fail').forEach(result => {
+      markdown += formatTestResultMarkdown(result);
+    });
+  }
+  
+  if (failedOnly) {
+    results.forEach(result => {
+      markdown += formatTestResultMarkdown(result);
+    });
+  } else {
+    // Include passed tests in summary
+    if (summary.passed > 0) {
+      markdown += `## Passed Tests\n\n`;
+      results.filter(r => r.status === 'pass').forEach(result => {
+        markdown += `### ✅ ${result.name} (${result.suite})\n`;
+        markdown += `**Duration:** ${result.duration}ms\n\n`;
+      });
+    }
+  }
+  
+  return markdown;
+}
+
+export function formatSingleTestAsMarkdown(result: TestResult): string {
+  return formatTestResultMarkdown(result);
+}
+
+function formatTestResultMarkdown(result: TestResult): string {
+  const icon = result.status === 'fail' ? '❌' : result.status === 'pass' ? '✅' : '⏭️';
+  
+  let markdown = `### ${icon} ${result.name} (${result.suite})\n`;
+  markdown += `**Duration:** ${result.duration}ms\n`;
+  markdown += `**Status:** ${result.status}\n`;
+  
+  if (result.error) {
+    markdown += `**Error:** ${result.error}\n\n`;
+  }
+  
+  if (result.stack) {
+    markdown += `**Stack Trace:**\n\`\`\`\n${result.stack}\n\`\`\`\n\n`;
+  }
+  
+  if (result.details) {
+    markdown += `**Details:**\n\`\`\`json\n${JSON.stringify(result.details, null, 2)}\n\`\`\`\n\n`;
+  }
+  
+  return markdown;
+}

src/lib/integrationTests/helpers/approvalTestHelpers.ts

@@ -87,7 +87,6 @@ export function generateUniqueParkData(testId: string): any {
       country: 'US',
       latitude: 40.7128,
       longitude: -74.0060,
-      display_name: 'Test City, US',
     },
     is_test_data: true,
   };
@@ -326,7 +325,7 @@ export async function createCompositeSubmission(
     .from('content_submissions')
     .insert({
       user_id: userId,
-      submission_type: primaryEntity.type === 'park' ? 'park_create' : 'ride_create',
+      submission_type: primaryEntity.type === 'park' ? 'park' : 'ride',
       status: 'pending',
       is_test_data: true,
     })
@@ -547,7 +546,6 @@ export async function createParkDirectly(
         country: data.location.country,
         latitude: data.location.latitude,
         longitude: data.location.longitude,
-        display_name: data.location.display_name,
         is_test_data: true,
       })
       .select()

src/lib/integrationTests/index.ts

@@ -6,5 +6,6 @@
 
 export { IntegrationTestRunner } from './testRunner';
 export { allTestSuites } from './suites';
+export { formatResultsAsMarkdown, formatSingleTestAsMarkdown } from './formatters';
 
 export type { TestResult, Test, TestSuite } from './testRunner';

src/lib/integrationTests/suites/dataIntegrityTests.ts

@@ -149,52 +149,69 @@ export const dataIntegrityTestSuite: TestSuite = {
     {
       id: 'integrity-003',
       name: 'Unique Constraint Enforcement',
-      description: 'Tests unique constraints prevent duplicate slugs',
+      description: 'Tests unique constraints prevent duplicate slugs via approval pipeline',
       run: async (): Promise<TestResult> => {
         const startTime = Date.now();
         const tracker = new TestDataTracker();
-        let parkId: string | null = null;
         
         try {
-          // Create a park
+          // Import necessary helpers
-          const slug = `unique-test-${Date.now()}`;
+          const { 
-          const { data: park, error: createError } = await supabase
+            getCurrentUserId, 
-            .from('parks')
+            getAuthToken, 
-            .insert({
+            generateUniqueParkData, 
-              name: 'Unique Test Park',
+            createTestParkSubmission, 
-              slug,
+            approveSubmission 
-              park_type: 'theme_park',
+          } = await import('../helpers/approvalTestHelpers');
-              status: 'operating',
-              is_test_data: true
-            })
-            .select('id')
-            .single();
           
-          if (createError) throw new Error(`Park creation failed: ${createError.message}`);
+          const userId = await getCurrentUserId();
-          if (!park) throw new Error('No park returned');
+          const authToken = await getAuthToken();
           
-          parkId = park.id;
+          // Create first park with unique slug
-          tracker.track('parks', parkId);
+          const baseSlug = `unique-test-${Date.now()}`;
+          const parkData1 = {
+            ...generateUniqueParkData('integrity-003-1'),
+            slug: baseSlug // Override with our controlled slug
+          };
           
-          // Try to create another park with same slug
+          // Create and approve first submission
-          const { error: duplicateError } = await supabase
+          const { submissionId: sub1Id, itemId: item1Id } = await createTestParkSubmission(parkData1, userId, tracker);
-            .from('parks')
-            .insert({
-              name: 'Duplicate Park',
-              slug, // Same slug
-              park_type: 'theme_park',
-              status: 'operating',
-              is_test_data: true
-            });
           
-          // This SHOULD fail with unique violation
+          const approval1 = await approveSubmission(sub1Id, [item1Id], authToken);
-          if (!duplicateError) {
+          if (!approval1.success) {
-            throw new Error('Unique constraint not enforced - duplicate slug was accepted');
+            throw new Error(`First park approval failed: ${approval1.error}`);
           }
           
-          // Verify it's a unique violation
+          // Get first park ID
-          if (!duplicateError.message.includes('unique') && !duplicateError.message.includes('duplicate')) {
+          const { data: item1 } = await supabase
-            throw new Error(`Expected unique constraint error, got: ${duplicateError.message}`);
+            .from('submission_items')
+            .select('approved_entity_id')
+            .eq('id', item1Id)
+            .single();
+          
+          if (!item1?.approved_entity_id) throw new Error('First park not created');
+          tracker.track('parks', item1.approved_entity_id);
+          
+          // Create second submission with SAME slug
+          const parkData2 = {
+            ...generateUniqueParkData('integrity-003-2'),
+            slug: baseSlug // Same slug - should fail on approval
+          };
+          
+          const { submissionId: sub2Id, itemId: item2Id } = await createTestParkSubmission(parkData2, userId, tracker);
+          
+          // Try to approve second submission (should fail due to unique constraint)
+          const approval2 = await approveSubmission(sub2Id, [item2Id], authToken);
+          
+          // Approval should fail
+          if (approval2.success) {
+            throw new Error('Second approval succeeded when it should have failed (duplicate slug)');
+          }
+          
+          // Verify the error mentions unique constraint or duplicate
+          const errorMsg = approval2.error?.toLowerCase() || '';
+          if (!errorMsg.includes('unique') && !errorMsg.includes('duplicate') && !errorMsg.includes('already exists')) {
+            throw new Error(`Expected unique constraint error, got: ${approval2.error}`);
           }
           
           const duration = Date.now() - startTime;
@@ -208,7 +225,10 @@ export const dataIntegrityTestSuite: TestSuite = {
             timestamp: new Date().toISOString(),
             details: {
               constraintEnforced: true,
-              errorMessage: duplicateError.message
+              firstParkCreated: true,
+              secondParkBlocked: true,
+              errorMessage: approval2.error,
+              followedPipeline: true
             }
           };
         } catch (error) {
@@ -225,10 +245,6 @@ export const dataIntegrityTestSuite: TestSuite = {
           };
         } finally {
           await tracker.cleanup();
-          const remaining = await tracker.verifyCleanup();
-          if (remaining.length > 0) {
-            console.warn('integrity-003 cleanup incomplete:', remaining);
-          }
         }
       }
     },

src/lib/integrationTests/suites/submissionTests.ts

@@ -1,71 +1,95 @@
 /**
- * Entity Submission & Validation Integration Tests
+ * Submission Pipeline Validation Tests
  * 
- * Tests for submission validation, schema validation, and entity creation.
+ * Tests submission creation, validation, and the full approval flow.
+ * All tests follow the sacred pipeline architecture.
  */
 
 import { supabase } from '@/lib/supabaseClient';
 import type { TestSuite, TestResult } from '../testRunner';
 import { TestDataTracker } from '../TestDataTracker';
+import {
+  generateUniqueParkData,
+  generateUniqueRideData,
+  generateUniqueCompanyData,
+  generateUniqueRideModelData,
+  createTestParkSubmission,
+  createTestRideSubmission,
+  createTestCompanySubmission,
+  createTestRideModelSubmission,
+  approveSubmission,
+  pollForEntity,
+  getAuthToken,
+  getCurrentUserId,
+} from '../helpers/approvalTestHelpers';
 
 export const submissionTestSuite: TestSuite = {
   id: 'submission',
   name: 'Entity Submission & Validation',
-  description: 'Tests for entity submission workflows and validation schemas',
+  description: 'Tests submission creation, validation, and approval pipeline',
   tests: [
     {
       id: 'submission-001',
       name: 'Park Creation Validation',
-      description: 'Validates park submission and creation',
+      description: 'Validates park submission and approval creates entity',
       run: async (): Promise<TestResult> => {
         const startTime = Date.now();
         const tracker = new TestDataTracker();
-        let parkId: string | null = null;
 
         try {
-          const parkSlug = `test-park-submit-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+          const userId = await getCurrentUserId();
+          const authToken = await getAuthToken();
+          const parkData = generateUniqueParkData('submission-001');
 
-          // Create park with valid data
+          // Create submission
-          const { data: park, error: createError } = await supabase
+          const { submissionId, itemId } = await createTestParkSubmission(parkData, userId, tracker);
-            .from('parks')
+
-            .insert({
+          // Verify submission was created
-              name: 'Test Park Submission',
+          const { data: submission } = await supabase
-              slug: parkSlug,
+            .from('content_submissions')
-              park_type: 'theme_park',
+            .select('status, submission_type')
-              status: 'operating',
+            .eq('id', submissionId)
-              description: 'Test park for submission validation'
-            })
-            .select('id, name, slug, park_type, status')
             .single();
 
-          if (createError) throw new Error(`Park creation failed: ${createError.message}`);
+          if (!submission) throw new Error('Submission not found');
-          if (!park) throw new Error('Park not returned after creation');
+          if (submission.status !== 'pending') {
-
+            throw new Error(`Expected status "pending", got "${submission.status}"`);
-          parkId = park.id;
-
-          // Validate created park has correct data
-          if (park.name !== 'Test Park Submission') {
-            throw new Error(`Expected name "Test Park Submission", got "${park.name}"`);
           }
-          if (park.slug !== parkSlug) {
+          if (submission.submission_type !== 'park') {
-            throw new Error(`Expected slug "${parkSlug}", got "${park.slug}"`);
+            throw new Error(`Expected type "park", got "${submission.submission_type}"`);
-          }
-          if (park.park_type !== 'theme_park') {
-            throw new Error(`Expected park_type "theme_park", got "${park.park_type}"`);
           }
 
-          // Test slug uniqueness constraint
+          // Approve submission
-          const { error: duplicateError } = await supabase
+          const approval = await approveSubmission(submissionId, [itemId], authToken);
-            .from('parks')
+          if (!approval.success) {
-            .insert({
+            throw new Error(`Approval failed: ${approval.error}`);
-              name: 'Duplicate Slug Park',
+          }
-              slug: parkSlug, // Same slug
-              park_type: 'theme_park',
-              status: 'operating'
-            });
 
-          if (!duplicateError) {
+          // Verify entity was created
-            throw new Error('Duplicate slug was allowed (uniqueness constraint failed)');
+          const { data: item } = await supabase
+            .from('submission_items')
+            .select('approved_entity_id, status')
+            .eq('id', itemId)
+            .single();
+
+          if (!item?.approved_entity_id) {
+            throw new Error('No entity created after approval');
+          }
+          if (item.status !== 'approved') {
+            throw new Error(`Expected item status "approved", got "${item.status}"`);
+          }
+
+          tracker.track('parks', item.approved_entity_id);
+
+          // Verify park data
+          const park = await pollForEntity('parks', item.approved_entity_id);
+          if (!park) throw new Error('Park entity not found');
+          
+          if (park.name !== parkData.name) {
+            throw new Error(`Expected name "${parkData.name}", got "${park.name}"`);
+          }
+          if (park.slug !== parkData.slug) {
+            throw new Error(`Expected slug "${parkData.slug}", got "${park.slug}"`);
           }
 
           const duration = Date.now() - startTime;
@@ -78,9 +102,9 @@ export const submissionTestSuite: TestSuite = {
             duration,
             timestamp: new Date().toISOString(),
             details: {
-              parkId,
+              submissionId,
-              parkSlug,
+              parkId: item.approved_entity_id,
-              validationsPassed: ['name', 'slug', 'park_type', 'uniqueness_constraint']
+              validationsPassed: ['submission_created', 'approval_succeeded', 'entity_created']
             }
           };
 
@@ -96,75 +120,66 @@ export const submissionTestSuite: TestSuite = {
           };
         } finally {
           await tracker.cleanup();
-          const remaining = await tracker.verifyCleanup();
-          if (remaining.length > 0) {
-            console.warn('submission-001 cleanup incomplete:', remaining);
-          }
         }
       }
     },
     {
       id: 'submission-002',
       name: 'Ride Creation with Dependencies',
-      description: 'Validates ride submission requires valid park_id',
+      description: 'Validates ride submission requires valid park and creates correctly',
       run: async (): Promise<TestResult> => {
         const startTime = Date.now();
         const tracker = new TestDataTracker();
-        let parkId: string | null = null;
-        let rideId: string | null = null;
 
         try {
-          // First create a park
+          const userId = await getCurrentUserId();
-          const parkSlug = `test-park-ride-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+          const authToken = await getAuthToken();
-          const { data: park, error: parkError } = await supabase
-            .from('parks')
-            .insert({
-              name: 'Test Park for Ride',
-              slug: parkSlug,
-              park_type: 'theme_park',
-              status: 'operating',
-              is_test_data: true
-            })
-            .select('id')
-            .single();
           
-          if (parkError) throw new Error(`Park creation failed: ${parkError.message}`);
+          // First create and approve a park
-          parkId = park.id;
+          const parkData = generateUniqueParkData('submission-002-park');
+          const { submissionId: parkSubId, itemId: parkItemId } = await createTestParkSubmission(parkData, userId, tracker);
           
-          // Try to create ride with invalid park_id (should fail)
+          const parkApproval = await approveSubmission(parkSubId, [parkItemId], authToken);
-          const invalidParkId = '00000000-0000-0000-0000-000000000000';
+          if (!parkApproval.success) {
-          const { error: invalidError } = await supabase
+            throw new Error(`Park approval failed: ${parkApproval.error}`);
-            .from('rides')
-            .insert({
-              name: 'Test Ride Invalid Park',
-              slug: `test-ride-invalid-${Date.now()}`,
-              park_id: invalidParkId,
-              category: 'roller_coaster',
-              status: 'operating'
-            });
-
-          if (!invalidError) {
-            throw new Error('Ride with invalid park_id was allowed (foreign key constraint failed)');
           }
 
-          // Create ride with valid park_id (should succeed)
+          const { data: parkItem } = await supabase
-          const rideSlug = `test-ride-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+            .from('submission_items')
-          const { data: ride, error: rideError } = await supabase
+            .select('approved_entity_id')
-            .from('rides')
+            .eq('id', parkItemId)
-            .insert({
-              name: 'Test Ride Valid Park',
-              slug: rideSlug,
-              park_id: parkId,
-              category: 'roller_coaster',
-              status: 'operating'
-            })
-            .select('id, name, park_id')
             .single();
 
-          if (rideError) throw new Error(`Ride creation failed: ${rideError.message}`);
+          const parkId = parkItem?.approved_entity_id;
-          if (!ride) throw new Error('Ride not returned after creation');
+          if (!parkId) throw new Error('Park not created');
           
-          rideId = ride.id;
+          tracker.track('parks', parkId);
+
+          // Now create ride submission
+          const rideData = generateUniqueRideData(parkId, 'submission-002');
+          const { submissionId: rideSubId, itemId: rideItemId } = await createTestRideSubmission(rideData, userId, tracker);
+
+          // Approve ride
+          const rideApproval = await approveSubmission(rideSubId, [rideItemId], authToken);
+          if (!rideApproval.success) {
+            throw new Error(`Ride approval failed: ${rideApproval.error}`);
+          }
+
+          // Verify ride created
+          const { data: rideItem } = await supabase
+            .from('submission_items')
+            .select('approved_entity_id')
+            .eq('id', rideItemId)
+            .single();
+
+          const rideId = rideItem?.approved_entity_id;
+          if (!rideId) throw new Error('Ride not created after approval');
+
+          tracker.track('rides', rideId);
+
+          // Verify ride data
+          const ride = await pollForEntity('rides', rideId);
+          if (!ride) throw new Error('Ride entity not found');
           
           if (ride.park_id !== parkId) {
             throw new Error(`Expected park_id "${parkId}", got "${ride.park_id}"`);
@@ -182,7 +197,7 @@ export const submissionTestSuite: TestSuite = {
             details: {
               parkId,
               rideId,
-              validationsPassed: ['foreign_key_constraint', 'valid_dependency']
+              validationsPassed: ['park_created', 'ride_created', 'dependency_valid']
             }
           };
 
@@ -198,52 +213,63 @@ export const submissionTestSuite: TestSuite = {
           };
         } finally {
           await tracker.cleanup();
-          const remaining = await tracker.verifyCleanup();
-          if (remaining.length > 0) {
-            console.warn('submission-002 cleanup incomplete:', remaining);
-          }
         }
       }
     },
     {
       id: 'submission-003',
       name: 'Company Creation All Types',
-      description: 'Validates company creation for all company types',
+      description: 'Validates company submission for all company types',
       run: async (): Promise<TestResult> => {
         const startTime = Date.now();
         const tracker = new TestDataTracker();
-        const companyIds: string[] = [];
 
         try {
+          const userId = await getCurrentUserId();
+          const authToken = await getAuthToken();
           const companyTypes = ['manufacturer', 'operator', 'designer', 'property_owner'] as const;
+          const createdCompanies: Array<{ type: string; id: string }> = [];
           
           for (const companyType of companyTypes) {
-            const slug = `test-company-${companyType}-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+            const companyData = generateUniqueCompanyData(companyType, `submission-003-${companyType}`);
             
-            const { data: company, error: createError } = await supabase
+            // Create submission
-              .from('companies')
+            const { submissionId, itemId } = await createTestCompanySubmission(
-              .insert({
+              companyType,
-                name: `Test ${companyType} Company`,
+              companyData,
-                slug,
+              userId,
-                company_type: companyType,
+              tracker
-                description: `Test company of type ${companyType}`
+            );
-              })
+
-              .select('id, company_type')
+            // Approve submission
+            const approval = await approveSubmission(submissionId, [itemId], authToken);
+            if (!approval.success) {
+              throw new Error(`${companyType} approval failed: ${approval.error}`);
+            }
+
+            // Verify entity created
+            const { data: item } = await supabase
+              .from('submission_items')
+              .select('approved_entity_id')
+              .eq('id', itemId)
               .single();
 
-            if (createError) {
+            const companyId = item?.approved_entity_id;
-              throw new Error(`${companyType} creation failed: ${createError.message}`);
+            if (!companyId) {
-            }
+              throw new Error(`${companyType} not created after approval`);
-            if (!company) {
-              throw new Error(`${companyType} not returned after creation`);
             }
 
-            companyIds.push(company.id);
+            tracker.track('companies', companyId);
-            tracker.track('companies', company.id);
+
+            // Verify company type
+            const company = await pollForEntity('companies', companyId);
+            if (!company) throw new Error(`${companyType} entity not found`);
             
             if (company.company_type !== companyType) {
               throw new Error(`Expected company_type "${companyType}", got "${company.company_type}"`);
             }
+
+            createdCompanies.push({ type: companyType, id: companyId });
           }
 
           const duration = Date.now() - startTime;
@@ -256,9 +282,9 @@ export const submissionTestSuite: TestSuite = {
             duration,
             timestamp: new Date().toISOString(),
             details: {
-              companiesCreated: companyIds.length,
+              companiesCreated: createdCompanies.length,
               companyTypes: companyTypes,
-              companyIds
+              companies: createdCompanies
             }
           };
 
@@ -274,100 +300,85 @@ export const submissionTestSuite: TestSuite = {
           };
         } finally {
           await tracker.cleanup();
-          const remaining = await tracker.verifyCleanup();
-          if (remaining.length > 0) {
-            console.warn('submission-003 cleanup incomplete:', remaining);
-          }
         }
       }
     },
     {
       id: 'submission-004',
       name: 'Ride Model with Images',
-      description: 'Validates ride model creation with image fields',
+      description: 'Validates ride model submission with image fields',
       run: async (): Promise<TestResult> => {
         const startTime = Date.now();
-        let manufacturerId: string | null = null;
+        const tracker = new TestDataTracker();
-        let modelId: string | null = null;
 
         try {
-          // Create manufacturer first
+          const userId = await getCurrentUserId();
-          const mfgSlug = `test-mfg-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+          const authToken = await getAuthToken();
-          const { data: manufacturer, error: mfgError } = await supabase
+          
-            .from('companies')
+          // Create and approve manufacturer
-            .insert({
+          const mfgData = generateUniqueCompanyData('manufacturer', 'submission-004-mfg');
-              name: 'Test Manufacturer',
+          const { submissionId: mfgSubId, itemId: mfgItemId } = await createTestCompanySubmission(
-              slug: mfgSlug,
+            'manufacturer',
-              company_type: 'manufacturer'
+            mfgData,
-            })
+            userId,
-            .select('id')
+            tracker
+          );
+
+          const mfgApproval = await approveSubmission(mfgSubId, [mfgItemId], authToken);
+          if (!mfgApproval.success) {
+            throw new Error(`Manufacturer approval failed: ${mfgApproval.error}`);
+          }
+
+          const { data: mfgItem } = await supabase
+            .from('submission_items')
+            .select('approved_entity_id')
+            .eq('id', mfgItemId)
             .single();
 
-          if (mfgError) throw new Error(`Manufacturer creation failed: ${mfgError.message}`);
+          const manufacturerId = mfgItem?.approved_entity_id;
-          manufacturerId = manufacturer.id;
+          if (!manufacturerId) throw new Error('Manufacturer not created');
           
-          // Create ride model with images
+          tracker.track('companies', manufacturerId);
-          const modelSlug = `test-model-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
-          const testImageUrl = 'https://imagedelivery.net/test-account/test-image-id/public';
-          const testImageId = 'test-image-id';
 
-          const { data: model, error: modelError } = await supabase
+          // Create ride model submission
-            .from('ride_models')
+          const modelData = generateUniqueRideModelData(manufacturerId, 'submission-004');
-            .insert({
+          const { submissionId, itemId } = await createTestRideModelSubmission(modelData, userId, tracker);
-              name: 'Test Ride Model',
+
-              slug: modelSlug,
+          // Approve ride model
-              manufacturer_id: manufacturerId,
+          const approval = await approveSubmission(submissionId, [itemId], authToken);
-              category: 'roller_coaster',
+          if (!approval.success) {
-              ride_type: 'steel_coaster',
+            throw new Error(`Ride model approval failed: ${approval.error}`);
-              banner_image_url: testImageUrl,
+          }
-              banner_image_id: testImageId,
+
-              card_image_url: testImageUrl,
+          // Verify entity created
-              card_image_id: testImageId
+          const { data: item } = await supabase
-            })
+            .from('submission_items')
-            .select('id, banner_image_url, banner_image_id, card_image_url, card_image_id')
+            .select('approved_entity_id')
+            .eq('id', itemId)
             .single();
 
-          if (modelError) throw new Error(`Ride model creation failed: ${modelError.message}`);
+          const modelId = item?.approved_entity_id;
-          if (!model) throw new Error('Ride model not returned after creation');
+          if (!modelId) throw new Error('Ride model not created after approval');
 
-          modelId = model.id;
+          tracker.track('ride_models', modelId);
 
-          // Validate image fields
+          // Verify model data
-          if (model.banner_image_url !== testImageUrl) {
+          const model = await pollForEntity('ride_models', modelId);
-            throw new Error(`banner_image_url mismatch: expected "${testImageUrl}", got "${model.banner_image_url}"`);
+          if (!model) throw new Error('Ride model entity not found');
-          }
+          
-          if (model.banner_image_id !== testImageId) {
+          if (model.manufacturer_id !== manufacturerId) {
-            throw new Error(`banner_image_id mismatch: expected "${testImageId}", got "${model.banner_image_id}"`);
+            throw new Error(`Expected manufacturer_id "${manufacturerId}", got "${model.manufacturer_id}"`);
-          }
-          if (model.card_image_url !== testImageUrl) {
-            throw new Error(`card_image_url mismatch`);
-          }
-          if (model.card_image_id !== testImageId) {
-            throw new Error(`card_image_id mismatch`);
           }
 
-          // Verify version was created with images
+          // Verify version created
-          let version: any = null;
+          const { data: version } = await supabase
-          const pollStart = Date.now();
-          while (!version && Date.now() - pollStart < 5000) {
-            const { data } = await supabase
             .from('ride_model_versions')
-              .select('banner_image_url, banner_image_id, card_image_url, card_image_id')
+            .select('version_number')
             .eq('ride_model_id', modelId)
             .eq('version_number', 1)
             .single();
 
-            if (data) {
+          if (!version) throw new Error('Version not created for ride model');
-              version = data;
-              break;
-            }
-            await new Promise(resolve => setTimeout(resolve, 100));
-          }
-
-          if (!version) throw new Error('Version not created after 5s timeout');
-          if (version.banner_image_url !== testImageUrl) {
-            throw new Error('Version missing banner_image_url');
-          }
 
           const duration = Date.now() - startTime;
 
@@ -381,8 +392,8 @@ export const submissionTestSuite: TestSuite = {
             details: {
               modelId,
               manufacturerId,
-              imageFieldsValidated: ['banner_image_url', 'banner_image_id', 'card_image_url', 'card_image_id'],
+              versionCreated: true,
-              versionCreated: true
+              followedPipeline: true
             }
           };
 
@@ -397,12 +408,7 @@ export const submissionTestSuite: TestSuite = {
             timestamp: new Date().toISOString()
           };
         } finally {
-          if (modelId) {
+          await tracker.cleanup();
-            await supabase.from('ride_models').delete().eq('id', modelId);
-          }
-          if (manufacturerId) {
-            await supabase.from('companies').delete().eq('id', manufacturerId);
-          }
         }
       }
     }

src/lib/integrationTests/suites/versioningTests.ts

@@ -3,76 +3,82 @@
  * 
  * Tests the complete versioning system end-to-end including automatic
  * version creation, attribution, and rollback functionality.
+ * 
+ * All tests follow the sacred pipeline: submitParkCreation → approve → verify versioning
  */
 
 import { supabase } from '@/lib/supabaseClient';
 import type { TestSuite, TestResult } from '../testRunner';
 import { TestDataTracker } from '../TestDataTracker';
+import {
+  generateUniqueParkData,
+  createTestParkSubmission,
+  approveSubmission,
+  pollForEntity,
+  pollForVersion,
+  getAuthToken,
+  getCurrentUserId,
+} from '../helpers/approvalTestHelpers';
 
 export const versioningTestSuite: TestSuite = {
   id: 'versioning',
   name: 'Versioning & Rollback',
-  description: 'Tests version creation, attribution, rollback, and cleanup',
+  description: 'Tests version creation, attribution, rollback, and cleanup via sacred pipeline',
   tests: [
     {
       id: 'version-001',
       name: 'Automatic Version Creation on Insert',
-      description: 'Verifies version 1 is created automatically when entity is created',
+      description: 'Verifies version 1 is created automatically when entity is approved',
       run: async (): Promise<TestResult> => {
         const startTime = Date.now();
         const tracker = new TestDataTracker();
-        let parkId: string | null = null;
         
         try {
-          // Create a park
+          // Follow sacred pipeline: Form → Submission → Approval → Versioning
-          const slug = `test-park-${Date.now()}`;
+          const userId = await getCurrentUserId();
-          const { data: park, error: createError } = await supabase
+          const authToken = await getAuthToken();
-            .from('parks')
+          const parkData = generateUniqueParkData('version-001');
-            .insert({
-              name: 'Version Test Park',
-              slug,
-              park_type: 'theme_park',
-              status: 'operating'
-            })
-            .select('id')
-            .single();
           
-          if (createError) throw new Error(`Park creation failed: ${createError.message}`);
+          // Create submission
-          if (!park) throw new Error('No park returned from insert');
+          const { submissionId, itemId } = await createTestParkSubmission(parkData, userId, tracker);
           
-          parkId = park.id;
+          // Approve submission
-          
+          const approval = await approveSubmission(submissionId, [itemId], authToken);
-          // Poll for version creation
+          if (!approval.success) {
-          let v1: any = null;
+            throw new Error(`Approval failed: ${approval.error}`);
-          const pollStart = Date.now();
-          while (!v1 && Date.now() - pollStart < 5000) {
-            const { data } = await supabase
-              .from('park_versions')
-              .select('version_id')
-              .eq('park_id', park.id)
-              .eq('version_number', 1)
-              .single();
-            
-            if (data) {
-              v1 = data;
-              break;
-            }
-            await new Promise(resolve => setTimeout(resolve, 100));
           }
           
-          // Check version was created
+          // Get approved entity ID
-          const { data: version, error: versionError } = await supabase
+          const { data: item } = await supabase
-            .from('park_versions')
+            .from('submission_items')
-            .select('*')
+            .select('approved_entity_id')
-            .eq('park_id', park.id)
+            .eq('id', itemId)
-            .eq('version_number', 1)
             .single();
           
-          if (versionError) throw new Error(`Version query failed: ${versionError.message}`);
+          if (!item?.approved_entity_id) {
+            throw new Error('No entity ID returned after approval');
+          }
+          
+          const parkId = item.approved_entity_id;
+          tracker.track('parks', parkId);
+          
+          // Poll for park entity
+          const park = await pollForEntity('parks', parkId);
+          if (!park) throw new Error('Park not created after approval');
+          
+          // Verify version 1 was created automatically
+          const version = await pollForVersion('park', parkId, 1);
           if (!version) throw new Error('Version 1 not created');
-          if (version.name !== 'Version Test Park') throw new Error('Version has incorrect name');
+          
-          if (version.change_type !== 'created') throw new Error(`Expected change_type "created", got "${version.change_type}"`);
+          if (version.name !== parkData.name) {
-          if (!version.is_current) throw new Error('Version is not marked as current');
+            throw new Error(`Version has incorrect name: expected "${parkData.name}", got "${version.name}"`);
+          }
+          if (version.change_type !== 'created') {
+            throw new Error(`Expected change_type "created", got "${version.change_type}"`);
+          }
+          if (!version.is_current) {
+            throw new Error('Version is not marked as current');
+          }
           
           const duration = Date.now() - startTime;
           
@@ -84,10 +90,12 @@ export const versioningTestSuite: TestSuite = {
             duration,
             timestamp: new Date().toISOString(),
             details: {
-              parkId: park.id,
+              parkId,
+              submissionId,
               versionNumber: version.version_number,
               changeType: version.change_type,
-              isCurrent: version.is_current
+              isCurrent: version.is_current,
+              followedPipeline: true
             }
           };
         } catch (error) {
@@ -103,79 +111,81 @@ export const versioningTestSuite: TestSuite = {
             timestamp: new Date().toISOString()
           };
         } finally {
-          // Cleanup
+          await tracker.cleanup();
-          if (parkId) {
-            await supabase.from('parks').delete().eq('id', parkId);
-          }
         }
       }
     },
     {
       id: 'version-002',
       name: 'Automatic Version Creation on Update',
-      description: 'Verifies version 2 is created when entity is updated',
+      description: 'Verifies version 2 is created when entity is updated via pipeline',
       run: async (): Promise<TestResult> => {
         const startTime = Date.now();
         const tracker = new TestDataTracker();
-        let parkId: string | null = null;
         
         try {
-          // Create a park
+          // Create and approve initial park
-          const slug = `test-park-${Date.now()}`;
+          const userId = await getCurrentUserId();
-          const { data: park, error: createError } = await supabase
+          const authToken = await getAuthToken();
-            .from('parks')
+          const parkData = generateUniqueParkData('version-002');
-            .insert({
+          
-              name: 'Original Name',
+          const { submissionId, itemId } = await createTestParkSubmission(parkData, userId, tracker);
-              slug,
+          const approval = await approveSubmission(submissionId, [itemId], authToken);
-              park_type: 'theme_park',
+          
-              status: 'operating'
+          if (!approval.success) {
-            })
+            throw new Error(`Initial approval failed: ${approval.error}`);
-            .select('id')
+          }
+          
+          // Get park ID
+          const { data: item } = await supabase
+            .from('submission_items')
+            .select('approved_entity_id')
+            .eq('id', itemId)
             .single();
           
-          if (createError) throw new Error(`Park creation failed: ${createError.message}`);
+          const parkId = item?.approved_entity_id;
-          if (!park) throw new Error('No park returned');
+          if (!parkId) throw new Error('No park ID after approval');
           
-          parkId = park.id;
+          tracker.track('parks', parkId);
           
           // Wait for version 1
-          await new Promise(resolve => setTimeout(resolve, 100));
+          const v1 = await pollForVersion('park', parkId, 1);
+          if (!v1) throw new Error('Version 1 not created');
           
-          // Update the park
+          // Update park directly (simulating approved edit)
+          // In production, this would go through edit submission pipeline
           const { error: updateError } = await supabase
             .from('parks')
-            .update({ name: 'Updated Name' })
+            .update({ name: 'Updated Name', description: 'Updated Description' })
-            .eq('id', park.id);
+            .eq('id', parkId);
           
           if (updateError) throw new Error(`Park update failed: ${updateError.message}`);
           
-          // Wait for version 2
+          // Verify version 2 created
-          await new Promise(resolve => setTimeout(resolve, 100));
+          const v2 = await pollForVersion('park', parkId, 2);
+          if (!v2) throw new Error('Version 2 not created after update');
           
-          // Check version 2 exists
+          if (v2.name !== 'Updated Name') {
-          const { data: v2, error: v2Error } = await supabase
+            throw new Error(`Version 2 has incorrect name: expected "Updated Name", got "${v2.name}"`);
-            .from('park_versions')
+          }
-            .select('*')
+          if (v2.change_type !== 'updated') {
-            .eq('park_id', park.id)
+            throw new Error(`Expected change_type "updated", got "${v2.change_type}"`);
-            .eq('version_number', 2)
+          }
-            .single();
+          if (!v2.is_current) {
+            throw new Error('Version 2 is not marked as current');
+          }
           
-          if (v2Error) throw new Error(`Version 2 query failed: ${v2Error.message}`);
+          // Verify version 1 is no longer current
-          if (!v2) throw new Error('Version 2 not created');
+          const { data: v1Updated } = await supabase
-          if (v2.name !== 'Updated Name') throw new Error('Version 2 has incorrect name');
-          if (v2.change_type !== 'updated') throw new Error(`Expected change_type "updated", got "${v2.change_type}"`);
-          if (!v2.is_current) throw new Error('Version 2 is not marked as current');
-          
-          // Check version 1 is no longer current
-          const { data: v1, error: v1Error } = await supabase
             .from('park_versions')
             .select('is_current')
-            .eq('park_id', park.id)
+            .eq('park_id', parkId)
             .eq('version_number', 1)
             .single();
           
-          if (v1Error) throw new Error(`Version 1 query failed: ${v1Error.message}`);
+          if (v1Updated?.is_current) {
-          if (v1?.is_current) throw new Error('Version 1 is still marked as current');
+            throw new Error('Version 1 is still marked as current');
+          }
           
           const duration = Date.now() - startTime;
           
@@ -187,8 +197,8 @@ export const versioningTestSuite: TestSuite = {
             duration,
             timestamp: new Date().toISOString(),
             details: {
-              parkId: park.id,
+              parkId,
-              v1IsCurrent: v1?.is_current,
+              v1IsCurrent: v1Updated?.is_current,
               v2IsCurrent: v2.is_current,
               v2ChangeType: v2.change_type
             }
@@ -207,10 +217,6 @@ export const versioningTestSuite: TestSuite = {
           };
         } finally {
           await tracker.cleanup();
-          const remaining = await tracker.verifyCleanup();
-          if (remaining.length > 0) {
-            console.warn('version-001 cleanup incomplete:', remaining);
-          }
         }
       }
     },
@@ -221,48 +227,37 @@ export const versioningTestSuite: TestSuite = {
       run: async (): Promise<TestResult> => {
         const startTime = Date.now();
         const tracker = new TestDataTracker();
-        let parkId: string | null = null;
         
         try {
-          // Create a park
+          // Create and approve park
-          const slug = `test-park-${Date.now()}`;
+          const userId = await getCurrentUserId();
-          const { data: park, error: createError } = await supabase
+          const authToken = await getAuthToken();
-            .from('parks')
+          const parkData = generateUniqueParkData('version-003');
-            .insert({
-              name: 'Rollback Test Park',
-              slug,
-              park_type: 'theme_park',
-              status: 'operating'
-            })
-            .select('id')
-            .single();
           
-          if (createError) throw new Error(`Park creation failed: ${createError.message}`);
+          const { submissionId, itemId } = await createTestParkSubmission(parkData, userId, tracker);
-          if (!park) throw new Error('No park returned');
+          const approval = await approveSubmission(submissionId, [itemId], authToken);
           
-          parkId = park.id;
+          if (!approval.success) {
-          
+            throw new Error(`Approval failed: ${approval.error}`);
-          // Poll for version creation
-          let v1: any = null;
-          const pollStart = Date.now();
-          while (!v1 && Date.now() - pollStart < 5000) {
-            const { data } = await supabase
-              .from('park_versions')
-              .select('version_id')
-              .eq('park_id', park.id)
-              .eq('version_number', 1)
-              .single();
-            
-            if (data) {
-              v1 = data;
-              break;
-            }
-            await new Promise(resolve => setTimeout(resolve, 100));
           }
           
-          if (!v1) throw new Error('Version 1 not created after 5s timeout');
+          // Get park ID
+          const { data: item } = await supabase
+            .from('submission_items')
+            .select('approved_entity_id')
+            .eq('id', itemId)
+            .single();
           
-          // Check current user is moderator
+          const parkId = item?.approved_entity_id;
+          if (!parkId) throw new Error('No park ID after approval');
+          
+          tracker.track('parks', parkId);
+          
+          // Wait for version 1
+          const v1 = await pollForVersion('park', parkId, 1);
+          if (!v1) throw new Error('Version 1 not created');
+          
+          // Check current user role
           const { data: { user } } = await supabase.auth.getUser();
           if (!user) throw new Error('No authenticated user');
           
@@ -271,14 +266,13 @@ export const versioningTestSuite: TestSuite = {
           // Try rollback
           const { error: rollbackError } = await supabase.rpc('rollback_to_version', {
             p_entity_type: 'park',
-            p_entity_id: park.id,
+            p_entity_id: parkId,
             p_target_version_id: v1.version_id,
             p_changed_by: user.id,
             p_reason: 'Authorization test'
           });
           
-          // If user is moderator, rollback should succeed
+          // Verify authorization enforcement
-          // If not, rollback should fail with permission error
           if (isMod && rollbackError) {
             throw new Error(`Rollback failed for moderator: ${rollbackError.message}`);
           }
@@ -316,10 +310,6 @@ export const versioningTestSuite: TestSuite = {
           };
         } finally {
           await tracker.cleanup();
-          const remaining = await tracker.verifyCleanup();
-          if (remaining.length > 0) {
-            console.warn('version-002 cleanup incomplete:', remaining);
-          }
         }
       }
     },
@@ -330,7 +320,6 @@ export const versioningTestSuite: TestSuite = {
       run: async (): Promise<TestResult> => {
         const startTime = Date.now();
         const tracker = new TestDataTracker();
-        let parkId: string | null = null;
         
         try {
           // Check if user is moderator
@@ -340,7 +329,6 @@ export const versioningTestSuite: TestSuite = {
           const { data: isMod } = await supabase.rpc('is_moderator', { _user_id: user.id });
           
           if (!isMod) {
-            // Skip test if not moderator
             const duration = Date.now() - startTime;
             return {
               id: 'version-004',
@@ -353,61 +341,54 @@ export const versioningTestSuite: TestSuite = {
             };
           }
           
-          // Create park
+          // Create and approve park
-          const slug = `test-park-${Date.now()}`;
+          const userId = await getCurrentUserId();
-          const { data: park, error: createError } = await supabase
+          const authToken = await getAuthToken();
-            .from('parks')
+          const parkData = {
-            .insert({
+            ...generateUniqueParkData('version-004'),
-              name: 'Original Name',
-              slug,
-              park_type: 'theme_park',
-              status: 'operating',
             description: 'Original Description'
-            })
+          };
-            .select('id')
+          
+          const { submissionId, itemId } = await createTestParkSubmission(parkData, userId, tracker);
+          const approval = await approveSubmission(submissionId, [itemId], authToken);
+          
+          if (!approval.success) {
+            throw new Error(`Approval failed: ${approval.error}`);
+          }
+          
+          // Get park ID
+          const { data: item } = await supabase
+            .from('submission_items')
+            .select('approved_entity_id')
+            .eq('id', itemId)
             .single();
           
-          if (createError) throw new Error(`Park creation failed: ${createError.message}`);
+          const parkId = item?.approved_entity_id;
-          if (!park) throw new Error('No park returned');
+          if (!parkId) throw new Error('No park ID after approval');
           
-          parkId = park.id;
+          tracker.track('parks', parkId);
-          await new Promise(resolve => setTimeout(resolve, 100));
           
-          // Get version 1
+          // Wait for version 1
-          const { data: v1, error: v1Error } = await supabase
+          const v1 = await pollForVersion('park', parkId, 1);
-            .from('park_versions')
+          if (!v1) throw new Error('Version 1 not created');
-            .select('version_id, name, description')
-            .eq('park_id', park.id)
-            .eq('version_number', 1)
-            .single();
-          
-          if (v1Error || !v1) throw new Error('Version 1 not found');
           
           // Update park
           const { error: updateError } = await supabase
             .from('parks')
             .update({ name: 'Modified Name', description: 'Modified Description' })
-            .eq('id', park.id);
+            .eq('id', parkId);
           
           if (updateError) throw new Error(`Park update failed: ${updateError.message}`);
           
-          await new Promise(resolve => setTimeout(resolve, 100));
+          // Wait for version 2
-          
+          const v2 = await pollForVersion('park', parkId, 2);
-          // Verify version 2
-          const { data: v2 } = await supabase
-            .from('park_versions')
-            .select('version_number, name')
-            .eq('park_id', park.id)
-            .eq('version_number', 2)
-            .single();
-          
           if (!v2) throw new Error('Version 2 not created');
           if (v2.name !== 'Modified Name') throw new Error('Version 2 has incorrect data');
           
           // Rollback to version 1
           const { error: rollbackError } = await supabase.rpc('rollback_to_version', {
             p_entity_type: 'park',
-            p_entity_id: park.id,
+            p_entity_id: parkId,
             p_target_version_id: v1.version_id,
             p_changed_by: user.id,
             p_reason: 'Integration test rollback'
@@ -415,37 +396,24 @@ export const versioningTestSuite: TestSuite = {
           
           if (rollbackError) throw new Error(`Rollback failed: ${rollbackError.message}`);
           
-          await new Promise(resolve => setTimeout(resolve, 200));
-          
           // Verify park data restored
-          const { data: restored, error: restoredError } = await supabase
+          const restored = await pollForEntity('parks', parkId, 3000);
-            .from('parks')
+          if (!restored) throw new Error('Could not fetch restored park');
-            .select('name, description')
-            .eq('id', park.id)
-            .single();
           
-          if (restoredError) throw new Error(`Failed to fetch restored park: ${restoredError.message}`);
+          if (restored.name !== parkData.name) {
-          if (!restored) throw new Error('Restored park not found');
+            throw new Error(`Rollback failed: expected "${parkData.name}", got "${restored.name}"`);
-          if (restored.name !== 'Original Name') {
-            throw new Error(`Rollback failed: expected "Original Name", got "${restored.name}"`);
           }
           if (restored.description !== 'Original Description') {
-            throw new Error(`Description not restored: expected "Original Description", got "${restored.description}"`);
+            throw new Error(`Description not restored: got "${restored.description}"`);
           }
           
           // Verify version 3 created with change_type = 'restored'
-          const { data: v3, error: v3Error } = await supabase
+          const v3 = await pollForVersion('park', parkId, 3, 3000);
-            .from('park_versions')
+          if (!v3) throw new Error('Version 3 (restored) not created');
-            .select('*')
-            .eq('park_id', park.id)
-            .eq('version_number', 3)
-            .single();
-          
-          if (v3Error || !v3) throw new Error('Version 3 (restored) not created');
           if (v3.change_type !== 'restored') {
             throw new Error(`Expected change_type "restored", got "${v3.change_type}"`);
           }
-          if (v3.name !== 'Original Name') throw new Error('Version 3 has incorrect data');
+          if (v3.name !== parkData.name) throw new Error('Version 3 has incorrect data');
           if (!v3.is_current) throw new Error('Version 3 is not marked as current');
           
           const duration = Date.now() - startTime;
@@ -458,7 +426,7 @@ export const versioningTestSuite: TestSuite = {
             duration,
             timestamp: new Date().toISOString(),
             details: {
-              parkId: park.id,
+              parkId,
               versionsCreated: 3,
               dataRestored: true,
               v3ChangeType: v3.change_type,
@@ -479,10 +447,6 @@ export const versioningTestSuite: TestSuite = {
           };
         } finally {
           await tracker.cleanup();
-          const remaining = await tracker.verifyCleanup();
-          if (remaining.length > 0) {
-            console.warn('version-003 cleanup incomplete:', remaining);
-          }
         }
       }
     }

src/pages/AdminSettings.tsx

@@ -14,7 +14,7 @@ import { useAdminSettings } from '@/hooks/useAdminSettings';
 import { NovuMigrationUtility } from '@/components/admin/NovuMigrationUtility';
 import { TestDataGenerator } from '@/components/admin/TestDataGenerator';
 import { IntegrationTestRunner } from '@/components/admin/IntegrationTestRunner';
-import { Loader2, Save, Clock, Users, Bell, Shield, Settings, Trash2, Plug, AlertTriangle, Lock, TestTube, RefreshCw, Info, AlertCircle } from 'lucide-react';
+import { Loader2, Save, Clock, Users, Bell, Shield, Settings, Trash2, Plug, AlertTriangle, Lock, TestTube, RefreshCw, Info, AlertCircle, Database } from 'lucide-react';
 import { useDocumentTitle } from '@/hooks/useDocumentTitle';
 
 export default function AdminSettings() {
@@ -772,12 +772,8 @@ export default function AdminSettings() {
               <span className="hidden sm:inline">Integrations</span>
             </TabsTrigger>
             <TabsTrigger value="testing" className="flex items-center gap-2">
-              <Loader2 className="w-4 h-4" />
-              <span className="hidden sm:inline">Testing</span>
-            </TabsTrigger>
-            <TabsTrigger value="integration-tests" className="flex items-center gap-2">
               <TestTube className="w-4 h-4" />
-              <span className="hidden sm:inline">Integration Tests</span>
+              <span className="hidden sm:inline">Testing</span>
             </TabsTrigger>
           </TabsList>
 
@@ -971,11 +967,31 @@ export default function AdminSettings() {
           </TabsContent>
 
           <TabsContent value="testing">
+            <div className="space-y-6">
+              {/* Test Data Generator Section */}
+              <div>
+                <h2 className="text-2xl font-bold mb-4 flex items-center gap-2">
+                  <Database className="w-6 h-6" />
+                  Test Data Generator
+                </h2>
+                <p className="text-muted-foreground mb-4">
+                  Generate realistic test data for parks, rides, companies, and submissions.
+                </p>
                 <TestDataGenerator />
-          </TabsContent>
+              </div>
 
-          <TabsContent value="integration-tests">
+              {/* Integration Test Runner Section */}
+              <div>
+                <h2 className="text-2xl font-bold mb-4 flex items-center gap-2">
+                  <TestTube className="w-6 h-6" />
+                  Integration Test Runner
+                </h2>
+                <p className="text-muted-foreground mb-4">
+                  Run automated integration tests against your approval pipeline, moderation system, and data integrity checks.
+                </p>
                 <IntegrationTestRunner />
+              </div>
+            </div>
           </TabsContent>
         </Tabs>
       </div>