Fix tests: s/i3bar/bar {/ and hash prefix for color codes in GET_BAR_CONFIG

This commit is contained in:
Michael Stapelberg 2011-10-23 21:51:43 +01:00
parent 3e7f941b83
commit 29f9f8c090
2 changed files with 13 additions and 13 deletions

View File

@ -331,13 +331,13 @@ ok(line_exists($output, qr|^bindsym Mod1\+3 move workspace work|), 'move to name
##################################################################### #####################################################################
$output = migrate_config(''); $output = migrate_config('');
ok(line_exists($output, qr|i3bar|), 'i3bar added'); ok(line_exists($output, qr|bar {|), 'i3bar added');
$output = migrate_config('workspace_bar enable'); $output = migrate_config('workspace_bar enable');
ok(line_exists($output, qr|i3bar|), 'i3bar added'); ok(line_exists($output, qr|bar {|), 'i3bar added');
$output = migrate_config('workspace_bar no'); $output = migrate_config('workspace_bar no');
ok(!line_exists($output, qr|i3bar|), 'no i3bar added'); ok(!line_exists($output, qr|bar {|), 'no i3bar added');
##################################################################### #####################################################################
# check whether the mode command gets quotes # check whether the mode command gets quotes

View File

@ -121,16 +121,16 @@ is($bar_config->{font}, 'Terminus', 'font ok');
is($bar_config->{socket_path}, '/tmp/foobar', 'socket_path ok'); is($bar_config->{socket_path}, '/tmp/foobar', 'socket_path ok');
is_deeply($bar_config->{colors}, is_deeply($bar_config->{colors},
{ {
background => 'ff0000', background => '#ff0000',
statusline => '00ff00', statusline => '#00ff00',
focused_workspace_text => 'ffffff', focused_workspace_text => '#ffffff',
focused_workspace_bg => '285577', focused_workspace_bg => '#285577',
active_workspace_text => '888888', active_workspace_text => '#888888',
active_workspace_bg => '222222', active_workspace_bg => '#222222',
inactive_workspace_text => '888888', inactive_workspace_text => '#888888',
inactive_workspace_bg => '222222', inactive_workspace_bg => '#222222',
urgent_workspace_text => 'ffffff', urgent_workspace_text => '#ffffff',
urgent_workspace_bg => '900000', urgent_workspace_bg => '#900000',
}, 'colors ok'); }, 'colors ok');
exit_gracefully($pid); exit_gracefully($pid);