Merge remote-tracking branch 'upstream/next' into remove-legacy-brows…

…erlistrc-entry
mui · Mar 12, 2024 · 9d6a5bc · 9d6a5bc
2 parents 6607d42 + 3a90c25
commit 9d6a5bc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
         with:
           languages: typescript
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -29,4 +29,4 @@ jobs:
           # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
           # queries: security-extended,security-and-quality
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -44,6 +44,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
         with:
           sarif_file: results.sarif
diff --git a/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx
@@ -133,13 +133,17 @@ describe('<DateCalendar />', () => {
   // test: https://github.com/mui/mui-x/issues/12373
   it('should not reset day to `startOfDay` if value already exists when finding the closest enabled date', () => {
     const onChange = spy();
-    const defaultDate = adapterToUse.date('2019-01-02T11:12:13');
+    const defaultDate = adapterToUse.date('2019-01-02T11:12:13.550Z');
     render(<DateCalendar onChange={onChange} disablePast defaultValue={defaultDate} />);
 
     userEvent.mousePress(
       screen.getByRole('button', { name: 'calendar view is open, switch to year view' }),
     );
     userEvent.mousePress(screen.getByRole('radio', { name: '2020' }));
+
+    // Finish the transition to the day view
+    clock.runToLast();
+
     userEvent.mousePress(screen.getByRole('gridcell', { name: '1' }));
     userEvent.mousePress(
       screen.getByRole('button', { name: 'calendar view is open, switch to year view' }),