Prechádzať zdrojové kódy

chore: enable rust lint and test by remove path

appflowy 3 rokov pred
rodič
commit
fbb2f49b6f

+ 0 - 6
.github/workflows/rust_lint.yml

@@ -3,14 +3,8 @@ name: Rust lint
 on:
   push:
     branches: [ main ]
-    paths:
-      - 'frontend/rust-lib'
-      - 'shared-lib'
   pull_request:
     branches: [ main ]
-    paths:
-      - 'frontend/rust-lib'
-      - 'shared-lib'
 
 
 env:

+ 0 - 6
.github/workflows/rust_test.yml

@@ -4,15 +4,9 @@ on:
   push:
     branches: 
       - 'main'
-    paths:
-      - 'frontend/rust-lib'
-      - 'shared-lib'
   pull_request:
     branches: 
       - 'main'
-    paths:
-      - 'frontend/rust-lib'
-      - 'shared-lib'
 
 env:
   CARGO_TERM_COLOR: always

+ 1 - 19
shared-lib/flowy-grid-data-model/tests/serde_test.rs

@@ -1,23 +1,5 @@
 use flowy_grid_data_model::entities::*;
 
-#[test]
-fn grid_serde_test() {
-    let grid_id = "1".to_owned();
-    let fields = vec![create_field("1")];
-    let grid = GridMeta {
-        grid_id,
-        fields,
-        blocks: vec![],
-    };
-
-    let grid_1_json = serde_json::to_string(&grid).unwrap();
-    let _: GridMeta = serde_json::from_str(&grid_1_json).unwrap();
-    assert_eq!(
-        grid_1_json,
-        r#"{"id":"1","fields":[{"id":"1","name":"Text Field","desc":"","field_type":"RichText","frozen":false,"visibility":true,"width":150,"type_options":{"type_id":"","value":[]}}],"blocks":[]}"#
-    )
-}
-
 #[test]
 fn grid_default_serde_test() {
     let grid_id = "1".to_owned();
@@ -28,7 +10,7 @@ fn grid_default_serde_test() {
     };
 
     let json = serde_json::to_string(&grid).unwrap();
-    assert_eq!(json, r#"{"id":"1","fields":[],"blocks":[]}"#)
+    assert_eq!(json, r#"{"grid_id":"1","fields":[],"blocks":[]}"#)
 }
 
 fn create_field(field_id: &str) -> FieldMeta {

+ 5 - 5
shared-lib/flowy-sync/src/client_grid/grid_block_meta_pad.rs

@@ -309,8 +309,8 @@ mod tests {
         let _ = pad.add_row_meta(row_2.clone(), None).unwrap().unwrap();
         let _ = pad.add_row_meta(row_3.clone(), Some("1".to_string())).unwrap().unwrap();
 
-        assert_eq!(*pad.rows[0], row_3);
-        assert_eq!(*pad.rows[1], row_1);
+        assert_eq!(*pad.rows[0], row_1);
+        assert_eq!(*pad.rows[1], row_3);
         assert_eq!(*pad.rows[2], row_2);
     }
 
@@ -325,9 +325,9 @@ mod tests {
         let _ = pad.add_row_meta(row_2.clone(), None).unwrap().unwrap();
         let _ = pad.add_row_meta(row_3.clone(), Some("".to_string())).unwrap().unwrap();
 
-        assert_eq!(*pad.rows[0], row_3);
-        assert_eq!(*pad.rows[1], row_1);
-        assert_eq!(*pad.rows[2], row_2);
+        assert_eq!(*pad.rows[0], row_1);
+        assert_eq!(*pad.rows[1], row_2);
+        assert_eq!(*pad.rows[2], row_3);
     }
 
     #[test]