@@ -31,7 +31,13 @@ def assert_load(result)
3131 assert_equal ( { test : result } , into )
3232 end
3333
34+ def assert_load_nothing
35+ assert !new_parser . load
36+ assert_nil @result
37+ end
38+
3439 def setup_options ( env , dir , suffix = nil )
40+ env . update ( { 'HOME' => @tmpdir } )
3541 optdir = File . join ( @tmpdir , dir )
3642 FileUtils . mkdir_p ( optdir )
3743 file = File . join ( optdir , [ @basename , suffix ] . join ( "" ) )
@@ -50,23 +56,23 @@ def setup_options(env, dir, suffix = nil)
5056 end
5157
5258 def setup_options_home ( &block )
53- setup_options ( { 'HOME' => @tmpdir } , ".options" , &block )
59+ setup_options ( { } , ".options" , &block )
5460 end
5561
5662 def setup_options_xdg_config_home ( &block )
5763 setup_options ( { 'XDG_CONFIG_HOME' => @tmpdir +"/xdg" } , "xdg" , ".options" , &block )
5864 end
5965
6066 def setup_options_home_config ( &block )
61- setup_options ( { 'HOME' => @tmpdir } , ".config" , ".options" , &block )
67+ setup_options ( { } , ".config" , ".options" , &block )
6268 end
6369
6470 def setup_options_xdg_config_dirs ( &block )
6571 setup_options ( { 'XDG_CONFIG_DIRS' => @tmpdir +"/xdgconf" } , "xdgconf" , ".options" , &block )
6672 end
6773
6874 def setup_options_home_config_settings ( &block )
69- setup_options ( { 'HOME' => @tmpdir } , "config/settings" , ".options" , &block )
75+ setup_options ( { } , "config/settings" , ".options" , &block )
7076 end
7177
7278 def test_load_home_options
@@ -135,7 +141,8 @@ def test_load_home_config_settings
135141 end
136142
137143 def test_load_nothing
138- assert !new_parser . load
139- assert_nil @result
144+ setup_options ( { } , "" ) do
145+ assert_load_nothing
146+ end
140147 end
141148end
0 commit comments