diff --git a/lib/redmine_dmsf/webdav/dmsf_resource.rb b/lib/redmine_dmsf/webdav/dmsf_resource.rb index 6b3b9f15..64696e06 100644 --- a/lib/redmine_dmsf/webdav/dmsf_resource.rb +++ b/lib/redmine_dmsf/webdav/dmsf_resource.rb @@ -29,6 +29,7 @@ module RedmineDmsf include Redmine::I18n def initialize(path, request, response, options) + puts ">>> initialize for #{path}" @folder = nil @file = nil @subproject = nil @@ -452,10 +453,12 @@ module RedmineDmsf # Lock def lock(args) + puts ">>> lock: #{parent.nil?}, #{parent.projectless_path}, #{parent.exist?}" + puts ">>> projectless_path: #{parent.projectless_path}" if parent.nil? || ((parent.projectless_path != '/') && (!parent.exist?)) e = DAV4Rack::LockFailure.new puts ">>> Conflict 1" - puts ">>> @path" + puts ">>> #{@path}" puts ">>> #{parent&.name}" puts ">>> #{parent&.exist?}" e.add_failure @path, Conflict diff --git a/test/integration/webdav/dmsf_webdav_lock_test.rb b/test/integration/webdav/dmsf_webdav_lock_test.rb index 7d6436ab..a195af3c 100644 --- a/test/integration/webdav/dmsf_webdav_lock_test.rb +++ b/test/integration/webdav/dmsf_webdav_lock_test.rb @@ -80,92 +80,93 @@ class DmsfWebdavLockTest < RedmineDmsf::Test::IntegrationTest assert_kind_of User, @admin_user end - def test_lock_file_already_locked_by_other - log_user 'admin', 'admin' - process :lock, "/dmsf/webdav/#{@file2.project.identifier}/#{@file2.name}", params: @xml, - headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) - assert_response :multi_status - assert_match 'HTTP/1.1 409 Conflict', response.body - end - - def test_lock_file - log_user 'jsmith', 'jsmith' - create_time = Time.utc(2000, 1, 2, 3, 4, 5) - refresh_time = Time.utc(2000, 1, 2, 6, 7, 8) - lock_token = nil - - # Time travel, will make the usec part of the time 0 - travel_to create_time do - # Lock file - process :lock, "/dmsf/webdav/#{@file9.project.identifier}/#{@file9.name}", params: @xml, - headers: @jsmith.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) - assert_response :success - # Verify the response - # - # - # - # - # exclusive - # write - # infinity - # Second-604800 - # - # f5762389-6b49-4482-9a4b-ff1c8f975765 - # - # - # - # - assert_match 'exclusive', response.body - assert_match 'write', response.body - assert_match 'infinity', response.body - # 1.week = 7*24*3600=604800 seconds - assert_match 'Second-604800', response.body - assert_match(/([a-z0-9\-]+)<\/d:href><\/d:locktoken>/, response.body) - # Extract the locktoken, needed when refreshing the lock - response.body.match(/([a-z0-9\-]+)<\/d:href><\/d:locktoken>/) - lock_token = $1 - # Verify the lock in the db - @file9.reload - l = @file9.lock.first - assert_equal create_time, l.created_at - assert_equal create_time, l.updated_at - assert_equal (create_time + 1.week), l.expires_at - end - - travel_to refresh_time do - # Refresh lock - process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@file9.name}", - params: nil, - headers: @jsmith.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite', HTTP_IF: lock_token }) - assert_response :success - # 1.week = 7*24*3600=604800 seconds - assert_match 'Second-604800', response.body - # Verify the lock in the db - @file9.reload - l = @file9.lock.first - assert_equal create_time, l.created_at - assert_equal refresh_time, l.updated_at - assert_equal (refresh_time + 1.week), l.expires_at - end - end - - def test_lock_file_in_subproject - log_user 'admin', 'admin' - process :lock, "/dmsf/webdav/#{@file12.project.parent.identifier}/#{@file12.project.identifier}/#{@file12.name}", - params: @xml, headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) - assert_response :success - end - - def test_lock_folder_in_subproject - log_user 'admin', 'admin' - process :lock, - "/dmsf/webdav/#{@folder10.project.parent.identifier}/#{@folder10.project.identifier}/#{@folder10.title}", - params: @xml, headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) - assert_response :success - end + # def test_lock_file_already_locked_by_other + # log_user 'admin', 'admin' + # process :lock, "/dmsf/webdav/#{@file2.project.identifier}/#{@file2.name}", params: @xml, + # headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) + # assert_response :multi_status + # assert_match 'HTTP/1.1 409 Conflict', response.body + # end + # + # def test_lock_file + # log_user 'jsmith', 'jsmith' + # create_time = Time.utc(2000, 1, 2, 3, 4, 5) + # refresh_time = Time.utc(2000, 1, 2, 6, 7, 8) + # lock_token = nil + # + # # Time travel, will make the usec part of the time 0 + # travel_to create_time do + # # Lock file + # process :lock, "/dmsf/webdav/#{@file9.project.identifier}/#{@file9.name}", params: @xml, + # headers: @jsmith.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) + # assert_response :success + # # Verify the response + # # + # # + # # + # # + # # exclusive + # # write + # # infinity + # # Second-604800 + # # + # # f5762389-6b49-4482-9a4b-ff1c8f975765 + # # + # # + # # + # # + # assert_match 'exclusive', response.body + # assert_match 'write', response.body + # assert_match 'infinity', response.body + # # 1.week = 7*24*3600=604800 seconds + # assert_match 'Second-604800', response.body + # assert_match(/([a-z0-9\-]+)<\/d:href><\/d:locktoken>/, response.body) + # # Extract the locktoken, needed when refreshing the lock + # response.body.match(/([a-z0-9\-]+)<\/d:href><\/d:locktoken>/) + # lock_token = $1 + # # Verify the lock in the db + # @file9.reload + # l = @file9.lock.first + # assert_equal create_time, l.created_at + # assert_equal create_time, l.updated_at + # assert_equal (create_time + 1.week), l.expires_at + # end + # + # travel_to refresh_time do + # # Refresh lock + # process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@file9.name}", + # params: nil, + # headers: @jsmith.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite', HTTP_IF: lock_token }) + # assert_response :success + # # 1.week = 7*24*3600=604800 seconds + # assert_match 'Second-604800', response.body + # # Verify the lock in the db + # @file9.reload + # l = @file9.lock.first + # assert_equal create_time, l.created_at + # assert_equal refresh_time, l.updated_at + # assert_equal (refresh_time + 1.week), l.expires_at + # end + # end + # + # def test_lock_file_in_subproject + # log_user 'admin', 'admin' + # process :lock, "/dmsf/webdav/#{@file12.project.parent.identifier}/#{@file12.project.identifier}/#{@file12.name}", + # params: @xml, headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) + # assert_response :success + # end + # + # def test_lock_folder_in_subproject + # log_user 'admin', 'admin' + # process :lock, + # "/dmsf/webdav/#{@folder10.project.parent.identifier}/#{@folder10.project.identifier}/#{@folder10.title}", + # params: @xml, headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) + # assert_response :success + # end def test_lock_subproject log_user 'admin', 'admin' + puts ">>> process lock" process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@project3.identifier}", params: @xml, headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) assert_response :multi_status