summaryrefslogtreecommitdiffstats
path: root/test/unit/lib/redmine/configuration_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'test/unit/lib/redmine/configuration_test.rb')
-rw-r--r--test/unit/lib/redmine/configuration_test.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/unit/lib/redmine/configuration_test.rb b/test/unit/lib/redmine/configuration_test.rb
index b33de6e43..2647fb7b8 100644
--- a/test/unit/lib/redmine/configuration_test.rb
+++ b/test/unit/lib/redmine/configuration_test.rb
@@ -25,26 +25,26 @@ class Redmine::ConfigurationTest < ActiveSupport::TestCase
end
def test_empty
- assert_kind_of Hash, load_conf('empty.yml.example', 'test')
+ assert_kind_of Hash, load_conf('empty.yml', 'test')
end
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']
end
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']
end
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']
end
def test_with
- load_conf('default.yml.example', 'test')
+ load_conf('default.yml', 'test')
assert_equal 'foo', @conf['somesetting']
@conf.with 'somesetting' => 'bar' do
assert_equal 'bar', @conf['somesetting']
@@ -56,7 +56,7 @@ class Redmine::ConfigurationTest < ActiveSupport::TestCase
def load_conf(file, env)
@conf.load(
- :file => File.join(Rails.root, 'test', 'fixtures', 'configuration', file),
+ :file => file_fixture(File.join('configuration', file)),
:env => env
)
end