@aifabrix/builder 2.42.1 → 2.44.0

package/integration/{hubspot → hubspot-test}/test.js

@@ -23,8 +23,8 @@ const { resolveEnvironment } = require('../../lib/core/config');
 
 const execFileAsync = promisify(execFile);
 
-/** Single source for test config: integration/hubspot/.env */
-const HUBSPOT_DIR = path.join(process.cwd(), 'integration', 'hubspot');
+/** Single source for test config: integration/hubspot-test/.env */
+const HUBSPOT_DIR = path.join(process.cwd(), 'integration', 'hubspot-test');
 const LOCAL_ENV_PATH = path.join(HUBSPOT_DIR, '.env');
 const ARTIFACT_DIR = path.join(HUBSPOT_DIR, 'test-artifacts');
 const MAX_OUTPUT_BYTES = 10 * 1024 * 1024;
@@ -96,10 +96,10 @@ function printUsage() {
   // eslint-disable-next-line no-console
   console.log([
     'Usage:',
-    '  node integration/hubspot/test.js',
-    '  node integration/hubspot/test.js --test "1.1"',
-    '  node integration/hubspot/test.js --type positive',
-    '  node integration/hubspot/test.js --type negative --verbose',
+    '  node integration/hubspot-test/test.js',
+    '  node integration/hubspot-test/test.js --test "1.1"',
+    '  node integration/hubspot-test/test.js --type positive',
+    '  node integration/hubspot-test/test.js --type negative --verbose',
     '',
     'Options:',
     '  --test <id[,id]>       Run specific test IDs',
@@ -266,7 +266,7 @@ async function loadEnvFile(envPath, options) {
       process.env[key] = value;
     }
   }
-  // Map common .env keys so tests and wizard use credentials from integration/hubspot/.env
+  // Map common .env keys so tests and wizard use credentials from integration/hubspot-test/.env
   if (process.env.CLIENTID && process.env.HUBSPOT_CLIENT_ID === undefined) {
     process.env.HUBSPOT_CLIENT_ID = process.env.CLIENTID;
   }
@@ -280,7 +280,7 @@ async function loadEnvFile(envPath, options) {
 
 /**
  * Load test config (controller, environment, dataplane, openapi file).
- * Reads integration/hubspot/.env; missing CONTROLLER_URL/ENVIRONMENT fall back to
+ * Reads integration/hubspot-test/.env; missing CONTROLLER_URL/ENVIRONMENT fall back to
  * the same resolution as the CLI (af auth status) so tests use the same controller.
  * @async
  * @function loadTestConfigFromEnv
@@ -430,7 +430,7 @@ async function validateAuth(context, options) {
     throw new Error('Authentication check failed. Run: node bin/aifabrix.js login --controller <url> --method device');
   }
   const output = `${result.stdout}\n${result.stderr}`;
-  // Only treat "Not authenticated" as failure; "✗ Not reachable" (dataplane) is not auth failure
+  // Only treat "Not authenticated" as failure; "✖ Not reachable" (dataplane) is not auth failure
   if (output.includes('Not authenticated')) {
     throw new Error('Not authenticated. Run: node bin/aifabrix.js login --controller <url> --method device');
   }
@@ -502,7 +502,20 @@ async function checkAppDirectory(appPath) {
 }
 
 /**
- * Validates required files exist
+ * Resolves application config path (application.json or application.yaml)
+ * @param {string} appPath - Application directory path
+ * @returns {string|null} Path to config file or null if neither exists
+ */
+async function resolveApplicationConfigPath(appPath) {
+  const jsonPath = path.join(appPath, 'application.json');
+  const yamlPath = path.join(appPath, 'application.yaml');
+  if (await fileExists(jsonPath)) return jsonPath;
+  if (await fileExists(yamlPath)) return yamlPath;
+  return null;
+}
+
+/**
+ * Validates required files exist (application config can be application.json or application.yaml)
  * @async
  * @function validateRequiredFiles
  * @param {string} appPath - Application directory path
@@ -511,8 +524,12 @@ async function checkAppDirectory(appPath) {
  * @throws {Error} If required files are missing
  */
 async function validateRequiredFiles(appPath, entries) {
-  const requiredFiles = ['application.yaml', 'env.template', 'README.md', 'deploy.js'];
+  const applicationConfigPath = await resolveApplicationConfigPath(appPath);
+  const requiredFiles = ['env.template', 'README.md', 'deploy.js'];
   const missingFiles = [];
+  if (!applicationConfigPath) {
+    missingFiles.push('application.yaml or application.json');
+  }
   for (const fileName of requiredFiles) {
     const filePath = path.join(appPath, fileName);
     const exists = await fileExists(filePath);
@@ -557,11 +574,19 @@ function validateDeployFiles(appPath, entries) {
  * @throws {Error} If file contents are invalid
  */
 async function validateFileContents(appPath, deployFiles) {
+  const configPath = await resolveApplicationConfigPath(appPath);
+  if (!configPath) {
+    throw new Error('Application config (application.yaml or application.json) not found');
+  }
   try {
-    const variablesContent = await fs.readFile(path.join(appPath, 'application.yaml'), 'utf8');
-    yaml.load(variablesContent);
+    const content = await fs.readFile(configPath, 'utf8');
+    if (configPath.endsWith('.json')) {
+      JSON.parse(content);
+    } else {
+      yaml.load(content);
+    }
   } catch (error) {
-    throw new Error(`Invalid YAML syntax in application.yaml: ${error.message}`);
+    throw new Error(`Invalid syntax in ${path.basename(configPath)}: ${error.message}`);
   }
   for (const fileName of deployFiles) {
     try {
@@ -597,22 +622,23 @@ async function validateGeneratedFiles(appName) {
  * @returns {Promise<Object>} Snapshot of file contents keyed by path
  */
 async function captureExternalSnapshot(appPath) {
-  const variablesPath = path.join(appPath, 'application.yaml');
-  const variablesContent = await fs.readFile(variablesPath, 'utf8');
-  const variables = yaml.load(variablesContent);
+  const configPath = await resolveApplicationConfigPath(appPath);
+  if (!configPath) {
+    throw new Error(`Application config not found in ${appPath}`);
+  }
+  const content = await fs.readFile(configPath, 'utf8');
+  const variables = configPath.endsWith('.json') ? JSON.parse(content) : yaml.load(content);
 
   if (!variables || !variables.externalIntegration) {
-    throw new Error(`externalIntegration block not found in ${variablesPath}`);
+    throw new Error(`externalIntegration block not found in ${configPath}`);
   }
 
-  const systemFiles = variables.externalIntegration.systems || [];
-  const datasourceFiles = variables.externalIntegration.dataSources || [];
   const fileNames = [
-    'application.yaml',
+    path.basename(configPath),
     'env.template',
     'README.md',
-    ...systemFiles,
-    ...datasourceFiles
+    ...(variables.externalIntegration.systems || []),
+    ...(variables.externalIntegration.dataSources || [])
   ];
 
   const rbacPath = path.join(appPath, 'rbac.yml');
@@ -658,7 +684,7 @@ function compareSnapshots(before, after) {
  * @returns {boolean} True if test app name
  */
 function isTestAppName(appName) {
-  return appName.startsWith('hubspot-test-');
+  return appName.startsWith('wizard-e2e-');
 }
 
 /**
@@ -769,6 +795,20 @@ async function testDownloadAndSplit(appName, context, options) {
   logSuccess('Download and split workflow validated.');
 }
 
+/**
+ * Returns a skip message only when the wizard failure is due to dataplane unreachable (no service).
+ * Does not skip for auth/session errors when dataplane is up (so tests fail with the real error).
+ * @param {string} errorOutput - Combined stdout + stderr from wizard command
+ * @returns {string|null} Skip message or null
+ */
+function getWizardEnvironmentSkipMessage(errorOutput) {
+  if (errorOutput.includes('Failed to discover dataplane URL') ||
+      errorOutput.includes('Application not found')) {
+    return 'Dataplane service not found in environment. Deploy dataplane service to the controller.';
+  }
+  return null;
+}
+
 /**
  * Runs wizard and validates generated files
  * @async
@@ -778,12 +818,17 @@ async function testDownloadAndSplit(appName, context, options) {
  * @param {Object} context - Test context
  * @param {Object} options - Options object
  * @returns {Promise<void>} Resolves when wizard completes and files are validated
+ * @throws {SkipTestError} If wizard fails due to environment (dataplane/auth)
  * @throws {Error} If wizard fails or validation fails
  */
 async function runWizardAndValidate(configPath, appName, context, options) {
   const result = await runWizard(configPath, context, options);
   if (!result.success) {
     const errorOutput = `${result.stdout}\n${result.stderr}`;
+    const skipMsg = getWizardEnvironmentSkipMessage(errorOutput);
+    if (skipMsg) {
+      throw new SkipTestError(skipMsg);
+    }
     throw new Error(`Wizard failed for ${appName}:\n${errorOutput}`);
   }
 
@@ -884,18 +929,18 @@ function buildPositiveTestCases(context) {
           throw new Error(`OpenAPI file not found: ${context.openapiFile}`);
         }
         ensureEnvVar('CONTROLLER_URL', context.controllerUrl);
-        // Try to run wizard - if dataplane discovery fails, skip the test
+        // Try to run wizard - if dataplane/auth fails, skip the test
         const result = await runWizard(configPath, context, options);
         if (!result.success) {
           const errorOutput = `${result.stdout}\n${result.stderr}`;
-          if (errorOutput.includes('Failed to discover dataplane URL') ||
-              errorOutput.includes('Application not found')) {
-            throw new SkipTestError('Dataplane service not found in environment. Deploy dataplane service to the controller.');
+          const skipMsg = getWizardEnvironmentSkipMessage(errorOutput);
+          if (skipMsg) {
+            throw new SkipTestError(skipMsg);
           }
           throw new Error(`Wizard failed: ${errorOutput}`);
         }
-        await validateGeneratedFiles('hubspot-test-e2e');
-        await cleanupAppArtifacts('hubspot-test-e2e', options);
+        await validateGeneratedFiles('wizard-e2e-e2e');
+        await cleanupAppArtifacts('wizard-e2e-e2e', options);
       }
     },
     {
@@ -908,11 +953,11 @@ function buildPositiveTestCases(context) {
           throw new Error(`Missing config file: ${configPath}`);
         }
         try {
-          await ensureDataplaneUrl(context, 'hubspot-test-platform');
+          await ensureDataplaneUrl(context, 'wizard-e2e-platform');
         } catch (error) {
           throw new SkipTestError(`Dataplane service not found: ${error.message}`);
         }
-        await runWizardAndValidate(configPath, 'hubspot-test-platform', context, options);
+        await runWizardAndValidate(configPath, 'wizard-e2e-platform', context, options);
       }
     },
     {
@@ -922,14 +967,14 @@ function buildPositiveTestCases(context) {
       run: async(options) => {
         let dataplaneUrl;
         try {
-          dataplaneUrl = await ensureDataplaneUrl(context, 'hubspot-test-env-vars');
+          dataplaneUrl = await ensureDataplaneUrl(context, 'wizard-e2e-env-vars');
         } catch (error) {
           throw new SkipTestError(`Dataplane service not found: ${error.message}`);
         }
         ensureEnvVar('CONTROLLER_URL', context.controllerUrl);
         ensureEnvVar('DATAPLANE_URL', dataplaneUrl);
         const configPath = await writeWizardConfig('wizard-hubspot-env-vars', {
-          appName: 'hubspot-test-env-vars',
+          appName: 'wizard-e2e-env-vars',
           mode: 'create-system',
           source: {
             type: 'openapi-file',
@@ -941,7 +986,7 @@ function buildPositiveTestCases(context) {
             environment: context.environment
           }
         });
-        await runWizardAndValidate(configPath, 'hubspot-test-env-vars', context, options);
+        await runWizardAndValidate(configPath, 'wizard-e2e-env-vars', context, options);
       }
     }
   ];
@@ -966,7 +1011,7 @@ function buildRealDataTestCases(context) {
         requireEnvVars(['HUBSPOT_CLIENT_ID', 'HUBSPOT_CLIENT_SECRET']);
         ensureEnvVar('HUBSPOT_TOKEN_URL', 'https://api.hubapi.com/oauth/v1/token');
         const configPath = await writeWizardConfig('wizard-hubspot-credential-real', {
-          appName: 'hubspot-test-credential-real',
+          appName: 'wizard-e2e-credential-real',
           mode: 'create-system',
           source: {
             type: 'openapi-file',
@@ -975,7 +1020,7 @@ function buildRealDataTestCases(context) {
           credential: {
             action: 'create',
             config: {
-              key: 'hubspot-test-cred-real',
+              key: 'wizard-e2e-cred-real',
               displayName: 'HubSpot Test Credential (Real)',
               type: 'OAUTH2',
               config: {
@@ -992,7 +1037,7 @@ function buildRealDataTestCases(context) {
             }
           }
         });
-        await runWizardAndValidate(configPath, 'hubspot-test-credential-real', context, options);
+        await runWizardAndValidate(configPath, 'wizard-e2e-credential-real', context, options);
       }
     }
   ];
@@ -1038,7 +1083,7 @@ function buildNegativeConfigTestCases(context) {
       name: 'Missing source block',
       run: async(options) => {
         const configPath = await writeWizardConfig('wizard-invalid-missing-source', {
-          appName: 'hubspot-test-negative-missing-source',
+          appName: 'wizard-e2e-negative-missing-source',
           mode: 'create-system'
         });
         await runWizardExpectFailure(configPath, context, options, 'Missing required field: source');
@@ -1050,7 +1095,7 @@ function buildNegativeConfigTestCases(context) {
       name: 'Invalid source type',
       run: async(options) => {
         const configPath = await writeWizardConfig('wizard-invalid-source', {
-          appName: 'hubspot-test-negative-source',
+          appName: 'wizard-e2e-negative-source',
           mode: 'create-system',
           source: { type: 'invalid-type' }
         });
@@ -1063,7 +1108,7 @@ function buildNegativeConfigTestCases(context) {
       name: 'Invalid mode',
       run: async(options) => {
         const configPath = await writeWizardConfig('wizard-invalid-mode', {
-          appName: 'hubspot-test-negative-mode',
+          appName: 'wizard-e2e-negative-mode',
           mode: 'invalid-mode',
           source: { type: 'known-platform', platform: 'hubspot' }
         });
@@ -1076,7 +1121,7 @@ function buildNegativeConfigTestCases(context) {
       name: 'Known platform missing platform',
       run: async(options) => {
         const configPath = await writeWizardConfig('wizard-invalid-known-platform', {
-          appName: 'hubspot-test-negative-platform',
+          appName: 'wizard-e2e-negative-platform',
           mode: 'create-system',
           source: { type: 'known-platform' }
         });
@@ -1089,7 +1134,7 @@ function buildNegativeConfigTestCases(context) {
       name: 'Missing OpenAPI file path',
       run: async(options) => {
         const configPath = await writeWizardConfig('wizard-invalid-openapi-file', {
-          appName: 'hubspot-test-negative-openapi',
+          appName: 'wizard-e2e-negative-openapi',
           mode: 'create-system',
           source: { type: 'openapi-file', filePath: '/tmp/does-not-exist.json' }
         });
@@ -1102,7 +1147,7 @@ function buildNegativeConfigTestCases(context) {
       name: 'OpenAPI URL missing url',
       run: async(options) => {
         const configPath = await writeWizardConfig('wizard-invalid-openapi-url', {
-          appName: 'hubspot-test-negative-openapi-url',
+          appName: 'wizard-e2e-negative-openapi-url',
           mode: 'create-system',
           source: { type: 'openapi-url' }
         });
@@ -1126,7 +1171,7 @@ function buildNegativeCredentialTestCases(context) {
       name: 'Add datasource missing systemIdOrKey',
       run: async(options) => {
         const configPath = await writeWizardConfig('wizard-invalid-add-datasource', {
-          appName: 'hubspot-test-negative-add-datasource',
+          appName: 'wizard-e2e-negative-add-datasource',
           mode: 'add-datasource',
           source: { type: 'known-platform', platform: 'hubspot' }
         });
@@ -1139,7 +1184,7 @@ function buildNegativeCredentialTestCases(context) {
       name: 'Credential select missing credentialIdOrKey',
       run: async(options) => {
         const configPath = await writeWizardConfig('wizard-invalid-credential-select', {
-          appName: 'hubspot-test-negative-credential-select',
+          appName: 'wizard-e2e-negative-credential-select',
           mode: 'create-system',
           source: { type: 'known-platform', platform: 'hubspot' },
           credential: { action: 'select' }
@@ -1153,7 +1198,7 @@ function buildNegativeCredentialTestCases(context) {
       name: 'Credential create missing config',
       run: async(options) => {
         const configPath = await writeWizardConfig('wizard-invalid-credential-create', {
-          appName: 'hubspot-test-negative-credential-create',
+          appName: 'wizard-e2e-negative-credential-create',
           mode: 'create-system',
           source: { type: 'known-platform', platform: 'hubspot' },
           credential: { action: 'create' }
@@ -1171,26 +1216,24 @@ function buildNegativeCredentialTestCases(context) {
  * @param {string} appName - Application name
  * @param {Object} context - Test context
  * @param {Object} options - Options object
- * @param {string} expectedMessage - Expected error message
+ * @param {string|string[]} expectedMessage - Expected error substring(s); any match passes
  * @returns {Promise<void>} Resolves when validation fails as expected
  * @throws {Error} If validation succeeds or expected message not found
  */
 async function runValidationExpectFailure(appName, context, options, expectedMessage = null) {
-  const validateArgs = [
-    'bin/aifabrix.js',
-    'validate',
-    appName,
-    '--type',
-    'external'
-  ];
+  const validateArgs = ['bin/aifabrix.js', 'validate', appName];
   const result = await runCommand('node', validateArgs, options);
   if (result.success) {
     throw new Error('Expected validation to fail, but it succeeded.');
   }
   if (expectedMessage) {
     const combined = `${result.stdout}\n${result.stderr}`;
-    if (!combined.includes(expectedMessage)) {
-      throw new Error(`Expected error message not found: ${expectedMessage}\nActual output: ${combined}`);
+    const needles = Array.isArray(expectedMessage) ? expectedMessage : [expectedMessage];
+    const found = needles.some(n => combined.includes(n));
+    if (!found) {
+      throw new Error(
+        `Expected error message not found (any of): ${needles.join(' | ')}\nActual output: ${combined}`
+      );
     }
   }
 }
@@ -1276,20 +1319,16 @@ async function getFirstDatasourcePath(appPath) {
 }
 
 /**
- * Corrupts datasource file by removing dimensions
+ * Corrupts root v2.4 ``dimensions``: local binding without required ``field`` (schema failure).
  * @async
- * @function corruptDatasourceRemoveDimensions
+ * @function corruptDatasourceLocalBindingMissingField
  * @param {string} datasourcePath - Datasource file path
  * @returns {Promise<void>} Resolves when file is corrupted
  */
-async function corruptDatasourceRemoveDimensions(datasourcePath) {
+async function corruptDatasourceLocalBindingMissingField(datasourcePath) {
   const datasourceContent = await fs.readFile(datasourcePath, 'utf8');
   const datasourceJson = JSON.parse(datasourceContent);
-  if (datasourceJson.fieldMappings) {
-    delete datasourceJson.fieldMappings.dimensions;
-  } else {
-    datasourceJson.fieldMappings = {};
-  }
+  datasourceJson.dimensions = { orphan_local: { type: 'local' } };
   await fs.writeFile(datasourcePath, JSON.stringify(datasourceJson, null, 2), 'utf8');
 }
 
@@ -1303,13 +1342,9 @@ async function corruptDatasourceRemoveDimensions(datasourcePath) {
 async function corruptDatasourceInvalidDimensionKey(datasourcePath) {
   const datasourceContent = await fs.readFile(datasourcePath, 'utf8');
   const datasourceJson = JSON.parse(datasourceContent);
-  if (!datasourceJson.fieldMappings) {
-    datasourceJson.fieldMappings = {};
-  }
-  if (!datasourceJson.fieldMappings.dimensions) {
-    datasourceJson.fieldMappings.dimensions = {};
-  }
-  datasourceJson.fieldMappings.dimensions['invalid-key-with-hyphen'] = 'metadata.id';
+  datasourceJson.dimensions = {
+    'invalid-key-with-hyphen': { type: 'local', field: 'id' }
+  };
   await fs.writeFile(datasourcePath, JSON.stringify(datasourceJson, null, 2), 'utf8');
 }
 
@@ -1323,30 +1358,23 @@ async function corruptDatasourceInvalidDimensionKey(datasourcePath) {
 async function corruptDatasourceInvalidAttributePath(datasourcePath) {
   const datasourceContent = await fs.readFile(datasourcePath, 'utf8');
   const datasourceJson = JSON.parse(datasourceContent);
-  if (!datasourceJson.fieldMappings) {
-    datasourceJson.fieldMappings = {};
-  }
-  if (!datasourceJson.fieldMappings.dimensions) {
-    datasourceJson.fieldMappings.dimensions = {};
-  }
-  datasourceJson.fieldMappings.dimensions['valid_key'] = 'metadata.id-with-invalid-chars@';
+  datasourceJson.dimensions = {
+    valid_key: { type: 'local', field: 'id-with-invalid-chars@' }
+  };
   await fs.writeFile(datasourcePath, JSON.stringify(datasourceJson, null, 2), 'utf8');
 }
 
 /**
- * Corrupts datasource file with dimensions as array
+ * Corrupts root ``dimensions`` with a non-object JSON value (schema type error).
  * @async
- * @function corruptDatasourceDimensionsAsArray
+ * @function corruptDatasourceDimensionsWrongJsonType
  * @param {string} datasourcePath - Datasource file path
  * @returns {Promise<void>} Resolves when file is corrupted
  */
-async function corruptDatasourceDimensionsAsArray(datasourcePath) {
+async function corruptDatasourceDimensionsWrongJsonType(datasourcePath) {
   const datasourceContent = await fs.readFile(datasourcePath, 'utf8');
   const datasourceJson = JSON.parse(datasourceContent);
-  if (!datasourceJson.fieldMappings) {
-    datasourceJson.fieldMappings = {};
-  }
-  datasourceJson.fieldMappings.dimensions = ['invalid', 'array', 'format'];
+  datasourceJson.dimensions = ['invalid', 'array', 'format'];
   await fs.writeFile(datasourcePath, JSON.stringify(datasourceJson, null, 2), 'utf8');
 }
 
@@ -1363,7 +1391,7 @@ function buildNegativeRbacTestCases(context) {
       type: 'negative',
       name: 'RBAC missing role referenced in permissions',
       run: async(options) => {
-        const appName = 'hubspot-test-negative-rbac-missing-role';
+        const appName = 'wizard-e2e-negative-rbac-missing-role';
         const appPath = await createSystemForNegativeTest(appName, 'wizard-valid-for-rbac-test', context, options);
         await corruptSystemFileWithInvalidRole(appPath);
         await runValidationExpectFailure(appName, context, options, 'references role "non-existent-role" which does not exist');
@@ -1375,10 +1403,17 @@ function buildNegativeRbacTestCases(context) {
       type: 'negative',
       name: 'RBAC invalid YAML syntax',
       run: async(options) => {
-        const appName = 'hubspot-test-negative-rbac-invalid-yaml';
+        const appName = 'wizard-e2e-negative-rbac-invalid-yaml';
+        const appDir = path.join(process.cwd(), 'integration', appName);
+        if (fsSync.existsSync(appDir)) {
+          await fs.rm(appDir, { recursive: true, force: true });
+        }
         const appPath = await createSystemForNegativeTest(appName, 'wizard-valid-for-rbac-yaml-test', context, options);
         await corruptRbacFile(appPath);
-        await runValidationExpectFailure(appName, context, options, 'Invalid YAML syntax in rbac.yaml');
+        await runValidationExpectFailure(appName, context, options, [
+          'Invalid syntax in rbac.yaml',
+          'Invalid YAML syntax'
+        ]);
         await cleanupAppArtifacts(appName, options);
       }
     }
@@ -1408,35 +1443,35 @@ function buildNegativeDimensionTestCases(context) {
   return [
     createTestCase(
       '2.14',
-      'Datasource missing dimensions in fieldMappings',
-      'hubspot-test-negative-dimension-missing',
+      'Datasource dimensions: local binding missing required field',
+      'wizard-e2e-negative-dimension-missing',
       'wizard-valid-for-dimension-test',
-      corruptDatasourceRemoveDimensions,
-      'Missing required property "dimensions"'
+      corruptDatasourceLocalBindingMissingField,
+      'Missing required property "field"'
     ),
     createTestCase(
       '2.15',
-      'Datasource invalid dimension key pattern',
-      'hubspot-test-negative-dimension-invalid-key',
+      'Datasource invalid dimension key (root dimensions propertyNames)',
+      'wizard-e2e-negative-dimension-invalid-key',
       'wizard-valid-for-dimension-key-test',
       corruptDatasourceInvalidDimensionKey,
-      'Must be at most 40 characters'
+      ['letters, numbers, and underscores only', 'property name must be valid']
     ),
     createTestCase(
       '2.16',
-      'Datasource invalid attribute path pattern',
-      'hubspot-test-negative-dimension-invalid-path',
+      'Datasource invalid dimension binding field pattern',
+      'wizard-e2e-negative-dimension-invalid-path',
       'wizard-valid-for-dimension-path-test',
       corruptDatasourceInvalidAttributePath,
       'must match pattern'
     ),
     createTestCase(
       '2.17',
-      'Datasource dimensions as array instead of object',
-      'hubspot-test-negative-dimension-array',
+      'Datasource dimensions wrong JSON type (array)',
+      'wizard-e2e-negative-dimension-array',
       'wizard-valid-for-dimension-array-test',
-      corruptDatasourceDimensionsAsArray,
-      'Expected object, got undefined'
+      corruptDatasourceDimensionsWrongJsonType,
+      'Expected object'
     )
   ];
 }

package/integration/{hubspot → hubspot-test}/wizard-hubspot-e2e.yaml

@@ -1,8 +1,8 @@
-appName: hubspot-test-e2e
+appName: wizard-e2e-e2e
 mode: create-system
 source:
   type: openapi-file
-  filePath: /workspace/aifabrix-builder/integration/hubspot/companies.json
+  filePath: /workspace/aifabrix-builder/integration/hubspot-test/companies.json
 credential:
   action: skip
 preferences:

package/integration/{hubspot → hubspot-test}/wizard-hubspot-platform.yaml

@@ -1,4 +1,4 @@
-appName: hubspot-test-platform
+appName: wizard-e2e-platform
 mode: create-system
 source:
   type: known-platform

package/integration/hubspot-test/wizard-hubspot-test-headless.yaml

@@ -0,0 +1,23 @@
+# Headless wizard: regenerate HubSpot integration under integration/hubspot-test/
+# Requires dataplane access (controller → dataplane) and auth (login or client credentials).
+#
+# From repo root:
+#   node bin/aifabrix.js wizard --config integration/hubspot-test/wizard-hubspot-test-headless.yaml \
+#     --controller <CONTROLLER_URL> --environment <ENV>
+#
+# Or set deployment.controller / deployment.environment below and omit CLI flags if your
+# wizard runner merges them (see docs/commands/external-integration.md).
+
+appName: hubspot-test
+mode: create-system
+source:
+  type: known-platform
+  platform: hubspot
+credential:
+  action: skip
+preferences:
+  intent: "HubSpot CRM integration (hubspot-test fixtures)"
+  fieldOnboardingLevel: standard
+deployment:
+  controller: http://localhost:3110
+  environment: dev