redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#795 expect .storage_path to return Pathname

Browse Source
This commit is contained in:
Karel Picman 2017-11-03 08:31:47 +01:00
parent 68fca7af0a
commit 0218c91c74
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/dmsf_file.rb
View File

@ -99,7 +99,7 @@ class DmsfFile < ActiveRecord::Base
def self.storage_path
path = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
if path.blank?
path = Pathname.new('files').join('dmsf').to_s
path = Pathname.new('files').join('dmsf')
else
pn = Pathname.new(path)
return pn if pn.absolute?

22
test/unit/dmsf_file_test.rb
View File

@ -251,4 +251,26 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
assert_equal 2, csv.size
end
def test_storage_path
# Backup
setting = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
# Relative path
Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = 'dmsf/files'
sp = DmsfFile.storage_path
assert_kind_of Pathname, sp
assert_equal Rails.root.join(Setting.plugin_redmine_dmsf['dmsf_storage_directory']).to_s, sp.to_s
# Empty
Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = ''
sp = DmsfFile.storage_path
assert_kind_of Pathname, sp
assert_equal Rails.root.join(Pathname.new('files').join('dmsf')).to_s, sp.to_s
# Absolute path
Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = '/opt/redmine'
sp = DmsfFile.storage_path
assert_kind_of Pathname, sp
assert_equal '/opt/redmine', sp.to_s
# Restore
Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = setting
end
end