Merge remote-tracking branch 'upstream/master' into usermarks

1 files changed, 48 insertions, 16 deletions

diff --git a/test/functional/legacy/edit_spec.lua b/test/functional/legacy/edit_spec.lua
index 7fc5f11a79..362d33a0fd 100644
--- a/test/functional/legacy/edit_spec.lua
+++ b/test/functional/legacy/edit_spec.lua
@@ -1,4 +1,5 @@
 local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
 local clear = helpers.clear
 local command = helpers.command
 local expect = helpers.expect
@@ -7,20 +8,51 @@ local sleep = helpers.sleep
 
 before_each(clear)
 
--- oldtest: Test_autoindent_remove_indent()
-it('autoindent removes indent when Insert mode is stopped', function()
-  command('set autoindent')
-  -- leaving insert mode in a new line with indent added by autoindent, should
-  -- remove the indent.
-  feed('i<Tab>foo<CR><Esc>')
-  -- Need to delay for sometime, otherwise the code in getchar.c will not be
-  -- exercised.
-  sleep(50)
-  -- when a line is wrapped and the cursor is at the start of the second line,
-  -- leaving insert mode, should move the cursor back to the first line.
-  feed('o' .. ('x'):rep(20) .. '<Esc>')
-  -- Need to delay for sometime, otherwise the code in getchar.c will not be
-  -- exercised.
-  sleep(50)
-  expect('\tfoo\n\n' .. ('x'):rep(20))
+describe('edit', function()
+  -- oldtest: Test_autoindent_remove_indent()
+  it('autoindent removes indent when Insert mode is stopped', function()
+    command('set autoindent')
+    -- leaving insert mode in a new line with indent added by autoindent, should
+    -- remove the indent.
+    feed('i<Tab>foo<CR><Esc>')
+    -- Need to delay for sometime, otherwise the code in getchar.c will not be
+    -- exercised.
+    sleep(50)
+    -- when a line is wrapped and the cursor is at the start of the second line,
+    -- leaving insert mode, should move the cursor back to the first line.
+    feed('o' .. ('x'):rep(20) .. '<Esc>')
+    -- Need to delay for sometime, otherwise the code in getchar.c will not be
+    -- exercised.
+    sleep(50)
+    expect('\tfoo\n\n' .. ('x'):rep(20))
+  end)
+
+  -- oldtest: Test_edit_insert_reg()
+  it('inserting a register using CTRL-R', function()
+    local screen = Screen.new(10, 6)
+    screen:set_default_attr_ids({
+      [0] = {bold = true, foreground = Screen.colors.Blue},  -- NonText
+      [1] = {foreground = Screen.colors.Blue},  -- SpecialKey
+      [2] = {bold = true},  -- ModeMsg
+    })
+    screen:attach()
+    feed('a<C-R>')
+    screen:expect([[
+      {1:^"}           |
+      {0:~           }|
+      {0:~           }|
+      {0:~           }|
+      {0:~           }|
+      {2:-- INSERT -} |
+    ]])
+    feed('=')
+    screen:expect([[
+      {1:"}           |
+      {0:~           }|
+      {0:~           }|
+      {0:~           }|
+      {0:~           }|
+      =^           |
+    ]])
+  end)
 end)