Revert "Improve s:find_start_of_multiline_statement: only look for round parens"...

[etc/vim.git] / spec / spec_helper.rb

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 46ad026ed0b46a3f9b0633158fac31c8fb82e806..8636f410ed66382702c7564126d5f874522fc922 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,18 +1,19 @@
 require 'vimrunner'
 require 'vimrunner/rspec'
 
 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).
 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
 
   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... :(
     plugin_path = File.expand_path('../..', __FILE__)
 
     # add_plugin appends the path to the rtp... :(