From 4052e54b06b8f57e5521932f15e4f82c3563c2e5 Mon Sep 17 00:00:00 2001
From: "karel.picman@lbcfree.net" <karel.picman@lbcfree.net>
Date: Fri, 14 Aug 2020 09:35:03 +0200
Subject: [PATCH] unit tests fix

---
 lib/redmine_dmsf/webdav/project_resource.rb      | 2 +-
 test/integration/webdav/dmsf_webdav_lock_test.rb | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/redmine_dmsf/webdav/project_resource.rb b/lib/redmine_dmsf/webdav/project_resource.rb
index 782768b2..51fe951e 100644
--- a/lib/redmine_dmsf/webdav/project_resource.rb
+++ b/lib/redmine_dmsf/webdav/project_resource.rb
@@ -114,7 +114,7 @@ module RedmineDmsf
       end
 
       def project_id
-	      project.id if project
+	      project&.id
       end
 
       def self.create_project_name(project)
diff --git a/test/integration/webdav/dmsf_webdav_lock_test.rb b/test/integration/webdav/dmsf_webdav_lock_test.rb
index 022f82b8..84e58785 100644
--- a/test/integration/webdav/dmsf_webdav_lock_test.rb
+++ b/test/integration/webdav/dmsf_webdav_lock_test.rb
@@ -79,7 +79,7 @@ class DmsfWebdavLockTest < RedmineDmsf::Test::IntegrationTest
   end
 
   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,
       headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' })
     assert_response :multi_status
@@ -87,6 +87,7 @@ class DmsfWebdavLockTest < RedmineDmsf::Test::IntegrationTest
   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)
     locktoken = nil
@@ -147,18 +148,21 @@ class DmsfWebdavLockTest < RedmineDmsf::Test::IntegrationTest
   end
 
   def test_lock_file_in_subproject
+    log_user 'admin', 'admin'
     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
+    log_user 'admin', 'admin'
     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
+    log_user 'admin', 'admin'
     process :lock, "/dmsf/webdav/#{@project1.identifier}/#{@project3.identifier}", params: @xml,
             headers: @admin.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' })
     assert_response :multi_status