koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
Conflicts:
	testcases/t/173-get-marks.t
This commit is contained in:
Michael Stapelberg
2011-12-17 14:22:57 +00:00
parent 5a345db18b 6694a201eb
commit ef224cdb98
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
testcases/t/111-goto.t
View File

@ -58,6 +58,24 @@ is($focus, $top->id, "Top window focused");
$focus = focus_after(qq|[con_mark="$random_mark" con_mark="$random_mark"] focus|);
is($focus, $mid->id, "goto worked");
#####################################################################
# Set the same mark multiple times and see if focus works correctly
#####################################################################
$focus = focus_after('focus left');
is($focus, $top->id, "Top window focused");
cmd "mark $random_mark";
$focus = focus_after(qq|[con_mark="$random_mark"] focus|);
is($focus, $top->id, "focus unchanged after goto");
$focus = focus_after('focus right');
is($focus, $mid->id, "mid window focused");
$focus = focus_after(qq|[con_mark="$random_mark"] focus|);
is($focus, $top->id, "goto worked");
#####################################################################
# Check whether the focus command will switch to a different
# workspace if necessary

12
testcases/t/173-get-marks.t
View File

@ -35,16 +35,4 @@ cmd 'kill';
is_deeply(get_marks(), [ ], 'mark gone');
##############################################################
# 4: check that duplicate marks are included twice in the get_marks reply
##############################################################
cmd 'open';
cmd 'mark bar';
cmd 'open';
cmd 'mark bar';
is_deeply(get_marks(), [ 'bar', 'bar' ], 'duplicate mark found twice');
done_testing;