@@ -31,7 +31,13 @@ def assert_load(result)
31
31
assert_equal ( { test : result } , into )
32
32
end
33
33
34
+ def assert_load_nothing
35
+ assert !new_parser . load
36
+ assert_nil @result
37
+ end
38
+
34
39
def setup_options ( env , dir , suffix = nil )
40
+ env . update ( { 'HOME' => @tmpdir } )
35
41
optdir = File . join ( @tmpdir , dir )
36
42
FileUtils . mkdir_p ( optdir )
37
43
file = File . join ( optdir , [ @basename , suffix ] . join ( "" ) )
@@ -50,23 +56,23 @@ def setup_options(env, dir, suffix = nil)
50
56
end
51
57
52
58
def setup_options_home ( &block )
53
- setup_options ( { 'HOME' => @tmpdir } , ".options" , &block )
59
+ setup_options ( { } , ".options" , &block )
54
60
end
55
61
56
62
def setup_options_xdg_config_home ( &block )
57
63
setup_options ( { 'XDG_CONFIG_HOME' => @tmpdir +"/xdg" } , "xdg" , ".options" , &block )
58
64
end
59
65
60
66
def setup_options_home_config ( &block )
61
- setup_options ( { 'HOME' => @tmpdir } , ".config" , ".options" , &block )
67
+ setup_options ( { } , ".config" , ".options" , &block )
62
68
end
63
69
64
70
def setup_options_xdg_config_dirs ( &block )
65
71
setup_options ( { 'XDG_CONFIG_DIRS' => @tmpdir +"/xdgconf" } , "xdgconf" , ".options" , &block )
66
72
end
67
73
68
74
def setup_options_home_config_settings ( &block )
69
- setup_options ( { 'HOME' => @tmpdir } , "config/settings" , ".options" , &block )
75
+ setup_options ( { } , "config/settings" , ".options" , &block )
70
76
end
71
77
72
78
def test_load_home_options
@@ -135,7 +141,8 @@ def test_load_home_config_settings
135
141
end
136
142
137
143
def test_load_nothing
138
- assert !new_parser . load
139
- assert_nil @result
144
+ setup_options ( { } , "" ) do
145
+ assert_load_nothing
146
+ end
140
147
end
141
148
end
0 commit comments