[DRE-commits] [ruby-rubyvis] 01/03: Use RSpec 3

[Balint Reczey]

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

rbalint pushed a commit to branch master
in repository ruby-rubyvis.

commit 4d0f7b823bf5106625f29424192e7897be5af60b
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Mon Aug 17 22:43:42 2015 +0200

    Use RSpec 3
    
    Closes: #795049
---
 debian/control                               |  2 +-
 debian/patches/series                        |  1 -
 debian/patches/use_system_rspec_differ.patch |  4 ++--
 debian/patches/work_with_old_rspec.patch     | 13 -------------
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index bc2f29f..13bc358 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Balint Reczey <balint at balintreczey.hu>
-Build-Depends: debhelper (>= 9~), gem2deb, ruby-rspec, rake, bundler, ruby-nokogiri
+Build-Depends: debhelper (>= 9~), gem2deb, ruby-rspec (>> 3), rake, bundler, ruby-nokogiri
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-rubyvis.git
 Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-rubyvis.git;a=summary
diff --git a/debian/patches/series b/debian/patches/series
index e6d6193..8755563 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-work_with_old_rspec.patch
 use_system_rspec_differ.patch
diff --git a/debian/patches/use_system_rspec_differ.patch b/debian/patches/use_system_rspec_differ.patch
index fa70119..275a60c 100644
--- a/debian/patches/use_system_rspec_differ.patch
+++ b/debian/patches/use_system_rspec_differ.patch
@@ -7,7 +7,7 @@ index e18251f..f2289f7 100644
  require 'rspec'
  require 'rspec/core/rake_task'
 -require './lib/rspec/expectations/differ'
-+require 'rspec/expectations/differ'
++# require './lib/rspec/expectations/differ'
  
  require 'bundler'
  Bundler::GemHelper.install_tasks
@@ -17,7 +17,7 @@ index 0fad551..5346b91 100644
 +++ b/spec/area_spec.rb
 @@ -1,4 +1,4 @@
 -require File.expand_path(File.dirname(__FILE__)+"/../lib/rspec/expectations/differ.rb")
-+require 'rspec/expectations/differ'
++# require File.expand_path(File.dirname(__FILE__)+"/../lib/rspec/expectations/differ.rb")
  require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
  describe Rubyvis::Area do
    include Rubyvis::GeneralSpec
diff --git a/debian/patches/work_with_old_rspec.patch b/debian/patches/work_with_old_rspec.patch
deleted file mode 100644
index efe6740..0000000
--- a/debian/patches/work_with_old_rspec.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index edd08fe..f2e6fca 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -95,7 +95,7 @@ end
- RSpec::Matchers.define :have_svg_attributes do |exp|
-   match do |obs|
-     exp.each {|k,v|
--      obs.attributes[k].should be_truthy
-+#      obs.attributes[k].should be_truthy
-       obs.attributes[k].value.should==v
-     }
-   end

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