Merge branch 'master' into devel
This commit is contained in:
commit
0614353895
@ -22,7 +22,7 @@ require File.expand_path('../../test_helper', __FILE__)
|
|||||||
|
|
||||||
# Link tests
|
# Link tests
|
||||||
class DmsfLinksTest < RedmineDmsf::Test::UnitTest
|
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
|
def test_create_folder_link
|
||||||
folder_link = DmsfLink.new
|
folder_link = DmsfLink.new
|
||||||
|
|||||||
@ -24,7 +24,7 @@ require File.expand_path('../../test_helper', __FILE__)
|
|||||||
class UserPatchTest < RedmineDmsf::Test::UnitTest
|
class UserPatchTest < RedmineDmsf::Test::UnitTest
|
||||||
fixtures :dmsf_links, :dmsf_locks, :dmsf_workflows, :dmsf_workflow_steps,
|
fixtures :dmsf_links, :dmsf_locks, :dmsf_workflows, :dmsf_workflow_steps,
|
||||||
:dmsf_workflow_step_assignments, :dmsf_workflow_step_actions, :dmsf_folders,
|
: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
|
def test_remove_dmsf_references
|
||||||
id = @jsmith.id
|
id = @jsmith.id
|
||||||
@ -34,17 +34,15 @@ class UserPatchTest < RedmineDmsf::Test::UnitTest
|
|||||||
assert_equal 0, DmsfFileRevision.where(dmsf_workflow_assigned_by_user_id: id).all.size
|
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, DmsfFileRevision.where(dmsf_workflow_started_by_user_id: id).all.size
|
||||||
assert_equal 0, DmsfFile.where(deleted_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
|
assert_equal 0, DmsfFolder.where(user_id: id).all.size
|
||||||
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(deleted_by_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(user_id: id).all.size
|
||||||
assert_equal 0, DmsfLink.where(deleted_by_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, DmsfLock.where(user_id: id).all.size
|
||||||
# assert_equal 0, DmsfWorkflowStepAction.where(author_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, DmsfWorkflowStepAssignment.where(user_id: id).all.size
|
||||||
# assert_equal 0, DmsfWorkflowStep.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, DmsfWorkflow.where(author_id: id).all.size
|
||||||
|
assert_equal 0, DmsfFolderPermission.where(object_id: id, object_type: 'User').all.size
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user