X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/404201e874c3d0e5919c0e926cc11d0c86ce9816..d735178838c7122c7540aca05bcfb94005a3abe9:/spec/spec_helper.rb?ds=inline

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 46ad026..4cd2b56 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... :(
@@ -46,6 +47,18 @@ Vimrunner::RSpec.configure do |config|
       i = vim.echo("get(g:, 'python_pep8_indent_multiline_string', 0)").to_i
       return (i == -2 ? default : i), i < 0 ? (i == -1 ? prev : default) : i
     end
+    def hang_closing
+      i = vim.echo("get(g:, 'python_pep8_indent_hang_closing', 0)").to_i
+      return (i != 0)
+    end
+    def set_hang_closing(value)
+      if value.nil?
+        vim.command("unlet! g:python_pep8_indent_hang_closing")
+      else
+        i = value ? 1 : 0
+        vim.command("let g:python_pep8_indent_hang_closing=#{i}")
+      end
+    end
 
     vim
   end