One more attempt to fix qunit tests

fix AIAssistantIntegrationController initialization
fix type error
fix tests after rebase
fix after rebase

Author: dmirgaev

packages/devextreme/js/__internal/grids/data_grid/ai_assistant/ai_assistant_controller.ts

@@ -1,12 +1,16 @@
 import { AIAssistantController } from '@ts/grids/grid_core/ai_assistant/ai_assistant_controller';
 import type { GridCommand } from '@ts/grids/grid_core/ai_assistant/types';
 
-import type { DataGridAIAssistantIntegrationController } from './ai_assistant_integration_controller';
+import { DataGridAIAssistantIntegrationController } from './ai_assistant_integration_controller';
 import { dataGridCommands } from './commands/index';
 
 export class DataGridAIAssistantController extends AIAssistantController {
   protected aiAssistantIntegrationController?: DataGridAIAssistantIntegrationController;
 
+  protected getAiAssistantIntegrationController(): DataGridAIAssistantIntegrationController {
+    return new DataGridAIAssistantIntegrationController(this.component);
+  }
+
   protected getGridCommandList(): GridCommand[] {
     const coreCommands = super.getGridCommandList();
 

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/__tests__/ai_assistant_controller.test.ts

@@ -193,12 +193,12 @@ describe('AIAssistantController', () => {
             { status: 'aborted', message: 'filter aborted' },
           ]),
           abort: jest.fn(),
+          buildResponseSchema: jest.fn().mockReturnValue({ type: 'object' }),
+          isExecuting: jest.fn().mockReturnValue(false),
         }),
       );
 
-      const controller = createController({
-        'aiAssistant.aiIntegration': mockAIIntegration,
-      });
+      const controller = createController();
 
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       controller.sendRequestToAI({

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/ai_assistant_controller.ts

@@ -35,7 +35,7 @@ export class AIAssistantController extends Controller {
   private processing = false;
 
   private getCustomizedResponseTitle(
-    status: MessageStatus.Success | MessageStatus.Failure,
+    status: MessageStatus,
     commandNames: string[],
   ): string {
     // TODO: remove type description, it should be got from d.ts
@@ -232,10 +232,14 @@ export class AIAssistantController extends Controller {
     return [...coreCommands];
   }
 
+  protected getAiAssistantIntegrationController(): AIAssistantIntegrationController {
+    return new AIAssistantIntegrationController(this.component);
+  }
+
   public init(): void {
     this.gridCommands = new GridCommands(this.component, this.getGridCommandList());
     this.messageStore = new ArrayStore<Message, string>({ key: 'id' });
-    this.aiAssistantIntegrationController = new AIAssistantIntegrationController(this.component);
+    this.aiAssistantIntegrationController = this.getAiAssistantIntegrationController();
     this.aiAssistantIntegrationController.init();
   }
 

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/types.ts

@@ -62,7 +62,7 @@ export type CustomizeResponseText = (
 
 // TODO: move to d.ts
 export type CustomizeResponseTitle = (
-  status: MessageStatus.Success | MessageStatus.Failure,
+  status: MessageStatus,
   commandNames: string[],
 ) => string;
 

packages/devextreme/js/__internal/grids/grid_core/ai_chat/ai_chat.test.ts

@@ -548,7 +548,7 @@ describe('AIChat', () => {
 
         const chatConfig = getChatConfig();
         const container = document.createElement('div');
-        const commands: CommandResults = [
+        const commands: CommandResult[] = [
           { status: 'success', message: 'Sorted Name.' },
           { status: 'aborted', message: 'Filter was aborted.' },
         ];
@@ -572,7 +572,7 @@ describe('AIChat', () => {
 
         const chatConfig = getChatConfig();
         const container = document.createElement('div');
-        const commands: CommandResults = [
+        const commands: CommandResult[] = [
           { status: 'aborted', message: 'Filter was aborted.' },
         ];
 

packages/devextreme/js/__internal/grids/grid_core/ai_chat/utils.test.ts

@@ -1,9 +1,7 @@
-import {
-  describe, expect, it,
-} from '@jest/globals';
+import { describe, expect, it } from '@jest/globals';
 import type { Message } from '@js/ui/chat';
+import { MessageStatus } from '@ts/grids/grid_core/ai_assistant/const';
 
-import { MessageStatus } from '../ai_assistant/const';
 import {
   ABORTED_ITEM_EMOJI, CLASSES, ERROR_ITEM_EMOJI, SUCCESS_ITEM_EMOJI,
 } from './const';

packages/devextreme/js/__internal/grids/grid_core/ai_chat/utils.ts

@@ -1,7 +1,7 @@
 import type { Message } from '@js/ui/chat';
+import { MessageStatus } from '@ts/grids/grid_core/ai_assistant/const';
+import type { CommandStatus } from '@ts/grids/grid_core/ai_assistant/types';
 
-import { MessageStatus } from '../ai_assistant/const';
-import type { CommandStatus } from '../ai_assistant/types';
 import {
   ABORTED_ITEM_EMOJI, CLASSES, ERROR_ITEM_EMOJI, SUCCESS_ITEM_EMOJI,
 } from './const';

packages/devextreme/testing/helpers/stubs/zodStub.js

@@ -1,25 +1,41 @@
 /**
  * Minimal zod stub for QUnit / SystemJS tests.
  *
- * Wrapped in AMD define() so SystemJS CSP-production mode can load it.
+ * Uses System.register format which works with both regular SystemJS
+ * and CSP-production mode (no eval required).
  */
 
-define((require, exports) => {
-    const z = {};
+System.register([], (exports) => ({
+    execute() {
+        const z = {
+            // top-level constructors
+            object: () => z,
+            string: () => z,
+            boolean: () => z,
+            number: () => z,
+            null: () => z,
+            enum: () => z,
+            union: () => z,
+            array: () => z,
+            tuple: () => z,
+            literal: () => z,
+            record: () => z,
+            lazy: () => z,
+            // chain modifiers
+            optional: () => z,
+            nullable: () => z,
+            strict: () => z,
+            int: () => z,
+            // eslint-disable-next-line spellcheck/spell-checker
+            nonnegative: () => z,
+            min: () => z,
+            max: () => z,
+            // validation
+            safeParse: () => ({ success: true, data: {} }),
+        };
 
-    [
-        // top-level constructors
-        'object', 'string', 'boolean', 'number', 'null',
-        'enum', 'union', 'array', 'tuple', 'literal', 'record', 'lazy',
-        // chain modifiers
-        'optional', 'nullable', 'strict',
-        'int', 'nonnegative',
-        'min', 'max',
-        // validation
-        'safeParse',
-    ].forEach((name) => { z[name] = () => z; });
-
-    Object.defineProperty(exports, '__esModule', { value: true });
-    exports.z = z;
-    exports.default = z;
-});
+        exports('z', z);
+        exports('default', z);
+        exports('__esModule', true);
+    },
+}));

packages/devextreme/testing/helpers/stubs/zodToJsonSchemaStub.js

@@ -1,13 +1,16 @@
 /**
  * Minimal zod-to-json-schema stub for QUnit / SystemJS tests.
  *
- * Wrapped in AMD define() so SystemJS CSP-production mode can load it.
+ * Uses System.register format which works with both regular SystemJS
+ * and CSP-production mode (no eval required).
  */
 
-define((require, exports) => {
-    const zodToJsonSchema = () => ({ type: 'object' });
+System.register([], (exports) => ({
+    execute() {
+        const zodToJsonSchema = () => ({ type: 'object' });
 
-    Object.defineProperty(exports, '__esModule', { value: true });
-    exports.zodToJsonSchema = zodToJsonSchema;
-    exports.default = zodToJsonSchema;
-});
+        exports('zodToJsonSchema', zodToJsonSchema);
+        exports('default', zodToJsonSchema);
+        exports('__esModule', true);
+    },
+}));