diff options
Diffstat (limited to 'test/unit/lib/redmine/configuration_test.rb')
| -rw-r--r-- | test/unit/lib/redmine/configuration_test.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/unit/lib/redmine/configuration_test.rb b/test/unit/lib/redmine/configuration_test.rb index d172c95f5..83d6168da 100644 --- a/test/unit/lib/redmine/configuration_test.rb +++ b/test/unit/lib/redmine/configuration_test.rb @@ -5,12 +5,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -25,22 +25,22 @@ class Redmine::ConfigurationTest < ActiveSupport::TestCase def test_empty assert_kind_of Hash, load_conf('empty.yml', 'test') end - + def test_default 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', 'test') assert_equal 'foo', @conf['somesetting'] end - + def test_overrides assert_kind_of Hash, load_conf('overrides.yml', 'test') assert_equal 'bar', @conf['somesetting'] end - + def test_with load_conf('default.yml', 'test') assert_equal 'foo', @conf['somesetting'] @@ -49,9 +49,9 @@ class Redmine::ConfigurationTest < ActiveSupport::TestCase end assert_equal 'foo', @conf['somesetting'] end - + private - + def load_conf(file, env) @conf.load( :file => File.join(Rails.root, 'test', 'fixtures', 'configuration', file), |