[DRE-commits] [SCM] ruby-rspec-core.git branch, master, updated. upstream/2.5.1-17-g4ef689a

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit b9c464e301365f5dee97c2d6e5086b2e21267fc9
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon Feb 13 22:43:19 2012 +0100

    add remove-aruba-stuff-in-tests.patch and update patch series

diff --git a/debian/patches/remove-aruba-stuff-in-tests.patch b/debian/patches/remove-aruba-stuff-in-tests.patch
new file mode 100644
index 0000000..760a99c
--- /dev/null
+++ b/debian/patches/remove-aruba-stuff-in-tests.patch
@@ -0,0 +1,32 @@
+Description: remove use of aruba in spec_helper.rb
+ Aruba is not packaged for Debian (yet). In the mean time, as it is not
+ essential for the test suite, anything related to Aruba is commented out in
+ spec_helper.rb.
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2012-02-13
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -17,7 +17,7 @@
+ Spork.prefork do
+   require 'rspec/autorun'
+ #  require 'autotest/rspec2'
+-  require 'aruba/api'
++#  require 'aruba/api'
+   require 'fakefs/spec_helpers'
+ 
+   Dir['./spec/support/**/*.rb'].map {|f| require f}
+@@ -70,9 +70,9 @@
+     # structural
+     c.alias_it_should_behave_like_to 'it_has_behavior'
+     c.around {|example| sandboxed { example.run }}
+-    c.include Aruba::Api, :example_group => {
+-      :file_path => /spec\/command_line/
+-    }
++    #c.include Aruba::Api, :example_group => {
++    #  :file_path => /spec\/command_line/
++    #}
+ 
+     # runtime options
+     c.treat_symbols_as_metadata_keys_with_true_values = true
diff --git a/debian/patches/series b/debian/patches/series
index 486bb9e..57da790 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 disable-autotest-in-tests.patch
+remove-rubygems-stuff-in-tests.patch
+remove-aruba-stuff-in-tests.patch

-- 
ruby-rspec-core.git