Merge branch '25_2' into 25_2_reduce_runners

EugeniyKiyashko · EugeniyKiyashko · commit 5bcdd96df298 · 2025-11-06T23:22:57.000+04:00
diff --git a/.github/workflows/testcafe_tests.yml b/.github/workflows/testcafe_tests.yml
@@ -98,11 +98,9 @@ jobs:
           { componentFolder: "common", name: "common" },
 
           # Grids tests need to be reworked to work in fluent theme
-          { componentFolder: "dataGrid/common", name: "dataGrid / common (1/3)", indices: "1/3" },
-          { componentFolder: "dataGrid/common", name: "dataGrid / common (2/3)", indices: "2/3" },
-          { componentFolder: "dataGrid/common", name: "dataGrid / common (3/3)", indices: "3/3" },
-          { componentFolder: "dataGrid/sticky", name: "dataGrid / sticky (1/2)", indices: "1/2" },
-          { componentFolder: "dataGrid/sticky", name: "dataGrid / sticky (2/2)", indices: "2/2" },
+          { componentFolder: "dataGrid", name: "dataGrid (1/3)", indices: "1/3" },
+          { componentFolder: "dataGrid", name: "dataGrid (2/3)", indices: "2/3" },
+          { componentFolder: "dataGrid", name: "dataGrid (3/3)", indices: "3/3" },
           { componentFolder: "cardView", name: "cardView" },
 
           # Scheduler tests need to be reworked to work in fluent theme
diff --git a/e2e/testcafe-devextreme/tests/dataGrid/common/editing.ts b/e2e/testcafe-devextreme/tests/dataGrid/common/editing.ts
@@ -2136,9 +2136,6 @@ test('The "Cannot read property "brokenRules" of undefined" error occurs T978286
       // act
       await testScreenshot(t, takeScreenshot, screenshotName, { element: dataGrid.element });
       await t
-        .expect(compareResults.isValid())
-        .ok()
-        // assert
         .expect(dataGrid.getDataRow(insertedRowNumber).isInserted)
         .ok('row is inserted')
         .expect(compareResults.isValid())
@@ -2216,14 +2213,13 @@ test('Popup EditForm screenshot when editRowKey is initially specified', async (
     await t
       // act
       .click(dataGrid.getHeaderPanel().getSaveButton())
-      .wait(500)
 
       // assert
       .expect(dataGrid.dataRows.count)
-      .eql(5)
+      .eql(remoteOperations ? 5 : 6)
 
       .expect(dataGrid.getDataCell(0, 0).element.textContent)
-      .eql('val_0_0');
+      .eql(remoteOperations ? 'val_0_0' : 'val_5_0');
   }).before(async () => {
     const data = getData(10, 4);
 
@@ -2286,6 +2282,7 @@ test('Popup EditForm screenshot when editRowKey is initially specified', async (
     })();
   });
 });
+
 // visual: generic.light
 // visual: material.blue.light
 [true, false].forEach((useIcons) => {
diff --git a/e2e/testcafe-devextreme/tests/dataGrid/common/keyboardNavigation/keyboardNavigation.functional.ts b/e2e/testcafe-devextreme/tests/dataGrid/common/keyboardNavigation/keyboardNavigation.functional.ts
@@ -2605,23 +2605,6 @@ test('Empty row should lose focus on Tab (T941246)', async (t) => {
     }
 
     await checkNavigationOfAllCells();
-
-    await t
-      .pressKey('tab');
-
-    const $buttonElement = isCommandColumnFixed
-      ? dataGrid.getFixedDataRow(1).getCommandCell(2).getButton(0)
-      : dataGrid.getDataRow(1).getCommandCell(2).getButton(0);
-
-    await t
-      .expect($buttonElement.focused)
-      .notOk()
-      .pressKey('shift+tab')
-      .expect($buttonElement.focused)
-      .ok()
-      .pressKey('shift+tab')
-      .expect(dataGrid.getDataCell(1, 1).element.focused)
-      .ok();
   }).before(async () => {
     await createWidget('dxDataGrid', {
       dataSource: [
diff --git a/e2e/testcafe-devextreme/tests/dataGrid/common/scrolling.ts b/e2e/testcafe-devextreme/tests/dataGrid/common/scrolling.ts
@@ -1833,34 +1833,31 @@ test('DataGrid - The "row" parameter in the FocusedRowChanged event refers to a
 [true, false].forEach((nativeScroll) => {
   type TestCaseWindow = typeof window & { dataGridScrollableEventValues?: number[] };
 
-  test(
-    `Should not scroll back on top with virtual scrolling and adaptive master detail (nativeScroll: ${nativeScroll}) [T1278804]`,
-    async (t) => {
-      // NOTE: idx + 1 logic inside POM
-      const adaptiveCellIdx = 101;
-      const scrollValuesThreshold = 100;
-
-      const dataGrid = new DataGrid('#container');
-      const firstRow = dataGrid.getDataRow(0);
-      const firstDataCell = firstRow.getDataCell(0);
-      const adaptiveCell = firstRow.getCommandCell(adaptiveCellIdx);
+  test.meta({ unstable: true })(`Should not scroll back on top with virtual scrolling and adaptive master detail (nativeScroll: ${nativeScroll}) [T1278804]`, async (t) => {
+    // NOTE: idx + 1 logic inside POM
+    const adaptiveCellIdx = 101;
+    const scrollValuesThreshold = 100;
 
-      await t
-        .click(firstDataCell.element)
-        .click(adaptiveCell.element);
+    const dataGrid = new DataGrid('#container');
+    const firstRow = dataGrid.getDataRow(0);
+    const firstDataCell = firstRow.getDataCell(0);
+    const adaptiveCell = firstRow.getCommandCell(adaptiveCellIdx);
+
+    await t
+      .click(firstDataCell.element)
+      .click(adaptiveCell.element);
 
-      await dataGrid
-        .scrollBy(t, { y: 1000 });
-      await dataGrid
-        .scrollBy(t, { y: 1000 });
+    await dataGrid
+      .scrollBy(t, { y: 1000 });
+    await dataGrid
+      .scrollBy(t, { y: 1000 });
 
-      const scrollOffsets = await t
-        .eval(() => (window as TestCaseWindow).dataGridScrollableEventValues) as number[];
+    const scrollOffsets = await t
+      .eval(() => (window as TestCaseWindow).dataGridScrollableEventValues) as number[];
 
-      const hasSmallScrollValues = scrollOffsets.some((offset) => offset < scrollValuesThreshold);
-      await t.expect(hasSmallScrollValues).notOk();
-    },
-  ).before(async () => {
+    const hasSmallScrollValues = scrollOffsets.some((offset) => offset < scrollValuesThreshold);
+    await t.expect(hasSmallScrollValues).notOk();
+  }).before(async () => {
     await createWidget('dxDataGrid', {
       dataSource: getData(3, 100).map((item, idx) => ({ ...item, id: idx })),
       keyExpr: 'id',
diff --git a/e2e/testcafe-devextreme/tests/editors/chat/etalons/Messagelist scrollbar position after typing in textarea (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/editors/chat/etalons/Messagelist scrollbar position after typing in textarea (fluent.blue.light).png
diff --git a/e2e/testcafe-devextreme/tests/editors/chat/messageList.ts b/e2e/testcafe-devextreme/tests/editors/chat/messageList.ts
@@ -51,8 +51,7 @@ test('Messagelist appearance with scrollbar', async (t) => {
   const chat = new Chat('#container');
 
   await t
-    .hover(chat.messageList)
-    .wait(400);
+    .hover(chat.messageList);
 
   await testScreenshot(t, takeScreenshot, 'Messagelist with a lot of messages.png', { element: '#container' });
 
diff --git a/e2e/testcafe-devextreme/tests/editors/loadIndIcator/common.ts b/e2e/testcafe-devextreme/tests/editors/loadIndIcator/common.ts
@@ -16,14 +16,6 @@ fixture.disablePageReloads`LoadIndicator`
 ['circle', 'sparkle'].forEach((animationType) => {
   test(`LoadIndicator: start stage of the ${animationType} animation`, async (t) => {
     const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
-    const loadIndicator = new LoadIndicator('#container');
-
-    await testScreenshot(t, takeScreenshot, `LoadIndicator with ${animationType} animation.png`, {
-      element: '#container',
-      themeChanged: async () => {
-        await loadIndicator.repaint();
-      },
-    });
 
     await testScreenshot(t, takeScreenshot, `LoadIndicator with ${animationType} animation.png`, {
       element: '#container',
diff --git a/e2e/testcafe-devextreme/tests/editors/textBox/etalons/Textbox validation message (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/editors/textBox/etalons/Textbox validation message (fluent.blue.light).png
diff --git a/e2e/testcafe-devextreme/tests/editors/textBox/validationMessage.ts b/e2e/testcafe-devextreme/tests/editors/textBox/validationMessage.ts
@@ -21,7 +21,7 @@ test.meta({ browserSize: [300, 200] })('Validation Message position should be co
     .click(Selector(`.${TEXTEDITOR_INPUT_CLASS}`))
     .pressKey('backspace')
     .pressKey('enter')
-    .pressKey('tab');
+    .click('focusable-start');
 
   await setAttribute('#container', 'hidden', 'true');
   await removeAttribute('#container', 'hidden');
diff --git a/e2e/testcafe-devextreme/tests/scheduler/common/header/header_material.ts b/e2e/testcafe-devextreme/tests/scheduler/common/header/header_material.ts
@@ -3,23 +3,25 @@ import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
 import Scheduler from 'devextreme-testcafe-models/scheduler';
 import { createWidget } from '../../../../helpers/createWidget';
 import url from '../../../../helpers/getPageUrl';
-import { testScreenshot } from '../../../../helpers/themeUtils';
+import { isMaterial, isMaterialBased, testScreenshot } from '../../../../helpers/themeUtils';
 
 fixture.disablePageReloads`Scheduler header: material theme`
   .page(url(__dirname, '../../../container.html'));
 
 // visual: material.blue.light
-test('dateNavigator buttons should have "text" styling mode with material theme', async (t) => {
+test('dateNavigator buttons should have "text" styling mode', async (t) => {
   const { toolbar } = new Scheduler('#container');
 
+  const expectedClass = isMaterialBased() ? 'dx-button-mode-text' : 'dx-button-mode-contained';
+
   await t
-    .expect(toolbar.navigator.prevButton.hasClass('dx-button-mode-text'))
+    .expect(toolbar.navigator.prevButton.hasClass(expectedClass))
     .ok()
 
-    .expect(toolbar.navigator.caption.hasClass('dx-button-mode-text'))
+    .expect(toolbar.navigator.caption.hasClass(expectedClass))
     .ok()
 
-    .expect(toolbar.navigator.nextButton.hasClass('dx-button-mode-text'))
+    .expect(toolbar.navigator.nextButton.hasClass(expectedClass))
     .ok();
 }).before(async () => createWidget('dxScheduler', {
   currentView: 'day',
@@ -36,7 +38,7 @@ test('viewSwitcher dropdown button popup should have a specified class', async (
   await t
     .click(dropDownButton.element)
     .expect(Selector(viewSwitcherDropDownButtonContent).count)
-    .eql(1);
+    .eql(isMaterial() ? 1 : 0);
 }).before(async () => createWidget('dxScheduler', {
   currentView: 'day',
   views: ['day', 'week'],
diff --git a/packages/devextreme/js/__internal/core/license/trial_panel.client.test.ts b/packages/devextreme/js/__internal/core/license/trial_panel.client.test.ts
@@ -0,0 +1,71 @@
+/**
+ * @jest-environment jsdom
+ */
+import {
+  beforeEach, describe, expect, it,
+} from '@jest/globals';
+
+import { renderTrialPanel } from './trial_panel.client';
+
+describe('trial panel client', () => {
+  beforeEach(() => {
+    document.body.innerHTML = '';
+  });
+
+  it('should not display subscription text when subscriptions parameter is empty string', () => {
+    renderTrialPanel(
+      'https://example.com/buy',
+      'https://example.com/docs',
+      '25.2.0',
+      '',
+    );
+
+    const triggerElement = document.querySelector('dx-license-trigger');
+    expect(triggerElement).not.toBeNull();
+
+    const panelElement = document.querySelector('dx-license');
+    if (panelElement) {
+      const text = panelElement.textContent ?? '';
+      expect(text).not.toContain('Included in Subscriptions:');
+    }
+  });
+
+  it('should set subscriptions attribute when parameter is a valid string', () => {
+    renderTrialPanel(
+      'https://example.com/buy',
+      'https://example.com/docs',
+      '25.2.0',
+      'Universal, DXperience',
+    );
+
+    const triggerElement = document.querySelector('dx-license-trigger');
+    expect(triggerElement).not.toBeNull();
+
+    const subscriptionsAttr = triggerElement?.getAttribute('subscriptions');
+    expect(subscriptionsAttr).toBe('Universal, DXperience');
+  });
+
+  it('should not display subscription text when subscriptions parameter is actual null', () => {
+    renderTrialPanel(
+      'https://example.com/buy',
+      'https://example.com/docs',
+      '25.2.0',
+      null as any, // Actual null value
+    );
+
+    const triggerElement = document.querySelector('dx-license-trigger');
+    expect(triggerElement).not.toBeNull();
+
+    // When null is passed, it gets converted to string "null" as HTML attribute
+    const subscriptionsAttr = triggerElement?.getAttribute('subscriptions');
+    expect(subscriptionsAttr).toBe('');
+
+    // Ensure the panel element doesn't show "Included in Subscriptions: null"
+    // This is the key test - our fix should prevent displaying "null"
+    const panelElement = document.querySelector('dx-license');
+    if (panelElement) {
+      const text = panelElement.textContent ?? '';
+      expect(text).not.toContain('Included in Subscriptions: null');
+    }
+  });
+});
diff --git a/packages/devextreme/js/__internal/core/license/trial_panel.client.ts b/packages/devextreme/js/__internal/core/license/trial_panel.client.ts
@@ -304,10 +304,11 @@ class DxLicenseTrigger extends SafeHTMLElement {
       const license = document.createElement(componentNames.panel);
 
       Object.values(attributeNames).forEach((attrName) => {
-        license.setAttribute(
-          attrName,
-          this.getAttribute(attrName) as string,
-        );
+        const attrValue = this.getAttribute(attrName);
+
+        if (attrValue) {
+          license.setAttribute(attrName, attrValue);
+        }
       });
 
       license.setAttribute(DATA_PERMANENT_ATTRIBUTE, '');
@@ -338,7 +339,7 @@ export function renderTrialPanel(
   buyNowUrl: string,
   licensingDocUrl: string,
   version: string,
-  subscriptions = '',
+  subscriptions: string | undefined | null,
   customStyles?: CustomTrialPanelStyles,
 ): void {
   registerCustomComponents(customStyles);
@@ -348,7 +349,7 @@ export function renderTrialPanel(
   trialPanelTrigger.setAttribute(attributeNames.buyNow, buyNowUrl);
   trialPanelTrigger.setAttribute(attributeNames.licensingDoc, licensingDocUrl);
   trialPanelTrigger.setAttribute(attributeNames.version, version);
-  trialPanelTrigger.setAttribute(attributeNames.subscriptions, subscriptions);
+  trialPanelTrigger.setAttribute(attributeNames.subscriptions, subscriptions ?? '');
 
   document.body.appendChild(trialPanelTrigger);
 }
diff --git a/packages/devextreme/js/__internal/core/license/trial_panel.ts b/packages/devextreme/js/__internal/core/license/trial_panel.ts
@@ -9,7 +9,7 @@ export function showTrialPanel(
   buyNowUrl: string,
   licensingDocUrl: string,
   version: string,
-  subscriptions?: string,
+  subscriptions?: string | null,
   customStyles?: CustomTrialPanelStyles,
 ): void {
   if (isClient()) {
