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 7948db6ca83d9a9df822b8c134814468d52ac38b..940afc3c427c5caf32324967503f5b5c79b85cc7 100644 (file)
--- 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 371f26f5694cd508239402a5ff410e367d312e15..72067316a1ee042388df084b6c6c9130c3bc75a6 100644 (file)
--- 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);