From 36d87d3f5780c0c2835a47e9a48928cfbd31c832 Mon Sep 17 00:00:00 2001
From: "karel.picman@lbcfree.net" <karel.picman@lbcfree.net>
Date: Thu, 4 Mar 2021 16:37:11 +0100
Subject: [PATCH] Integration tests failure

---
 lib/redmine_dmsf/webdav/base_resource.rb | 12 ++----------
 lib/redmine_dmsf/webdav/dmsf_resource.rb |  4 ++--
 test/integration_test.rb                 |  1 +
 test/test_case.rb                        |  3 ---
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/lib/redmine_dmsf/webdav/base_resource.rb b/lib/redmine_dmsf/webdav/base_resource.rb
index d4b7113f..8a2e7c52 100644
--- a/lib/redmine_dmsf/webdav/base_resource.rb
+++ b/lib/redmine_dmsf/webdav/base_resource.rb
@@ -191,11 +191,7 @@ module RedmineDmsf
         prj = nil
         if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names']
           if name =~ /^\[?.+ (\d+)\]?$/
-            if parent_project
-              prj = scope.find_by(id: $1, parent_id: parent_project.id)
-            else
-              prj = scope.find_by(id: $1)
-            end
+            prj = scope.find_by(id: $1, parent_id: parent_project&.id)
             if prj
               # Check again whether it's really the project and not a folder with a number as a suffix
               prj = nil unless name.start_with?('[' + DmsfFolder::get_valid_title(prj.name))
@@ -207,11 +203,7 @@ module RedmineDmsf
           else
             identifier = name
           end
-          if parent_project
-            prj = scope.find_by(identifier: identifier, parent_id: parent_project.id)
-          else
-            prj = scope.find_by(identifier: identifier)
-          end
+          prj = scope.find_by(identifier: identifier, parent_id: parent_project&.id)
         end
         prj
       end
diff --git a/lib/redmine_dmsf/webdav/dmsf_resource.rb b/lib/redmine_dmsf/webdav/dmsf_resource.rb
index cb1c08a9..e872ebdd 100644
--- a/lib/redmine_dmsf/webdav/dmsf_resource.rb
+++ b/lib/redmine_dmsf/webdav/dmsf_resource.rb
@@ -464,8 +464,8 @@ module RedmineDmsf
           l = entity.lock!(scope, type, Time.current + 1.weeks, args[:owner])
           @response['Lock-Token'] = l.uuid
           [1.week.to_i, l.uuid]
-        rescue DmsfLockError
-          e = DAV4Rack::LockFailure.new
+        rescue DmsfLockError => exception
+          e = DAV4Rack::LockFailure.new(exception.message)
           e.add_failure @path, Conflict
           raise e
         end
diff --git a/test/integration_test.rb b/test/integration_test.rb
index 4252b70d..3ec77637 100644
--- a/test/integration_test.rb
+++ b/test/integration_test.rb
@@ -62,6 +62,7 @@ module RedmineDmsf
         @role.add_permission! :view_dmsf_files
         @role.add_permission! :file_manipulation
         @role.add_permission! :file_delete
+        Setting.clear_cache
         Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
         Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'
         Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = nil
diff --git a/test/test_case.rb b/test/test_case.rb
index 9a48b85d..baeb9639 100644
--- a/test/test_case.rb
+++ b/test/test_case.rb
@@ -86,9 +86,6 @@ module RedmineDmsf
           role.add_permission! :manage_workflows
           role.add_permission! :file_approval
         end
-        #Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
-        #Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'
-        #Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = nil
         Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.join(%w(files dmsf))
         Setting.plugin_redmine_dmsf['dmsf_projects_as_subfolders'] = nil
         Setting.text_formatting = 'Textile'