Merge branch 'dev' into feat/sheet-checkbox

dream-num · Oct 16, 2024 · fa2ab3e · fa2ab3e
2 parents af8aa3e + a4a7cda
commit fa2ab3e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -36,7 +36,7 @@ jobs:
                   vercel-org-id: ${{ secrets.ORG_ID }}
                   vercel-project-id: ${{ secrets.PROJECT_ID_E2E }}
 
-            - name: Generate Playwright Report
+            - name: Write Playwright Report to PR Comment
               uses: daun/playwright-report-summary@v3
               if: always()
               with:
@@ -48,5 +48,7 @@ jobs:
               if: ${{ !cancelled() }}
               with:
                   name: playwright-report
-                  path: playwright-report/
+                  path: |
+                      playwright-report/
+                      test-results/
                   retention-days: 30
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -199,7 +199,7 @@ pnpm test:e2e
 
 ### Update Snapshots
 
-Univer uses Playwright to perform visual comparison tests. If you have made changes to the UI, the CI may fail due to visual differences. You can update the snapshots by commenting the PR with `/update-snapshots` like [this](https://github.com/dream-num/univer/pull/3655#issuecomment-2398951289), or you can run this GitHub Action [📸 Manually Update Snapshots · Workflow runs · dream-num/univer (github.com)](https://github.com/dream-num/univer/actions/workflows/update-snapshots-manually.yml) manually.
+Univer uses Playwright to perform visual comparison tests. If you have made changes to the UI, the CI may fail due to visual differences. You can update the snapshots ~~by commenting the PR with `/update-snapshots` like [this](https://github.com/dream-num/univer/pull/3655#issuecomment-2398951289), or you can~~ run this GitHub Action [📸 Manually Update Snapshots · Workflow runs · dream-num/univer (github.com)](https://github.com/dream-num/univer/actions/workflows/update-snapshots-manually.yml) manually.
 
 
 ### Clean code

diff --git a/...s-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-chromium-linux.png b/...s-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-chromium-linux.png
diff --git a/...ets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-linux.png b/...ets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-linux.png
diff --git a/...l-comparison.spec.ts-snapshots/mergedCellsRenderingScrolling-chromium-linux.png b/...l-comparison.spec.ts-snapshots/mergedCellsRenderingScrolling-chromium-linux.png
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -186,4 +186,4 @@ export type { ICellCustomRender, ICellRenderContext } from './types/interfaces/i
 export type { IDataValidationRule, IDataValidationRuleBase, IDataValidationRuleInfo, IDataValidationRuleOptions, ISheetDataValidationRule } from './types/interfaces/i-data-validation';
 export { type IRTreeItem, RTree } from './shared/r-tree';
 
-export { Univer } from './univer';
+export { type IUniverConfig, Univer } from './univer';
diff --git a/playwright.config.ts b/playwright.config.ts
@@ -31,7 +31,7 @@ export default defineConfig({
         ['json', { outputFile: 'playwright-report.json' }],
         ['html', { attachments: true }],
     ],
-    outputDir: './playwright-report',
+    // outputDir: './playwright-report',
     /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
     use: {
         /* Base URL to use in actions like `await page.goto('/')`. */