Merge branch 'master' into next

[i3/i3] / testcases / t / 156-fullscreen-focus.t

diff --git a/testcases/t/156-fullscreen-focus.t b/testcases/t/156-fullscreen-focus.t
index c7646e417e7c760c11fdf68c717ea41ced67ee65..08de5ed1c396c16e700460d7ab490b2db932f741 100644 (file)
--- a/testcases/t/156-fullscreen-focus.t
+++ b/testcases/t/156-fullscreen-focus.t
@@ -59,4 +59,30 @@ cmd "move workspace $tmp2";
 # verify that the third window has the focus
 is($x->input_focus, $third->id, 'third window focused');
 
+################################################################################
+# Ensure that moving a window to a workspace which has a fullscreen window does
+# not focus it (otherwise the user cannot get out of fullscreen mode anymore).
+################################################################################
+
+$tmp = fresh_workspace;
+
+my $fullscreen_window = open_window;
+cmd 'fullscreen';
+
+my $nodes = get_ws_content($tmp);
+is(scalar @$nodes, 1, 'precisely one window');
+is($nodes->[0]->{focused}, 1, 'fullscreen window focused');
+my $old_id = $nodes->[0]->{id};
+
+$tmp2 = fresh_workspace;
+my $move_window = open_window;
+cmd "move workspace $tmp";
+
+cmd "workspace $tmp";
+
+$nodes = get_ws_content($tmp);
+is(scalar @$nodes, 2, 'precisely two windows');
+is($nodes->[0]->{id}, $old_id, 'id unchanged');
+is($nodes->[0]->{focused}, 1, 'fullscreen window focused');
+
 done_testing;