From 0dd2493e79ec53ce15773922b0865c147b2f9c12 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Sun, 5 May 2019 02:03:34 +0000
Subject: 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
---
 test/fixtures/configuration/default.yml            |  8 --------
 test/fixtures/configuration/default.yml.example    |  8 ++++++++
 test/fixtures/configuration/empty.yml              |  7 -------
 test/fixtures/configuration/empty.yml.example      |  7 +++++++
 test/fixtures/configuration/no_default.yml         |  8 --------
 test/fixtures/configuration/no_default.yml.example |  8 ++++++++
 test/fixtures/configuration/overrides.yml          |  9 ---------
 test/fixtures/configuration/overrides.yml.example  |  9 +++++++++
 test/unit/lib/redmine/configuration_test.rb        | 10 +++++-----
 9 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 test/fixtures/configuration/default.yml
 create mode 100644 test/fixtures/configuration/default.yml.example
 delete mode 100644 test/fixtures/configuration/empty.yml
 create mode 100644 test/fixtures/configuration/empty.yml.example
 delete mode 100644 test/fixtures/configuration/no_default.yml
 create mode 100644 test/fixtures/configuration/no_default.yml.example
 delete mode 100644 test/fixtures/configuration/overrides.yml
 create mode 100644 test/fixtures/configuration/overrides.yml.example

(limited to 'test')

diff --git a/test/fixtures/configuration/default.yml b/test/fixtures/configuration/default.yml
deleted file mode 100644
index 89a60f13a..000000000
--- 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
index 000000000..89a60f13a
--- /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
index f280431c4..000000000
--- 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
index 000000000..f280431c4
--- /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
index 161224a46..000000000
--- 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
index 000000000..161224a46
--- /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
index d9be392ba..000000000
--- 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
index 000000000..d9be392ba
--- /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 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']
-- 
cgit v1.2.3