From 55093588859efd7aa67cce58e65a2ab34d342676 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Tue, 19 Feb 2019 11:03:10 +0000 Subject: [PATCH] "rake db:fixtures:load" does not work (#30811). Patch by Takenori TAKAKI. git-svn-id: http://svn.redmine.org/redmine/trunk@17889 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../configuration/{default.yml => default.yml.example} | 0 .../configuration/{empty.yml => empty.yml.example} | 0 .../{no_default.yml => no_default.yml.example} | 0 .../{overrides.yml => overrides.yml.example} | 0 test/unit/lib/redmine/configuration_test.rb | 10 +++++----- 5 files changed, 5 insertions(+), 5 deletions(-) rename test/fixtures/configuration/{default.yml => default.yml.example} (100%) rename test/fixtures/configuration/{empty.yml => empty.yml.example} (100%) rename test/fixtures/configuration/{no_default.yml => no_default.yml.example} (100%) rename test/fixtures/configuration/{overrides.yml => overrides.yml.example} (100%) diff --git a/test/fixtures/configuration/default.yml b/test/fixtures/configuration/default.yml.example similarity index 100% rename from test/fixtures/configuration/default.yml rename to test/fixtures/configuration/default.yml.example diff --git a/test/fixtures/configuration/empty.yml b/test/fixtures/configuration/empty.yml.example similarity index 100% rename from test/fixtures/configuration/empty.yml rename to test/fixtures/configuration/empty.yml.example diff --git a/test/fixtures/configuration/no_default.yml b/test/fixtures/configuration/no_default.yml.example similarity index 100% rename from test/fixtures/configuration/no_default.yml rename to test/fixtures/configuration/no_default.yml.example diff --git a/test/fixtures/configuration/overrides.yml b/test/fixtures/configuration/overrides.yml.example similarity index 100% rename from test/fixtures/configuration/overrides.yml rename to 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']