[DRE-commits] [ruby-rspec] 16/19: Revert "rewrite test"

[Jérémy Bobbio]

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

lunar pushed a commit to branch pu/multideb
in repository ruby-rspec.

commit 8e07effdd354ae457c50df1ae993edf0d705aeec
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun Oct 20 15:06:59 2013 +0200

    Revert "rewrite test"
    
    This reverts commit 6bc7cec12136c1fd01720c9d4578d9f072095831.
---
 debian/control       |    2 +-
 debian/ruby-tests.rb |   39 +++++++++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index dc899c2..7b5a446 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: Lucas Nussbaum <lucas at lucas-nussbaum.net>, Cédric Boutillier <boutil at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.4.0~), rake, ruby-childprocess, ruby-fakefs, ruby-nokogiri, ruby-json, ruby-diff-lcs
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.4.0~), ruby-childprocess, ruby-fakefs, ruby-nokogiri, ruby-json, ruby-diff-lcs
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-rspec.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-rspec.git
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index dd0c091..082c5c0 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1,15 +1,26 @@
-require 'rake'
-
-build_root = Dir.pwd
-
-begin
-  %w{rspec-core rspec-expectations rspec-mocks}.each do |gem|
-    Dir.chdir(File.join(build_root, gem))
-    app = Rake.application
-    app.init
-    app.load_rakefile
-    app['spec'].invoke
-  end
-ensure
-  Dir.chdir(build_root)
+$: << '../rspec-core/spec'
+$: << '../rspec-core/lib'
+require "rspec/core"
+EXC_TESTS = [
+  # require 'syntax' gem
+  'spec/rspec/core/formatters/text_mate_formatter_spec.rb',
+  'spec/rspec/core/formatters/html_formatter_spec.rb'
+]
+Dir.chdir('rspec-core') do
+  RSpec::Core::Runner.run(Dir["spec/rspec/**/*_spec.rb"] - EXC_TESTS, $stderr, $stdout) || fail
+end
+
+$: << 'spec'
+$: << 'lib'
+
+Dir.chdir('rspec-expectations') do
+  RSpec::Core::Runner.run(Dir["spec/rspec/**/*_spec.rb"], $stderr, $stdout) || fail
+end
+
+#The specs need yaml to be loaded before spec_helper
+#https://github.com/rspec/rspec-mocks/issues/107
+require "yaml"
+
+Dir.chdir('rspec-mocks') do
+  RSpec::Core::Runner.run(Dir["spec/rspec/**/*_spec.rb"], $stderr, $stdout) || fail
 end

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