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

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

diff --git a/test/fixtures/configuration/default.yml b/test/fixtures/configuration/default.yml
deleted file mode 100644 (file)
index 89a60f1..0000000
--- a/test/fixtures/configuration/default.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-default:
-  somesetting: foo
-  
-production:
-
-development:
-
-test:

diff --git a/test/fixtures/configuration/default.yml.example b/test/fixtures/configuration/default.yml.example
new file mode 100644 (file)
index 0000000..89a60f1
--- /dev/null
+++ b/test/fixtures/configuration/default.yml.example
@@ -0,0 +1,8 @@
+default:
+  somesetting: foo
+  
+production:
+
+development:
+
+test:

diff --git a/test/fixtures/configuration/empty.yml b/test/fixtures/configuration/empty.yml
deleted file mode 100644 (file)
index f280431..0000000
--- a/test/fixtures/configuration/empty.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-default:
-
-production:
-
-development:
-
-test:

diff --git a/test/fixtures/configuration/empty.yml.example b/test/fixtures/configuration/empty.yml.example
new file mode 100644 (file)
index 0000000..f280431
--- /dev/null
+++ b/test/fixtures/configuration/empty.yml.example
@@ -0,0 +1,7 @@
+default:
+
+production:
+
+development:
+
+test:

diff --git a/test/fixtures/configuration/no_default.yml b/test/fixtures/configuration/no_default.yml
deleted file mode 100644 (file)
index 161224a..0000000
--- a/test/fixtures/configuration/no_default.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-default:
-  
-production:
-
-development:
-
-test:
-  somesetting: foo

diff --git a/test/fixtures/configuration/no_default.yml.example b/test/fixtures/configuration/no_default.yml.example
new file mode 100644 (file)
index 0000000..161224a
--- /dev/null
+++ b/test/fixtures/configuration/no_default.yml.example
@@ -0,0 +1,8 @@
+default:
+  
+production:
+
+development:
+
+test:
+  somesetting: foo

diff --git a/test/fixtures/configuration/overrides.yml b/test/fixtures/configuration/overrides.yml
deleted file mode 100644 (file)
index d9be392..0000000
--- a/test/fixtures/configuration/overrides.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-default:
-  somesetting: foo
-  
-production:
-
-development:
-
-test:
-  somesetting: bar

diff --git a/test/fixtures/configuration/overrides.yml.example b/test/fixtures/configuration/overrides.yml.example
new file mode 100644 (file)
index 0000000..d9be392
--- /dev/null
+++ b/test/fixtures/configuration/overrides.yml.example
@@ -0,0 +1,9 @@
+default:
+  somesetting: foo
+  
+production:
+
+development:
+
+test:
+  somesetting: bar

diff --git a/test/unit/lib/redmine/configuration_test.rb b/test/unit/lib/redmine/configuration_test.rb
index 896f4f1ceab5e9a341f8a6160dcb174bdb1586aa..ca879c0cac8f017b349e24652d0f9979d8a8ae57 100644 (file)
--- 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']