Fix rest of tests

Author: MarcelGeo

mergin/test/test_client.py

@@ -3297,7 +3297,7 @@ def test_pull_project(mc: MerginClient, mc2: MerginClient):
     assert mp_to_pull.project_id() == mp.project_id()
     assert len(project_info.get("files")) == len(mp.files())
     delta = mp.get_pull_delta(mp_to_pull.files(), mp_to_pull.version())
-    for item in [item for item in delta.items if item.type == DeltaChangeType.CREATE]:
+    for item in [item for item in delta.changes if item.type == DeltaChangeType.CREATE]:
         assert os.path.exists(mp_to_pull.fpath(item.path))
     assert os.path.exists(mp_to_pull.fpath_meta("base.gpkg"))
 

mergin/test/test_mergin_project.py

@@ -90,10 +90,10 @@ def test_get_pull_action_valid():
         (DeltaChangeType.UPDATE, DeltaChangeType.UPDATE, PullActionType.COPY_CONFLICT),
         (DeltaChangeType.UPDATE, DeltaChangeType.DELETE, PullActionType.COPY),
         (DeltaChangeType.UPDATE, DeltaChangeType.UPDATE_DIFF, PullActionType.COPY_CONFLICT),
-        (DeltaChangeType.UPDATE_DIFF, None, PullActionType.APPLY_DIFF),
+        (DeltaChangeType.UPDATE_DIFF, None, PullActionType.APPLY_DIFF_NO_REBASE),
         (DeltaChangeType.UPDATE_DIFF, DeltaChangeType.UPDATE, PullActionType.COPY_CONFLICT),
         (DeltaChangeType.UPDATE_DIFF, DeltaChangeType.DELETE, PullActionType.COPY),
-        (DeltaChangeType.UPDATE_DIFF, DeltaChangeType.UPDATE_DIFF, PullActionType.APPLY_DIFF),
+        (DeltaChangeType.UPDATE_DIFF, DeltaChangeType.UPDATE_DIFF, PullActionType.APPLY_DIFF_REBASE),
         (DeltaChangeType.DELETE, None, PullActionType.DELETE),
         (DeltaChangeType.DELETE, DeltaChangeType.UPDATE, None),
         (DeltaChangeType.DELETE, DeltaChangeType.DELETE, None),