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

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18130 e93f8b46-1217-0410-a6f0-8f06a7374b81

5 files changed, 5 insertions, 5 deletions

diff --git a/test/fixtures/configuration/default.yml b/test/fixtures/configuration/default.yml.example
index 89a60f13a..89a60f13a 100644
--- a/test/fixtures/configuration/default.yml
+++ b/test/fixtures/configuration/default.yml.example
diff --git a/test/fixtures/configuration/empty.yml b/test/fixtures/configuration/empty.yml.example
index f280431c4..f280431c4 100644
--- a/test/fixtures/configuration/empty.yml
+++ b/test/fixtures/configuration/empty.yml.example
diff --git a/test/fixtures/configuration/no_default.yml b/test/fixtures/configuration/no_default.yml.example
index 161224a46..161224a46 100644
--- a/test/fixtures/configuration/no_default.yml
+++ b/test/fixtures/configuration/no_default.yml.example
diff --git a/test/fixtures/configuration/overrides.yml b/test/fixtures/configuration/overrides.yml.example
index d9be392ba..d9be392ba 100644
--- a/test/fixtures/configuration/overrides.yml
+++ b/test/fixtures/configuration/overrides.yml.example
diff --git a/test/unit/lib/redmine/configuration_test.rb b/test/unit/lib/redmine/configuration_test.rb
index 896f4f1ce..ca879c0ca 100644
--- a/test/unit/lib/redmine/configuration_test.rb
+++ b/test/unit/lib/redmine/configuration_test.rb
@@ -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']