diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2019-09-01 11:25:00 +0200 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2019-09-01 15:55:10 +0200 |
| commit | e04b9e7c78bdcf40cce5b5533ce8d7695691dfd6 (patch) | |
| tree | 39dd100dccde24ce0b8af578e134b5d2b945faa9 /test/functional/ui/float_spec.lua | |
| parent | b51ba122c1edfb769e72c25c4f14f469f59f1b8e (diff) | |
| download | rneovim-e04b9e7c78bdcf40cce5b5533ce8d7695691dfd6.tar.gz rneovim-e04b9e7c78bdcf40cce5b5533ce8d7695691dfd6.tar.bz2 rneovim-e04b9e7c78bdcf40cce5b5533ce8d7695691dfd6.zip | |
test/ui: update tests for new msg_grid implementation
Diffstat (limited to 'test/functional/ui/float_spec.lua')
| -rw-r--r-- | test/functional/ui/float_spec.lua | 952 |
1 files changed, 601 insertions, 351 deletions
diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua index 8dfe36c799..958c56334a 100644 --- a/test/functional/ui/float_spec.lua +++ b/test/functional/ui/float_spec.lua @@ -67,7 +67,7 @@ describe('floating windows', function() local buf = meths.create_buf(false,false) local win = meths.open_win(buf, false, {relative='editor', width=20, height=2, row=2, col=5}) local expected_pos = { - [3]={{id=1001}, 'NW', 1, 2, 5, true}, + [4]={{id=1001}, 'NW', 1, 2, 5, true}, } if multigrid then @@ -79,7 +79,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -88,6 +88,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1: }| {2:~ }| ]], float_pos=expected_pos} @@ -105,8 +107,8 @@ describe('floating windows', function() meths.win_set_config(win, {relative='editor', row=0, col=10}) - expected_pos[3][4] = 0 - expected_pos[3][5] = 10 + expected_pos[4][4] = 0 + expected_pos[4][5] = 10 if multigrid then screen:expect{grid=[[ ## grid 1 @@ -116,7 +118,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -125,6 +127,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1: }| {2:~ }| ]], float_pos=expected_pos} @@ -150,7 +154,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -158,6 +162,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| + ## grid 3 + | ]]) else screen:expect([[ @@ -182,7 +188,7 @@ describe('floating windows', function() local buf = meths.create_buf(false,false) local win = meths.open_win(buf, false, {relative='editor', width=20, height=2, row=2, col=5}) local expected_pos = { - [3]={{id=1001}, 'NW', 1, 2, 5, true}, + [4]={{id=1001}, 'NW', 1, 2, 5, true}, } if multigrid then @@ -194,7 +200,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -203,6 +209,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1: }| {2:~ }| ]], float_pos=expected_pos} @@ -220,8 +228,8 @@ describe('floating windows', function() meths.win_set_config(win, {relative='editor', row=0, col=10}) - expected_pos[3][4] = 0 - expected_pos[3][5] = 10 + expected_pos[4][4] = 0 + expected_pos[4][5] = 10 if multigrid then screen:expect{grid=[[ ## grid 1 @@ -231,7 +239,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -240,6 +248,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {1: }| {2:~ }| ]], float_pos=expected_pos} @@ -265,7 +275,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -273,6 +283,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| + ## grid 3 + | ]]) else screen:expect([[ @@ -315,7 +327,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 {14: 1 }^x | {14: 2 }y | @@ -324,11 +336,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {18: 1 }{15:x }| {18: 2 }{15:y }| {18: 3 }{15: }| {16:~ }| - ]], float_pos={[3] = {{id = 1001}, "NW", 1, 4, 10, true}}} + ]], float_pos={[4] = {{id = 1001}, "NW", 1, 4, 10, true}}} else screen:expect([[ {14: 1 }^x | @@ -352,7 +366,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 {14: 1 }^x | {14: 2 }y | @@ -361,11 +375,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {18: 1 }{15: }| {16:~ }| {16:~ }| {16:~ }| - ]], float_pos={[3] = {{id = 1001}, "NW", 1, 4, 10, true}}} + ]], float_pos={[4] = {{id = 1001}, "NW", 1, 4, 10, true}}} else screen:expect([[ {14: 1 }^x | @@ -396,7 +412,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 {19: }{20: 1 }{21:^x }| {19: }{14: 2 }y | @@ -405,11 +421,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {15:x }| {15:y }| {15: }| {15: }| - ]], float_pos={[3] = {{id = 1001}, "NW", 1, 4, 10, true}}} + ]], float_pos={[4] = {{id = 1001}, "NW", 1, 4, 10, true}}} else screen:expect{grid=[[ {19: }{20: 1 }{21:^x }| @@ -434,7 +452,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 {19: }{17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{20: 1 }{21:^x }| {19: }{14: 2 }y | @@ -443,11 +461,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{15:x }| {19: }{15:y }| {19: }{15: }| {15: }| - ]], float_pos={[3] = {{id = 1001}, "NW", 1, 4, 10, true}}} + ]], float_pos={[4] = {{id = 1001}, "NW", 1, 4, 10, true}}} else screen:expect([[ @@ -473,7 +493,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 {19: }{20: 1 }{21:^x }| {19: }{14: 2 }y | @@ -482,11 +502,13 @@ describe('floating windows', function() {0:~ }| {0:~ }| ## grid 3 + | + ## grid 4 {15: }| {15: }| {15: }| {15: }| - ]], float_pos={[3] = {{id = 1001}, "NW", 1, 4, 10, true}}} + ]], float_pos={[4] = {{id = 1001}, "NW", 1, 4, 10, true}}} else screen:expect([[ {19: }{20: 1 }{21:^x }| @@ -514,7 +536,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 the background tex^t | {0:~ }| @@ -522,10 +544,12 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:x}| ]], float_pos={ - [4] = {{id = 1002}, "NW", 2, 0, 4, false} + [5] = {{id = 1002}, "NW", 2, 0, 4, false} }} else screen:expect([[ @@ -549,7 +573,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 the background tex^t | {0:~ }| @@ -557,10 +581,12 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:x}| ]], float_pos={ - [4] = {{id = 1002}, "NW", 2, 0, 15, false} + [5] = {{id = 1002}, "NW", 2, 0, 15, false} }} else screen:expect([[ @@ -584,7 +610,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 the background tex^t | {0:~ }| @@ -592,6 +618,8 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| + ## grid 3 + | ]]) else screen:expect([[ @@ -643,16 +671,18 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| @@ -681,24 +711,26 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| - ## grid 4 + ## grid 5 {1: }| {2:~ }| ]], float_pos={ - [4] = {{id = 1002}, "NW", 3, 0, 10, true} + [5] = {{id = 1002}, "NW", 4, 0, 10, true} }} else screen:expect([[ @@ -722,24 +754,26 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| - ## grid 4 + ## grid 5 {1: }| {2:~ }| ]], float_pos={ - [4] = {{id = 1002}, "NW", 3, 1, 1, true} + [5] = {{id = 1002}, "NW", 4, 1, 1, true} }} else screen:expect([[ @@ -763,24 +797,26 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| - ## grid 4 + ## grid 5 {1: }| {2:~ }| ]], float_pos={ - [4] = {{id = 1002}, "SW", 3, 0, 3, true} + [5] = {{id = 1002}, "SW", 4, 0, 3, true} }} else screen:expect([[ @@ -805,24 +841,26 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| - ## grid 4 + ## grid 5 {1: }| {2:~ }| ]], float_pos={ - [4] = {{id = 1002}, "NW", 2, 1, 10, true} + [5] = {{id = 1002}, "NW", 2, 1, 10, true} }} else screen:expect([[ @@ -846,24 +884,26 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| - ## grid 4 + ## grid 5 {1: }| {2:~ }| ]], float_pos={ - [4] = {{id = 1002}, "SE", 2, 3, 39, true} + [5] = {{id = 1002}, "SE", 2, 3, 39, true} }} else screen:expect([[ @@ -887,24 +927,26 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| {5:[No Name] [+] }| - [3:----------------------------------------]| - [3:----------------------------------------]| - [3:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| + [4:----------------------------------------]| {4:[No Name] [+] }| - | + [3:----------------------------------------]| ## grid 2 just some | example text | {0:~ }| ## grid 3 + | + ## grid 4 jus^t some | example text | {0:~ }| - ## grid 4 + ## grid 5 {1: }| {2:~ }| ]], float_pos={ - [4] = {{id = 1002}, "NE", 3, 0, 50, true} + [5] = {{id = 1002}, "NE", 4, 0, 50, true} }} else screen:expect([[ @@ -932,12 +974,14 @@ describe('floating windows', function() [2:------------------------------]| [2:------------------------------]| [2:------------------------------]| - | + [3:------------------------------]| ## grid 2 that is wider than the windo^w | {0:~ }| {0:~ }| {0:~ }| + ## grid 3 + | ]]) else screen:expect([[ @@ -959,16 +1003,18 @@ describe('floating windows', function() [2:------------------------------]| [2:------------------------------]| [2:------------------------------]| - | + [3:------------------------------]| ## grid 2 that is wider than the windo^w | {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:some floaty text }| ]], float_pos={ - [4] = {{id = 1002}, "NW", 1, 3, 1, true} + [5] = {{id = 1002}, "NW", 1, 3, 1, true} }} else screen:expect([[ @@ -1024,7 +1070,7 @@ describe('floating windows', function() meths.buf_set_lines(buf, 0, -1, true, {'such', 'very', 'float'}) local win = meths.open_win(buf, false, {relative='editor', width=15, height=4, row=2, col=10}) local expected_pos = { - [4]={{id=1002}, 'NW', 1, 2, 10, true}, + [5]={{id=1002}, 'NW', 1, 2, 10, true}, } if multigrid then screen:expect{grid=[[ @@ -1035,7 +1081,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| @@ -1043,7 +1089,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:such }| {1:very }| {1:float }| @@ -1069,13 +1117,15 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:such }| {1:very }| {1:float }| @@ -1098,12 +1148,14 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:such }| {1:very }| {1:float }| @@ -1124,11 +1176,13 @@ describe('floating windows', function() ## grid 1 [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 ^ | {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:such }| {1:very }| {1:float }| @@ -1147,11 +1201,13 @@ describe('floating windows', function() ## grid 1 [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 | {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:such }| {1:very }| {1:^float }| @@ -1175,7 +1231,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 | {0:~ }| @@ -1183,7 +1239,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:such }| {1:very }| {1:^float }| @@ -1212,7 +1270,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - | + [3:----------------------------------------]| ## grid 2 | {0:~ }| @@ -1220,7 +1278,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1247,7 +1307,7 @@ describe('floating windows', function() [2:--------------------------]| [2:--------------------------]| [2:--------------------------]| - | + [3:--------------------------]| ## grid 2 | {0:~ }| @@ -1255,7 +1315,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1282,7 +1344,7 @@ describe('floating windows', function() [2:-------------------------]| [2:-------------------------]| [2:-------------------------]| - | + [3:-------------------------]| ## grid 2 | {0:~ }| @@ -1290,7 +1352,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1317,7 +1381,7 @@ describe('floating windows', function() [2:------------------------]| [2:------------------------]| [2:------------------------]| - | + [3:------------------------]| ## grid 2 | {0:~ }| @@ -1325,7 +1389,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1352,7 +1418,7 @@ describe('floating windows', function() [2:----------------]| [2:----------------]| [2:----------------]| - | + [3:----------------]| ## grid 2 | {0:~ }| @@ -1360,7 +1426,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1387,7 +1455,7 @@ describe('floating windows', function() [2:---------------]| [2:---------------]| [2:---------------]| - | + [3:---------------]| ## grid 2 | {0:~ }| @@ -1395,7 +1463,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1422,7 +1492,7 @@ describe('floating windows', function() [2:--------------]| [2:--------------]| [2:--------------]| - | + [3:--------------]| ## grid 2 | {0:~ }| @@ -1430,7 +1500,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1457,7 +1529,7 @@ describe('floating windows', function() [2:------------]| [2:------------]| [2:------------]| - | + [3:------------]| ## grid 2 | {0:~ }| @@ -1465,7 +1537,9 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| - ## grid 4 + ## grid 3 + | + ## grid 5 {1:^such }| {1:very }| {1:float }| @@ -1488,10 +1562,12 @@ describe('floating windows', function() screen:expect{grid=[[ ## grid 1 [2:------------]| - | + [3:------------]| ## grid 2 | |