From afc81717d139a836437afb61fd450945ce73b211 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Tue, 11 Aug 2020 11:38:05 +0200 Subject: [PATCH] #1136 CI --- lib/redmine_dmsf/webdav/dmsf_resource.rb | 8 +- .../webdav/dmsf_webdav_lock_test.rb | 180 +++++++++--------- 2 files changed, 96 insertions(+), 92 deletions(-) diff --git a/lib/redmine_dmsf/webdav/dmsf_resource.rb b/lib/redmine_dmsf/webdav/dmsf_resource.rb index 52fd7a29..990f05d8 100644 --- a/lib/redmine_dmsf/webdav/dmsf_resource.rb +++ b/lib/redmine_dmsf/webdav/dmsf_resource.rb @@ -452,10 +452,14 @@ module RedmineDmsf # Lock def lock(args) - unless (parent.projectless_path == '/') || parent_exists? + puts ">>> #{parent}" + puts ">>> #{parent.projectless_path}" + puts ">>> #{parent_exists?}" + puts ">>> #{@path}" + if parent.nil? || ((parent.projectless_path != '/') && (!parent.exists?)) e = DAV4Rack::LockFailure.new e.add_failure @path, Conflict - puts ">>> #{parent.projectless_path}, #{parent_exists?}" + puts ">>> #{parent.projectless_path}, #{parent&.exists?}" raise e end unless exist? diff --git a/test/integration/webdav/dmsf_webdav_lock_test.rb b/test/integration/webdav/dmsf_webdav_lock_test.rb index 94639081..4dbc0e25 100644 --- a/test/integration/webdav/dmsf_webdav_lock_test.rb +++ b/test/integration/webdav/dmsf_webdav_lock_test.rb @@ -59,96 +59,96 @@ class DmsfWebdavLockTest < RedmineDmsf::Test::IntegrationTest Setting.plugin_redmine_dmsf['dmsf_webdav'] = @dmsf_webdav Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = @dmsf_webdav_strategy end - - def test_truth - assert_kind_of Project, @project1 - assert_kind_of Project, @project3 - assert_kind_of DmsfFile, @file1 - assert_kind_of DmsfFile, @file12 - assert_kind_of DmsfFolder, @folder10 - assert_kind_of Role, @role - assert_kind_of User, @admin_user - end - - def test_lock_file_already_locked_by_other - log_user 'admin', 'admin' # login as admin - User.current = @admin_user - assert @file1.lock!, "File failed to be locked by #{User.current}" - process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", params: @xml, - headers: @jsmith.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) - assert_response :locked - end - - def test_lock_file - create_time = Time.utc(2000, 1, 2, 3, 4, 5) - refresh_time = Time.utc(2000, 1, 2, 6, 7, 8) - locktoken = nil - - # Time travel, will make the usec part of the time 0 - travel_to create_time do - # Lock file - process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@file1.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>/) - locktoken = $1 - # Verify the lock in the db - l = @file1.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}/#{@file1.name}", - params: nil, - headers: @jsmith.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite', HTTP_IF: locktoken }) - assert_response :success - # 1.week = 7*24*3600=604800 seconds - assert_match 'Second-604800', response.body - # Verify the lock in the db - @file1.reload - l = @file1.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 - process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@project3.identifier}/#{@file12.name}", params: @xml, - headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) - assert_response :success - end - - def test_lock_folder_in_subproject - process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@project3.identifier}/#{@folder10.title}", params: @xml, - headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) - assert_response :success - end + # + # def test_truth + # assert_kind_of Project, @project1 + # assert_kind_of Project, @project3 + # assert_kind_of DmsfFile, @file1 + # assert_kind_of DmsfFile, @file12 + # assert_kind_of DmsfFolder, @folder10 + # assert_kind_of Role, @role + # assert_kind_of User, @admin_user + # end + # + # def test_lock_file_already_locked_by_other + # log_user 'admin', 'admin' # login as admin + # User.current = @admin_user + # assert @file1.lock!, "File failed to be locked by #{User.current}" + # process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", params: @xml, + # headers: @jsmith.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) + # assert_response :locked + # end + # + # def test_lock_file + # create_time = Time.utc(2000, 1, 2, 3, 4, 5) + # refresh_time = Time.utc(2000, 1, 2, 6, 7, 8) + # locktoken = nil + # + # # Time travel, will make the usec part of the time 0 + # travel_to create_time do + # # Lock file + # process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@file1.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>/) + # locktoken = $1 + # # Verify the lock in the db + # l = @file1.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}/#{@file1.name}", + # params: nil, + # headers: @jsmith.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite', HTTP_IF: locktoken }) + # assert_response :success + # # 1.week = 7*24*3600=604800 seconds + # assert_match 'Second-604800', response.body + # # Verify the lock in the db + # @file1.reload + # l = @file1.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 + # process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@project3.identifier}/#{@file12.name}", params: @xml, + # headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) + # assert_response :success + # end + # + # def test_lock_folder_in_subproject + # process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@project3.identifier}/#{@folder10.title}", params: @xml, + # headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' }) + # assert_response :success + # end def test_lock_subproject process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@project3.identifier}", params: @xml,