nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-06-10 17:57:25 +02:00
parent ecd238b65e f4a86d9eda
commit a15fe0e332
2 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parser-specs/commands.spec
View File

@ -130,7 +130,7 @@ state FULLSCREEN:
# split v|h|vertical|horizontal
state SPLIT:
direction = 'v', 'h', 'vertical', 'horizontal'
direction = 'horizontal', 'vertical', 'v', 'h'
-> call cmd_split($direction)
# floating enable|disable|toggle

26
testcases/t/122-split.t
View File

@ -5,18 +5,25 @@
#
use i3test;
my $tmp = fresh_workspace;
my $tmp;
my $ws;
my $ws = get_ws($tmp);
################################################################################
# Open two containers, split, open another container. Then verify
# the layout is like we expect it to be
################################################################################
sub verify_split_layout {
my (%args) = @_;
$tmp = fresh_workspace;
$ws = get_ws($tmp);
is($ws->{orientation}, 'horizontal', 'orientation horizontal by default');
cmd 'split v';
$ws = get_ws($tmp);
is($ws->{orientation}, 'vertical', 'split v changes workspace orientation');
######################################################################
# Open two containers, split, open another container. Then verify
# the layout is like we expect it to be
######################################################################
cmd 'open';
cmd 'open';
my $content = get_ws_content($tmp);
@ -29,8 +36,7 @@ is(@{$first->{nodes}}, 0, 'first container has no children');
is(@{$second->{nodes}}, 0, 'second container has no children (yet)');
my $old_name = $second->{name};
cmd 'split h';
cmd $args{split_command};
cmd 'open';
$content = get_ws_content($tmp);
@ -44,6 +50,10 @@ isnt($second->{name}, $old_name, 'second container was replaced');
is($second->{orientation}, 'horizontal', 'orientation is horizontal');
is(@{$second->{nodes}}, 2, 'second container has 2 children');
is($second->{nodes}->[0]->{name}, $old_name, 'found old second container');
}
verify_split_layout(split_command => 'split h');
verify_split_layout(split_command => 'split horizontal');
# TODO: extend this test-case (test next/prev)
# - wrapping (no horizontal switch possible, goes level-up)