redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unit tests fix

Browse Source
This commit is contained in:
karel.picman@lbcfree.net 2020-08-14 09:35:03 +02:00
parent 4be2fd31c1
commit 4052e54b06
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine_dmsf/webdav/project_resource.rb
View File

@ -114,7 +114,7 @@ module RedmineDmsf
end end
def project_id def project_id
project.id if project project&.id
end end
def self.create_project_name(project) def self.create_project_name(project)

6
test/integration/webdav/dmsf_webdav_lock_test.rb
View File

@ -79,7 +79,7 @@ class DmsfWebdavLockTest < RedmineDmsf::Test::IntegrationTest
end end
def test_lock_file_already_locked_by_other def test_lock_file_already_locked_by_other
log_user 'jsmith', 'jsmith' log_user 'admin', 'admin'
process :lock, "/dmsf/webdav/#{@project2.identifier}/#{@file2.name}", params: @xml, process :lock, "/dmsf/webdav/#{@project2.identifier}/#{@file2.name}", params: @xml,
headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' })
assert_response :multi_status assert_response :multi_status
@ -87,6 +87,7 @@ class DmsfWebdavLockTest < RedmineDmsf::Test::IntegrationTest
end end
def test_lock_file def test_lock_file
log_user 'jsmith', 'jsmith'
create_time = Time.utc(2000, 1, 2, 3, 4, 5) create_time = Time.utc(2000, 1, 2, 3, 4, 5)
refresh_time = Time.utc(2000, 1, 2, 6, 7, 8) refresh_time = Time.utc(2000, 1, 2, 6, 7, 8)
locktoken = nil locktoken = nil
@ -147,18 +148,21 @@ class DmsfWebdavLockTest < RedmineDmsf::Test::IntegrationTest
end end
def test_lock_file_in_subproject def test_lock_file_in_subproject
log_user 'admin', 'admin'
process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@project3.identifier}/#{@file12.name}", params: @xml, process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@project3.identifier}/#{@file12.name}", params: @xml,
headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' })
assert_response :success assert_response :success
end end
def test_lock_folder_in_subproject def test_lock_folder_in_subproject
log_user 'admin', 'admin'
process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@project3.identifier}/#{@folder10.title}", params: @xml, process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@project3.identifier}/#{@folder10.title}", params: @xml,
headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' })
assert_response :success assert_response :success
end end
def test_lock_subproject def test_lock_subproject
log_user 'admin', 'admin'
process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@project3.identifier}", params: @xml, process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@project3.identifier}", params: @xml,
headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' })
assert_response :multi_status assert_response :multi_status