From: Michael Stapelberg Date: Sun, 23 Oct 2011 20:51:43 +0000 (+0100) Subject: Fix tests: s/i3bar/bar {/ and hash prefix for color codes in GET_BAR_CONFIG X-Git-Tag: 4.1~55 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=29f9f8c0908d40e88d3b065533b1b5f232f5685e;p=i3%2Fi3 Fix tests: s/i3bar/bar {/ and hash prefix for color codes in GET_BAR_CONFIG --- diff --git a/testcases/t/171-config-migrate.t b/testcases/t/171-config-migrate.t index 7948db6c..940afc3c 100644 --- a/testcases/t/171-config-migrate.t +++ b/testcases/t/171-config-migrate.t @@ -331,13 +331,13 @@ ok(line_exists($output, qr|^bindsym Mod1\+3 move workspace work|), 'move to name ##################################################################### $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'); -ok(line_exists($output, qr|i3bar|), 'i3bar added'); +ok(line_exists($output, qr|bar {|), 'i3bar added'); $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 diff --git a/testcases/t/177-bar-config.t b/testcases/t/177-bar-config.t index 371f26f5..72067316 100644 --- a/testcases/t/177-bar-config.t +++ b/testcases/t/177-bar-config.t @@ -121,16 +121,16 @@ is($bar_config->{font}, 'Terminus', 'font ok'); is($bar_config->{socket_path}, '/tmp/foobar', 'socket_path ok'); is_deeply($bar_config->{colors}, { - background => 'ff0000', - statusline => '00ff00', - focused_workspace_text => 'ffffff', - focused_workspace_bg => '285577', - active_workspace_text => '888888', - active_workspace_bg => '222222', - inactive_workspace_text => '888888', - inactive_workspace_bg => '222222', - urgent_workspace_text => 'ffffff', - urgent_workspace_bg => '900000', + background => '#ff0000', + statusline => '#00ff00', + focused_workspace_text => '#ffffff', + focused_workspace_bg => '#285577', + active_workspace_text => '#888888', + active_workspace_bg => '#222222', + inactive_workspace_text => '#888888', + inactive_workspace_bg => '#222222', + urgent_workspace_text => '#ffffff', + urgent_workspace_bg => '#900000', }, 'colors ok'); exit_gracefully($pid);