From 23ee74f1085b67249db2307afe0bf5010bff1959 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Wed, 19 Apr 2017 14:44:54 +0200
Subject: [PATCH] A wotg fixtures path

---
 test/integration/rest_api/dmsf_folder_api_test.rb | 2 +-
 test/integration/webdav/dmsf_webdav_move_test.rb  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/integration/rest_api/dmsf_folder_api_test.rb b/test/integration/rest_api/dmsf_folder_api_test.rb
index 67b3cda4..08527ded 100644
--- a/test/integration/rest_api/dmsf_folder_api_test.rb
+++ b/test/integration/rest_api/dmsf_folder_api_test.rb
@@ -25,7 +25,7 @@ class DmsfFolderApiTest < RedmineDmsf::Test::IntegrationTest
   fixtures :dmsf_folders, :dmsf_files, :dmsf_file_revisions, :projects, :users, :members, :roles
 
   def setup
-    DmsfFile.storage_path = File.expand_path '../../../../fixtures/files', __FILE__
+    DmsfFile.storage_path = File.expand_path '../../../fixtures/files', __FILE__
     @jsmith = User.find_by_id 2
     @file1 = DmsfFile.find_by_id 1
     @folder1 = DmsfFolder.find_by_id 1
diff --git a/test/integration/webdav/dmsf_webdav_move_test.rb b/test/integration/webdav/dmsf_webdav_move_test.rb
index 6f43a405..3918bc7b 100644
--- a/test/integration/webdav/dmsf_webdav_move_test.rb
+++ b/test/integration/webdav/dmsf_webdav_move_test.rb
@@ -29,11 +29,12 @@ class DmsfWebdavMoveTest < RedmineDmsf::Test::IntegrationTest
     
   def setup
     DmsfLock.delete_all # Delete all locks that are in our test DB - probably not safe but ho hum
-    timestamp = DateTime.now.strftime("%y%m%d%H%M")
+    timestamp = DateTime.now.strftime('%y%m%d%H%M')
     DmsfFile.storage_path = File.expand_path("./dmsf_test-#{timestamp}", DmsfHelper.temp_dir)
     Dir.mkdir(DmsfFile.storage_path) unless File.directory?(DmsfFile.storage_path)
     # Copy the physical files to the temporary storage
-    FileUtils.cp_r File.dirname(__FILE__) + "/../../fixtures/files/.", DmsfFile.storage_path
+    files = File.expand_path('../../../fixtures/files/.', __FILE__)
+    FileUtils.cp_r files, DmsfFile.storage_path
     
     @admin = credentials 'admin'
     @jsmith = credentials 'jsmith'