Merge pull request #110 from blueyed/v8.1.0129

tests: use Vim v8.1.0129 to work around Vim bug

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b9df78206c10e83d88432df42524e819b0aa6718..8d54439bda3bb4a6dcf7a415f12e3ad2b24c861d 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 common: &common
   working_directory: ~/repo
   docker:
-    - image: blueyed/vim-python-pep8-indent-vims-for-test:2@sha256:a7be5f4d07ed361ce3ca78cedd413d67d583f96ab0a59feb512af89052c50172
+    - image: blueyed/vim-python-pep8-indent-vims-for-test:3@sha256:e7e3c4f4b021954a40f2f1d88dc470f119dc65603c63724d1c58cbe437fdc2d4
 
 jobs:
   test:

diff --git a/Dockerfile b/Dockerfile
index 85d8e2169e94af4ec8bc4b80988f963fe3d208d1..14e39ea133a6da381f8f51a3d32184143ca3765d 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,10 @@ FROM testbed/vim:latest
 
 RUN apk --no-cache add gtk+2.0-dev libx11-dev libxt-dev mcookie xauth xvfb
 # NOTE: +profile needs huge features.
-RUN install_vim -tag master --with-features=huge \
+RUN install_vim -tag v8.1.0129 -name vim --with-features=huge \
   --disable-channel --disable-netbeans --disable-xim \
   --enable-gui=gtk2 --with-x -build
-RUN ln -s /vim-build/bin/vim-master /usr/bin/gvim
+RUN ln -s /vim-build/bin/vim /usr/bin/gvim
 RUN gvim --version
 
 # Install covimerage and vint.

diff --git a/Makefile b/Makefile
index 49d9adefd10add223b02b48ad89b785f351d8124..2566d411dc911a7a4aea9153cd0581122ccd4f7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ test:
 
 # Run tests in dockerized Vims.
 DOCKER_REPO:=blueyed/vim-python-pep8-indent-vims-for-test
-DOCKER_TAG:=2
+DOCKER_TAG:=3
 DOCKER_IMAGE:=$(DOCKER_REPO):$(DOCKER_TAG)
 
 docker_image:

diff --git a/spec/indent/cython_spec.rb b/spec/indent/cython_spec.rb
index 6a85790309d572fb502c322a008e066183abd0e5..933801df33d4b2dcd92f46544f33468cc117b438 100644 (file)
--- a/spec/indent/cython_spec.rb
+++ b/spec/indent/cython_spec.rb
@@ -4,9 +4,12 @@ describe "vim for cython" do
   before(:all) {
     vim.command "new"
     vim.command "set ft=cython"
-    # vim.command("set indentexpr?").should include "GetPythonPEPIndent("
+    vim.command("set indentexpr?").should include "GetPythonPEPIndent("
   }
   before(:each) {
+    # clear buffer
+    vim.normal 'gg"_dG'
+
     # Insert two blank lines.
     # The first line is a corner case in this plugin that would shadow the
     # correct behaviour of other tests. Thus we explicitly jump to the first