Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg
2012-05-09 20:39:26 +02:00
3 changed files with 57 additions and 22 deletions

View File

@ -134,6 +134,15 @@ cmd 'workspace number 4';
is(focused_ws(), '4: foo', 'now on workspace 4: foo');
ok(!workspace_exists('4'), 'workspace 4 still does not exist');
################################################################################
# Check that we "workspace number 5" will create workspace 5 if it does not yet
# exist.
################################################################################
ok(!workspace_exists('5'), 'workspace 5 does not exist');
cmd 'workspace number 5';
ok(workspace_exists('5'), 'workspace 5 was created');
################################################################################
# Verify that renaming workspaces works.
################################################################################

View File

@ -59,6 +59,20 @@ ok(get_ws($third_ws)->{focused}, 'third workspace focused');
cmd qq|workspace "$third_ws"|;
ok(get_ws($second_ws)->{focused}, 'second workspace focused');
################################################################################
# Now see if "workspace number <number>" also works as expected with
# workspace_auto_back_and_forth enabled.
################################################################################
cmd 'workspace number 5';
ok(get_ws('5')->{focused}, 'workspace 5 focused');
cmd 'workspace number 6';
ok(get_ws('6')->{focused}, 'workspace 6 focused');
cmd 'workspace number 6';
ok(get_ws('5')->{focused}, 'workspace 5 focused again');
exit_gracefully($pid);
done_testing;