Fix toc-autofit test and travis build config

Because the toc-autofit test needs a reasonable terminal width (in our
case 80 will suffice) it sets the travis environment to use 80 columns,
as mentioned in https://github.com/travis-ci/travis-ci/issues/5407

diff --git a/.travis.yml b/.travis.yml
index a2bf9155d73b25b36c83900c44d71d933c1e73b9..fde06587e743fe7fbd8d21bb14be6d199f671805 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,5 +20,7 @@ before_script: |
   sudo pip install virtualenv
 
 script:
   sudo pip install virtualenv
 
 script:

+  - stty cols 80
+  - export COLUMNS=80

   - make test
   - make doc
   - make test
   - make doc

diff --git a/test/toc-autofit.vader b/test/toc-autofit.vader
index 005a13f369e4d655e940ca17ee1e69e61a372e26..166cc81618c0435bd849455a58bebddbae63517c 100644 (file)
--- a/test/toc-autofit.vader
+++ b/test/toc-autofit.vader
@@ -1,12 +1,5 @@
 " Tests toc window auto-fit to longest header, but without exceeding half screen.
 
 " Tests toc window auto-fit to longest header, but without exceeding half screen.
 

-Before:
-  source ../after/ftplugin/markdown.vim
-
-After:
-  setlocal foldexpr=0
-  setlocal foldmethod=manual
-

 Given markdown;
 # chap 1
 
 Given markdown;
 # chap 1
 


@@ -50,8 +43,10 @@ Execute (toc window autofit width):
   let line = '###### chap 12.1.1.1.1.1'
   AssertEqual getline('33'), line
   :Toc
   let line = '###### chap 12.1.1.1.1.1'
   AssertEqual getline('33'), line
   :Toc

+  let real_width = &winwidth
+  :lclose

   let expected_width = len(line) + 2*5 + 1 + 3 - 7
   let expected_width = len(line) + 2*5 + 1 + 3 - 7

-  AssertEqual &winwidth, expected_width
+  AssertEqual real_width, expected_width

 " 2 spaces * 5 additional header levels + 1 space for first header +
 " 3 spaces for line numbers - 7 chars ('###### ') that don't show up on the TOC
 
 " 2 spaces * 5 additional header levels + 1 space for first header +
 " 3 spaces for line numbers - 7 chars ('###### ') that don't show up on the TOC