aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Borene <rainerborene@gmail.com>2014-10-22 23:30:24 -0200
committerThiago de Arruda <tpadilha84@gmail.com>2014-11-04 12:57:33 -0300
commit4873171fc648d1e5fb60ca8d0cab26476f6522e9 (patch)
tree450354e1cdc8ead7fbad769898e28d2d9c362c77
parentb67ad4f67f3012c2f0165fc0f2874614ab2b796a (diff)
downloadrneovim-4873171fc648d1e5fb60ca8d0cab26476f6522e9.tar.gz
rneovim-4873171fc648d1e5fb60ca8d0cab26476f6522e9.tar.bz2
rneovim-4873171fc648d1e5fb60ca8d0cab26476f6522e9.zip
legacy tests: migrate test_autoformat_join
-rw-r--r--src/nvim/testdir/test_autoformat_join.in23
-rw-r--r--src/nvim/testdir/test_autoformat_join.ok8
-rw-r--r--test/functional/legacy/autoformat_join_spec.lua41
3 files changed, 41 insertions, 31 deletions
diff --git a/src/nvim/testdir/test_autoformat_join.in b/src/nvim/testdir/test_autoformat_join.in
deleted file mode 100644
index f1e1c868d3..0000000000
--- a/src/nvim/testdir/test_autoformat_join.in
+++ /dev/null
@@ -1,23 +0,0 @@
-Tests for setting the '[,'] marks when joining lines.
-
-STARTTEST
-:so small.vim
-:/^\t\t/
-0gqj
-:let a=string(getpos("'[")).'/'.string(getpos("']"))
-:/^This line/;'}-join
-:let b=string(getpos("'[")).'/'.string(getpos("']"))
-:$put ='First test: Start/End '.string(a)
-:$put ='Second test: Start/End '.string(b)
-:/^\t\t/,$wq! test.out
-ENDTEST
-
-
- O sodales, ludite, vos qui
-attamen consulite per voster honur. Tua pulchra facies me fay planszer milies
-
-This line.
-Should be joined with the next line
-and with this line
-
-Results:
diff --git a/src/nvim/testdir/test_autoformat_join.ok b/src/nvim/testdir/test_autoformat_join.ok
deleted file mode 100644
index 3b1df79514..0000000000
--- a/src/nvim/testdir/test_autoformat_join.ok
+++ /dev/null
@@ -1,8 +0,0 @@
- O sodales, ludite, vos qui attamen consulite per voster honur.
-Tua pulchra facies me fay planszer milies
-
-This line. Should be joined with the next line and with this line
-
-Results:
-First test: Start/End '[0, 16, 1, 0]/[0, 17, 1, 0]'
-Second test: Start/End '[0, 19, 11, 0]/[0, 19, 67, 0]'
diff --git a/test/functional/legacy/autoformat_join_spec.lua b/test/functional/legacy/autoformat_join_spec.lua
new file mode 100644
index 0000000000..a99cabca24
--- /dev/null
+++ b/test/functional/legacy/autoformat_join_spec.lua
@@ -0,0 +1,41 @@
+-- vim: set foldmethod=marker foldmarker=[[,]] :
+-- Tests for setting the '[,'] marks when joining lines.
+
+local helpers = require('test.functional.helpers')
+local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local execute, expect = helpers.execute, helpers.expect
+
+describe('autoformat join', function()
+ setup(clear)
+
+ it('is working', function()
+ insert([[
+ O sodales, ludite, vos qui
+attamen consulite per voster honur. Tua pulchra facies me fay planszer milies
+
+This line.
+Should be joined with the next line
+and with this line
+
+Results:]])
+
+ feed('gg')
+ feed('0gqj<cr>')
+
+ execute([[let a=string(getpos("'[")).'/'.string(getpos("']"))]])
+ execute("g/^This line/;'}-join")
+ execute([[let b=string(getpos("'[")).'/'.string(getpos("']"))]])
+ execute("$put ='First test: Start/End '.string(a)")
+ execute("$put ='Second test: Start/End '.string(b)")
+
+ expect([[
+ O sodales, ludite, vos qui attamen consulite per voster honur.
+Tua pulchra facies me fay planszer milies
+
+This line. Should be joined with the next line and with this line
+
+Results:
+First test: Start/End '[0, 1, 1, 0]/[0, 2, 1, 0]'
+Second test: Start/End '[0, 4, 11, 0]/[0, 4, 67, 0]']])
+ end)
+end)