From d496d8c4edd3ef5ba2c10ad2bbdd7350b09773b0 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sat, 10 Jul 2021 08:47:19 +0000 Subject: Rename test/fixtures/configuration/*.yml.example to test/fixtures/files/configuration/*.yml (#35466). git-svn-id: http://svn.redmine.org/redmine/trunk@21067 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/fixtures/configuration/default.yml.example | 8 -------- test/fixtures/configuration/empty.yml.example | 7 ------- test/fixtures/configuration/no_default.yml.example | 8 -------- test/fixtures/configuration/overrides.yml.example | 9 --------- test/fixtures/files/configuration/default.yml | 8 ++++++++ test/fixtures/files/configuration/empty.yml | 7 +++++++ test/fixtures/files/configuration/no_default.yml | 8 ++++++++ test/fixtures/files/configuration/overrides.yml | 9 +++++++++ test/unit/lib/redmine/configuration_test.rb | 12 ++++++------ 9 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 test/fixtures/configuration/default.yml.example delete mode 100644 test/fixtures/configuration/empty.yml.example delete mode 100644 test/fixtures/configuration/no_default.yml.example delete mode 100644 test/fixtures/configuration/overrides.yml.example create mode 100644 test/fixtures/files/configuration/default.yml create mode 100644 test/fixtures/files/configuration/empty.yml create mode 100644 test/fixtures/files/configuration/no_default.yml create mode 100644 test/fixtures/files/configuration/overrides.yml (limited to 'test') diff --git a/test/fixtures/configuration/default.yml.example b/test/fixtures/configuration/default.yml.example deleted file mode 100644 index 89a60f13a..000000000 --- a/test/fixtures/configuration/default.yml.example +++ /dev/null @@ -1,8 +0,0 @@ -default: - somesetting: foo - -production: - -development: - -test: diff --git a/test/fixtures/configuration/empty.yml.example b/test/fixtures/configuration/empty.yml.example deleted file mode 100644 index f280431c4..000000000 --- a/test/fixtures/configuration/empty.yml.example +++ /dev/null @@ -1,7 +0,0 @@ -default: - -production: - -development: - -test: diff --git a/test/fixtures/configuration/no_default.yml.example b/test/fixtures/configuration/no_default.yml.example deleted file mode 100644 index 161224a46..000000000 --- a/test/fixtures/configuration/no_default.yml.example +++ /dev/null @@ -1,8 +0,0 @@ -default: - -production: - -development: - -test: - somesetting: foo diff --git a/test/fixtures/configuration/overrides.yml.example b/test/fixtures/configuration/overrides.yml.example deleted file mode 100644 index d9be392ba..000000000 --- a/test/fixtures/configuration/overrides.yml.example +++ /dev/null @@ -1,9 +0,0 @@ -default: - somesetting: foo - -production: - -development: - -test: - somesetting: bar diff --git a/test/fixtures/files/configuration/default.yml b/test/fixtures/files/configuration/default.yml new file mode 100644 index 000000000..89a60f13a --- /dev/null +++ b/test/fixtures/files/configuration/default.yml @@ -0,0 +1,8 @@ +default: + somesetting: foo + +production: + +development: + +test: diff --git a/test/fixtures/files/configuration/empty.yml b/test/fixtures/files/configuration/empty.yml new file mode 100644 index 000000000..f280431c4 --- /dev/null +++ b/test/fixtures/files/configuration/empty.yml @@ -0,0 +1,7 @@ +default: + +production: + +development: + +test: diff --git a/test/fixtures/files/configuration/no_default.yml b/test/fixtures/files/configuration/no_default.yml new file mode 100644 index 000000000..161224a46 --- /dev/null +++ b/test/fixtures/files/configuration/no_default.yml @@ -0,0 +1,8 @@ +default: + +production: + +development: + +test: + somesetting: foo diff --git a/test/fixtures/files/configuration/overrides.yml b/test/fixtures/files/configuration/overrides.yml new file mode 100644 index 000000000..d9be392ba --- /dev/null +++ b/test/fixtures/files/configuration/overrides.yml @@ -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 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 -- cgit v1.2.3