remove trailing white-spaces from test/unit/lib/redmine/configuration_test.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6774 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
f4b2e55195
commit
0ffe174d66
|
@ -5,12 +5,12 @@
|
||||||
# modify it under the terms of the GNU General Public License
|
# modify it under the terms of the GNU General Public License
|
||||||
# as published by the Free Software Foundation; either version 2
|
# as published by the Free Software Foundation; either version 2
|
||||||
# of the License, or (at your option) any later version.
|
# of the License, or (at your option) any later version.
|
||||||
#
|
#
|
||||||
# This program is distributed in the hope that it will be useful,
|
# This program is distributed in the hope that it will be useful,
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
@ -25,22 +25,22 @@ class Redmine::ConfigurationTest < ActiveSupport::TestCase
|
||||||
def test_empty
|
def test_empty
|
||||||
assert_kind_of Hash, load_conf('empty.yml', 'test')
|
assert_kind_of Hash, load_conf('empty.yml', 'test')
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_default
|
def test_default
|
||||||
assert_kind_of Hash, load_conf('default.yml', 'test')
|
assert_kind_of Hash, load_conf('default.yml', 'test')
|
||||||
assert_equal 'foo', @conf['somesetting']
|
assert_equal 'foo', @conf['somesetting']
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_no_default
|
def test_no_default
|
||||||
assert_kind_of Hash, load_conf('no_default.yml', 'test')
|
assert_kind_of Hash, load_conf('no_default.yml', 'test')
|
||||||
assert_equal 'foo', @conf['somesetting']
|
assert_equal 'foo', @conf['somesetting']
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_overrides
|
def test_overrides
|
||||||
assert_kind_of Hash, load_conf('overrides.yml', 'test')
|
assert_kind_of Hash, load_conf('overrides.yml', 'test')
|
||||||
assert_equal 'bar', @conf['somesetting']
|
assert_equal 'bar', @conf['somesetting']
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_with
|
def test_with
|
||||||
load_conf('default.yml', 'test')
|
load_conf('default.yml', 'test')
|
||||||
assert_equal 'foo', @conf['somesetting']
|
assert_equal 'foo', @conf['somesetting']
|
||||||
|
@ -49,9 +49,9 @@ class Redmine::ConfigurationTest < ActiveSupport::TestCase
|
||||||
end
|
end
|
||||||
assert_equal 'foo', @conf['somesetting']
|
assert_equal 'foo', @conf['somesetting']
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def load_conf(file, env)
|
def load_conf(file, env)
|
||||||
@conf.load(
|
@conf.load(
|
||||||
:file => File.join(Rails.root, 'test', 'fixtures', 'configuration', file),
|
:file => File.join(Rails.root, 'test', 'fixtures', 'configuration', file),
|
||||||
|
|
Loading…
Reference in New Issue