X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/10228215c76da4004b5ac4b60cfdf94682ea6e22..922268fbd89a49991b5b5b73e969f8daa8a10263:/spec/spec_helper.rb?ds=sidebyside

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 148f705..8636f41 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,18 +1,19 @@
 require 'vimrunner'
 require 'vimrunner/rspec'
 
+# Explicitly enable usage of "should".
+RSpec.configure do |config|
+    config.expect_with(:rspec) { |c| c.syntax = :should }
+end
+
 Vimrunner::RSpec.configure do |config|
   # Use a single Vim instance for the test suite. Set to false to use an
   # instance per test (slower, but can be easier to manage).
-  # FIXME: reuse_server = true seems to hang after a certain number of test cases
-  #  - Travis CI hangs after 15 successful tests.
-  #  - Locally it may hang also, with Vim and Xorg using 100% CPU.
-  # Therefore default to false in both cases.
-  config.reuse_server = ENV['CI'] ? false : false
+  # This requires using gvim, otherwise it hangs after a few tests.
+  config.reuse_server = ENV['VIMRUNNER_REUSE_SERVER'] == '1' ? true : false
 
   config.start_vim do
-    vim = Vimrunner.start
-
+    vim = config.reuse_server ? Vimrunner.start_gvim : Vimrunner.start
     plugin_path = File.expand_path('../..', __FILE__)
 
     # add_plugin appends the path to the rtp... :(
@@ -38,7 +39,7 @@ Vimrunner::RSpec.configure do |config|
     def proposed_indent
       line = vim.echo("line('.')")
       col = vim.echo("col('.')")
-      indent_value = vim.echo("GetPythonPEPIndent(line('.'))").to_i
+      indent_value = vim.echo("GetPythonPEPIndent(#{line})").to_i
       vim.command("call cursor(#{line}, #{col})")
       return indent_value
     end