[DRE-commits] [ruby-ridley] 03/04: Don't use rubygems, bundler and spork in tests, use rspec-its

[Hleb Valoshka]

This is an automated email from the git hooks/post-receive script.

tsfgnu-guest pushed a commit to branch patch-queue/master
in repository ruby-ridley.

commit 87d1ce2fb2899e7ca91d9a10977ebe8d6a4d6866
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Mon Aug 3 13:47:03 2015 +0300

    Don't use rubygems, bundler and spork in tests, use rspec-its
---
 spec/spec_helper.rb | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f5a2ba1..c692a7a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,12 +1,11 @@
-require 'rubygems'
-require 'bundler'
 require 'buff/ruby_engine'
+require 'rspec'
+require 'rspec/its'
+require 'json_spec'
+require 'webmock/rspec'
 
-def setup_rspec
-  require 'rspec'
-  require 'json_spec'
-  require 'webmock/rspec'
 
+def setup_rspec
   Dir[File.join(File.expand_path("../../spec/support/**/*.rb", __FILE__))].each { |f| require f }
 
   RSpec.configure do |config|
@@ -35,17 +34,5 @@ def setup_rspec
   end
 end
 
-if Buff::RubyEngine.mri? && ENV['CI'] != 'true'
-  require 'spork'
-
-  Spork.prefork do
-    setup_rspec
-  end
-
-  Spork.each_run do
-    require 'ridley'
-  end
-else
-  require 'ridley'
-  setup_rspec
-end
+require 'ridley'
+setup_rspec

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-ridley.git