Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-11 07:46:02 +01:00
Code Issues Packages Projects Releases Activity

Rename test/fixtures/configuration/*.yml.example to test/fixtures/files/configuration/*.yml (#35466).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@21067 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2021-07-10 08:47:19 +00:00
parent 5fa84c0b4e
commit d496d8c4ed
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@@ -25,26 +25,26 @@ class Redmine::ConfigurationTest < ActiveSupport::TestCase
end end
def test_empty def test_empty
assert_kind_of Hash, load_conf('empty.yml.example', 'test') assert_kind_of Hash, load_conf('empty.yml', 'test')
end end
def test_default def test_default
assert_kind_of Hash, load_conf('default.yml.example', 'test') assert_kind_of Hash, load_conf('default.yml', 'test')
assert_equal 'foo', @conf['somesetting'] assert_equal 'foo', @conf['somesetting']
end end
def test_no_default def test_no_default
assert_kind_of Hash, load_conf('no_default.yml.example', 'test') assert_kind_of Hash, load_conf('no_default.yml', 'test')
assert_equal 'foo', @conf['somesetting'] assert_equal 'foo', @conf['somesetting']
end end
def test_overrides def test_overrides
assert_kind_of Hash, load_conf('overrides.yml.example', 'test') assert_kind_of Hash, load_conf('overrides.yml', 'test')
assert_equal 'bar', @conf['somesetting'] assert_equal 'bar', @conf['somesetting']
end end
def test_with def test_with
load_conf('default.yml.example', 'test') load_conf('default.yml', 'test')
assert_equal 'foo', @conf['somesetting'] assert_equal 'foo', @conf['somesetting']
@conf.with 'somesetting' => 'bar' do @conf.with 'somesetting' => 'bar' do
assert_equal 'bar', @conf['somesetting'] assert_equal 'bar', @conf['somesetting']
@@ -56,7 +56,7 @@ class Redmine::ConfigurationTest < ActiveSupport::TestCase
def load_conf(file, env) def load_conf(file, env)
@conf.load( @conf.load(
:file => File.join(Rails.root, 'test', 'fixtures', 'configuration', file), :file => file_fixture(File.join('configuration', file)),
:env => env :env => env
) )
end end