##// END OF EJS Templates
remove trailing white-spaces from test/unit/lib/redmine/configuration_test.rb....
Toshi MARUYAMA -
r6654:0ffe174d6675
parent child
Show More
@@ -5,12 +5,12
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -25,22 +25,22 class Redmine::ConfigurationTest < ActiveSupport::TestCase
25 def test_empty
25 def test_empty
26 assert_kind_of Hash, load_conf('empty.yml', 'test')
26 assert_kind_of Hash, load_conf('empty.yml', 'test')
27 end
27 end
28
28
29 def test_default
29 def test_default
30 assert_kind_of Hash, load_conf('default.yml', 'test')
30 assert_kind_of Hash, load_conf('default.yml', 'test')
31 assert_equal 'foo', @conf['somesetting']
31 assert_equal 'foo', @conf['somesetting']
32 end
32 end
33
33
34 def test_no_default
34 def test_no_default
35 assert_kind_of Hash, load_conf('no_default.yml', 'test')
35 assert_kind_of Hash, load_conf('no_default.yml', 'test')
36 assert_equal 'foo', @conf['somesetting']
36 assert_equal 'foo', @conf['somesetting']
37 end
37 end
38
38
39 def test_overrides
39 def test_overrides
40 assert_kind_of Hash, load_conf('overrides.yml', 'test')
40 assert_kind_of Hash, load_conf('overrides.yml', 'test')
41 assert_equal 'bar', @conf['somesetting']
41 assert_equal 'bar', @conf['somesetting']
42 end
42 end
43
43
44 def test_with
44 def test_with
45 load_conf('default.yml', 'test')
45 load_conf('default.yml', 'test')
46 assert_equal 'foo', @conf['somesetting']
46 assert_equal 'foo', @conf['somesetting']
@@ -49,9 +49,9 class Redmine::ConfigurationTest < ActiveSupport::TestCase
49 end
49 end
50 assert_equal 'foo', @conf['somesetting']
50 assert_equal 'foo', @conf['somesetting']
51 end
51 end
52
52
53 private
53 private
54
54
55 def load_conf(file, env)
55 def load_conf(file, env)
56 @conf.load(
56 @conf.load(
57 :file => File.join(Rails.root, 'test', 'fixtures', 'configuration', file),
57 :file => File.join(Rails.root, 'test', 'fixtures', 'configuration', file),
General Comments 0
You need to be logged in to leave comments. Login now