[DRE-commits] [ruby-foreman] 11/15: also remove simplecov and messing with $:

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-foreman.

commit f42c84278ff7e7f1a2de8853605bba2ff5193d59
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Feb 4 13:28:17 2015 -0200

    also remove simplecov and messing with $:
---
 ...misc-changes-to-run-against-Debian-packa.patch} | 29 +++++++++++-----------
 debian/patches/series                              |  2 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/patches/0003-spec_helper-don-t-use-bundle-exec.patch b/debian/patches/0003-spec_helper-misc-changes-to-run-against-Debian-packa.patch
similarity index 64%
rename from debian/patches/0003-spec_helper-don-t-use-bundle-exec.patch
rename to debian/patches/0003-spec_helper-misc-changes-to-run-against-Debian-packa.patch
index 031ffd5..f11142a 100644
--- a/debian/patches/0003-spec_helper-don-t-use-bundle-exec.patch
+++ b/debian/patches/0003-spec_helper-misc-changes-to-run-against-Debian-packa.patch
@@ -1,34 +1,35 @@
 From: Antonio Terceiro <terceiro at softwarelivre.org>
 Date: Wed, 4 Feb 2015 11:31:10 -0200
-Subject: spec_helper: don't use bundle exec
+Subject: spec_helper: misc changes to run against Debian packages
 
-This patch is mostl probably Debian-specific
 ---
- spec/spec_helper.rb | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ spec/spec_helper.rb | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
 
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 2eaca35..9fd2115 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -1,6 +1,3 @@
+@@ -1,17 +1,11 @@
 -require "codeclimate-test-reporter"
 -CodeClimate::TestReporter.start
 -
- require "simplecov"
- SimpleCov.start do
-   add_filter "/spec/"
-@@ -12,6 +9,9 @@ require "fakefs/safe"
+-require "simplecov"
+-SimpleCov.start do
+-  add_filter "/spec/"
+-end
+-
+ require "rspec"
+ require "timecop"
+ require "fakefs/safe"
  require "fakefs/spec_helpers"
  
- $:.unshift File.expand_path("../../lib", __FILE__)
+-$:.unshift File.expand_path("../../lib", __FILE__)
 +unless ENV['ADTTMP']
 +  ENV['PATH'] = 'bin:' + ENV['PATH']
 +end
  
  def mock_export_error(message)
    expect { yield }.to raise_error(Foreman::Export::Exception, message)
-@@ -39,7 +39,7 @@ end
+@@ -39,7 +33,7 @@ end
  
  def forked_foreman(args)
    rd, wr = make_pipe
@@ -37,7 +38,7 @@ index 2eaca35..9fd2115 100644
    wr.close
    rd.read
  end
-@@ -64,7 +64,7 @@ def fork_and_capture(&blk)
+@@ -64,7 +58,7 @@ def fork_and_capture(&blk)
  end
  
  def fork_and_get_exitstatus(args)
diff --git a/debian/patches/series b/debian/patches/series
index b31c0b5..4d7c3d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 0001-Look-for-data-in-usr-share-foreman.patch
 0002-Port-tests-to-fakefs-0.4.patch
-0003-spec_helper-don-t-use-bundle-exec.patch
+0003-spec_helper-misc-changes-to-run-against-Debian-packa.patch
 0004-Add-missing-.env-file-required-for-tests.patch

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