spring stubs created (spring stop needed); Fixes: #3874@1h

3 files changed, 6 insertions, 5 deletions

diff --git a/bin/rails b/bin/rails
index 7feb6a30e..f2b0313dd 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
 end
 APP_PATH = File.expand_path('../../config/application',  __FILE__)
 require_relative '../config/boot'
diff --git a/bin/rake b/bin/rake
index 8017a0271..d87d5f578 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
 end
 require_relative '../config/boot'
 require 'rake'
diff --git a/spec/helpers/table_builder_helper_spec.rb b/spec/helpers/table_builder_helper_spec.rb
index 32a6a3bfd..8f4d98c88 100644
--- a/spec/helpers/table_builder_helper_spec.rb
+++ b/spec/helpers/table_builder_helper_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'htmlbeautifier'
 
 module TableBuilderHelper