Merge branch 'master' into devel

danmunn · Dec 17, 2024 · 0614353 · 0614353
2 parents 2fb9c97 + 2818561
commit 0614353
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/test/unit/dmsf_link_test.rb b/test/unit/dmsf_link_test.rb
@@ -22,7 +22,7 @@
 
 # Link tests
 class DmsfLinksTest < RedmineDmsf::Test::UnitTest
-  fixtures :dmsf_links, :dmsf_folders, :dmsf_files, :dmsf_file_revisions
+  fixtures :dmsf_links, :dmsf_folders, :dmsf_files, :dmsf_file_revisions, :custom_fields, :custom_values
 
   def test_create_folder_link
     folder_link = DmsfLink.new

diff --git a/test/unit/user_patch_test.rb b/test/unit/user_patch_test.rb
@@ -24,7 +24,7 @@
 class UserPatchTest < RedmineDmsf::Test::UnitTest
   fixtures :dmsf_links, :dmsf_locks, :dmsf_workflows, :dmsf_workflow_steps,
            :dmsf_workflow_step_assignments, :dmsf_workflow_step_actions, :dmsf_folders,
-           :dmsf_files, :dmsf_file_revisions
+           :dmsf_files, :dmsf_file_revisions, :custom_fields, :custom_values
 
   def test_remove_dmsf_references
     id = @jsmith.id
@@ -34,17 +34,15 @@ def test_remove_dmsf_references
     assert_equal 0, DmsfFileRevision.where(dmsf_workflow_assigned_by_user_id: id).all.size
     assert_equal 0, DmsfFileRevision.where(dmsf_workflow_started_by_user_id: id).all.size
     assert_equal 0, DmsfFile.where(deleted_by_user_id: id).all.size
-    # TODO: Expected: 0, Actual: 1 in Easy extension
-    f = DmsfFolder.where(user_id: id).first
-    puts "#{f.id}, #{f.title}, #{f.user_id}, #{f.deleted}" if f
-    # assert_equal 0, DmsfFolder.where(user_id: id).all.size
+    assert_equal 0, DmsfFolder.where(user_id: id).all.size
     assert_equal 0, DmsfFolder.where(deleted_by_user_id: id).all.size
     assert_equal 0, DmsfLink.where(user_id: id).all.size
     assert_equal 0, DmsfLink.where(deleted_by_user_id: id).all.size
-    # assert_equal 0, DmsfLock.where(user_id: id).all.size
-    # assert_equal 0, DmsfWorkflowStepAction.where(author_id: id).all.size
-    # assert_equal 0, DmsfWorkflowStepAssignment.where(user_id: id).all.size
-    # assert_equal 0, DmsfWorkflowStep.where(user_id: id).all.size
-    # assert_equal 0, DmsfWorkflow.where(author_id: id).all.size
+    assert_equal 0, DmsfLock.where(user_id: id).all.size
+    assert_equal 0, DmsfWorkflowStepAction.where(author_id: id).all.size
+    assert_equal 0, DmsfWorkflowStepAssignment.where(user_id: id).all.size
+    assert_equal 0, DmsfWorkflowStep.where(user_id: id).all.size
+    assert_equal 0, DmsfWorkflow.where(author_id: id).all.size
+    assert_equal 0, DmsfFolderPermission.where(object_id: id, object_type: 'User').all.size
   end
 end