[DRE-commits] [ruby-berkshelf-api-client] 03/08: Patch: Don't require rubygems, bundler and spork in tests

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository ruby-berkshelf-api-client.

commit 51b115a1d73115439141e8ac202baf8e6a864755
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Thu Mar 24 17:01:25 2016 +0300

    Patch: Don't require rubygems, bundler and spork in tests
---
 ...-Don-t-require-rubygems-bundler-and-spork.patch | 55 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 56 insertions(+)

diff --git a/debian/patches/0002-Don-t-require-rubygems-bundler-and-spork.patch b/debian/patches/0002-Don-t-require-rubygems-bundler-and-spork.patch
new file mode 100644
index 0000000..c2f4d52
--- /dev/null
+++ b/debian/patches/0002-Don-t-require-rubygems-bundler-and-spork.patch
@@ -0,0 +1,55 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Thu, 24 Mar 2016 16:40:20 +0300
+Subject: Don't require rubygems, bundler and spork
+
+---
+ spec/spec_helper.rb | 34 +++++++++++++---------------------
+ 1 file changed, 13 insertions(+), 21 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 8d71eec..7f85fe0 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,29 +1,21 @@
+-require 'rubygems'
+-require 'bundler'
+ require 'rspec'
+-require 'spork'
+ require 'berkshelf/api/rspec'
++require 'berkshelf/api-client'
+ 
+-Spork.prefork do
+-  Dir[File.join(File.expand_path("../../spec/support/**/*.rb", __FILE__))].each { |f| require f }
++Dir[File.join(File.expand_path("../../spec/support/**/*.rb", __FILE__))].each { |f| require f }
+ 
+-  RSpec.configure do |config|
+-    config.include Berkshelf::API::RSpec
++RSpec.configure do |config|
++  config.include Berkshelf::API::RSpec
+ 
+-    config.expect_with :rspec do |c|
+-      c.syntax = :expect
+-    end
+-
+-    config.mock_with :rspec
+-    config.treat_symbols_as_metadata_keys_with_true_values = true
+-    config.filter_run focus: true
+-    config.run_all_when_everything_filtered = true
+-
+-    config.before(:suite) { Berkshelf::API::RSpec::Server.start }
+-    config.before(:all) { Berkshelf::API::Logging.init(location: '/dev/null') }
++  config.expect_with :rspec do |c|
++    c.syntax = :expect
+   end
+-end
+ 
+-Spork.each_run do
+-  require 'berkshelf/api-client'
++  config.mock_with :rspec
++  config.treat_symbols_as_metadata_keys_with_true_values = true
++  config.filter_run focus: true
++  config.run_all_when_everything_filtered = true
++
++  config.before(:suite) { Berkshelf::API::RSpec::Server.start }
++  config.before(:all) { Berkshelf::API::Logging.init(location: '/dev/null') }
+ end
diff --git a/debian/patches/series b/debian/patches/series
index 7f19324..960a7f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Relax-dependencies-in-gemfile.patch
+0002-Don-t-require-rubygems-bundler-and-spork.patch

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