Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-17 21:12:55 +01:00
Code Issues Packages Projects Releases Activity

Merged r17889 from trunk to 4.0-stable (#30811).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18129 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2019-05-05 02:02:38 +00:00
parent 3a206e7ba1
commit 68ccc4a8ac
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
test/fixtures/configuration/default.yml → test/fixtures/configuration/default.yml.example vendored
View File

0
test/fixtures/configuration/empty.yml → test/fixtures/configuration/empty.yml.example vendored
View File

0
test/fixtures/configuration/no_default.yml → test/fixtures/configuration/no_default.yml.example vendored
View File

0
test/fixtures/configuration/overrides.yml → test/fixtures/configuration/overrides.yml.example vendored
View File

10
test/unit/lib/redmine/configuration_test.rb
View File

@@ -23,26 +23,26 @@ class Redmine::ConfigurationTest < ActiveSupport::TestCase
end
def test_empty
assert_kind_of Hash, load_conf('empty.yml', 'test')
assert_kind_of Hash, load_conf('empty.yml.example', 'test')
end
def test_default
assert_kind_of Hash, load_conf('default.yml', 'test')
assert_kind_of Hash, load_conf('default.yml.example', 'test')
assert_equal 'foo', @conf['somesetting']
end
def test_no_default
assert_kind_of Hash, load_conf('no_default.yml', 'test')
assert_kind_of Hash, load_conf('no_default.yml.example', 'test')
assert_equal 'foo', @conf['somesetting']
end
def test_overrides
assert_kind_of Hash, load_conf('overrides.yml', 'test')
assert_kind_of Hash, load_conf('overrides.yml.example', 'test')
assert_equal 'bar', @conf['somesetting']
end
def test_with
load_conf('default.yml', 'test')
load_conf('default.yml.example', 'test')
assert_equal 'foo', @conf['somesetting']
@conf.with 'somesetting' => 'bar' do
assert_equal 'bar', @conf['somesetting']