Merge branch 'master' into next

[i3/i3] / testcases / t / 36-floating-ws-empty.t

diff --git a/testcases/t/36-floating-ws-empty.t b/testcases/t/36-floating-ws-empty.t
index 2ea1693623fc31848e986e30dbc7a99cccc68d4f..a6e0e405e867de092fa8a42035a3dcc45576fb89 100644 (file)
--- a/testcases/t/36-floating-ws-empty.t
+++ b/testcases/t/36-floating-ws-empty.t
@@ -9,7 +9,7 @@ BEGIN {
     use_ok('X11::XCB::Window');
 }
 
-my $i3 = i3("/tmp/nestedcons");
+my $i3 = i3(get_socket_path());
 
 my $tmp = fresh_workspace;
 
@@ -17,30 +17,12 @@ my $tmp = fresh_workspace;
 # 1: open a floating window, get it mapped
 #############################################################################
 
-sub workspace_exists {
-    my ($name) = @_;
-    ($name ~~ @{get_workspace_names()})
-}
-
 ok(workspace_exists($tmp), "workspace $tmp exists");
 
 my $x = X11::XCB::Connection->new;
 
 # Create a floating window which is smaller than the minimum enforced size of i3
-my $window = $x->root->create_child(
-    class => WINDOW_CLASS_INPUT_OUTPUT,
-    rect => [ 0, 0, 30, 30],
-    background_color => '#C0C0C0',
-    # replace the type with 'utility' as soon as the coercion works again in X11::XCB
-    window_type => $x->atom(name => '_NET_WM_WINDOW_TYPE_UTILITY'),
-);
-
-isa_ok($window, 'X11::XCB::Window');
-
-$window->map;
-
-sleep 0.25;
-
+my $window = open_floating_window($x);
 ok($window->mapped, 'Window is mapped');
 
 # switch to a different workspace, see if the window is still mapped?