diff --git a/.github/workflows/flutter_ci.yaml b/.github/workflows/flutter_ci.yaml index b2d5c4e0a1..d4f011f0cd 100644 --- a/.github/workflows/flutter_ci.yaml +++ b/.github/workflows/flutter_ci.yaml @@ -104,9 +104,4 @@ jobs: - name: Run Flutter unit tests working-directory: frontend run: | - if [ "$RUNNER_OS" == "macOS" ]; then - cargo make dart_unit_test - elif [ "$RUNNER_OS" == "Windows" ]; then - cargo make dart_unit_test - fi - shell: bash + cargo make dart_unit_test diff --git a/frontend/app_flowy/test/bloc_test/grid_test/filter/filter_util.dart b/frontend/app_flowy/test/bloc_test/grid_test/filter/filter_util.dart index 0a07e25309..123ab64dc7 100644 --- a/frontend/app_flowy/test/bloc_test/grid_test/filter/filter_util.dart +++ b/frontend/app_flowy/test/bloc_test/grid_test/filter/filter_util.dart @@ -38,5 +38,6 @@ Future editCells(GridTestContext context) async { final controller1 = await context.makeTextCellController(1); controller0.saveCellData('A'); + await gridResponseFuture(); controller1.saveCellData('B'); } diff --git a/frontend/rust-lib/flowy-grid/src/services/block_editor.rs b/frontend/rust-lib/flowy-grid/src/services/block_editor.rs index f07859688a..15d43c2740 100644 --- a/frontend/rust-lib/flowy-grid/src/services/block_editor.rs +++ b/frontend/rust-lib/flowy-grid/src/services/block_editor.rs @@ -119,7 +119,7 @@ impl GridBlockRevisionEditor { pub async fn get_row_rev(&self, row_id: &str) -> FlowyResult)>> { if self.pad.try_read().is_err() { - tracing::error!("Required GridBlockRevisionPad's read lock failed"); + tracing::error!("Required grid block read lock failed"); Ok(None) } else { let row_rev = self.pad.read().await.get_row_rev(row_id); diff --git a/frontend/scripts/makefile/tests.toml b/frontend/scripts/makefile/tests.toml index 77449c2d79..ecb15012c1 100644 --- a/frontend/scripts/makefile/tests.toml +++ b/frontend/scripts/makefile/tests.toml @@ -1,7 +1,7 @@ [tasks.dart_unit_test] script = ''' -cargo make dart_unit_test_inner +cargo make --profile test-macos dart_unit_test_inner ''' script_runner = "@shell" @@ -11,6 +11,12 @@ cargo make --profile test-windows dart_unit_test_inner ''' script_runner = "@shell" +[tasks.dart_unit_test.linux] +script = ''' +cargo make --profile test-linux dart_unit_test_inner +''' +script_runner = "@shell" + [tasks.dart_unit_test_inner] dependencies = ["build-test-lib"] description = "Run flutter unit tests"