[DRE-commits] [ruby-rspec-instafail] 25/126: Resolved conflicts and fixed specs

[Hideki Yamane]

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

henrich pushed a commit to branch debian/sid
in repository ruby-rspec-instafail.

commit 5b60d42a440c145e8264d45d51994c01bddd7d12
Merge: bc37d23 28d8ed6
Author: Matt Willhite <matthew.willhite at gmail.com>
Date:   Mon Oct 25 21:31:31 2010 -0700

    Resolved conflicts and fixed specs

 Rakefile                  |  2 +-
 Readme.md                 | 11 +++++++---
 VERSION                   |  2 +-
 lib/rspec/instafail.rb    | 21 ++++++++++++++++---
 rspec-instafail.gemspec   |  4 ++--
 spec/instafail_spec.rb    | 51 ++++++++++++++++++++++++++++++++++++++++++-----
 spec/rspec_2/Gemfile      |  2 +-
 spec/rspec_2/Gemfile.lock | 18 +++++++++--------
 8 files changed, 87 insertions(+), 24 deletions(-)

diff --cc Rakefile
index c8b3d2e,c8b3d2e..27e51cc
--- a/Rakefile
+++ b/Rakefile
@@@ -1,6 -1,6 +1,6 @@@
  task :default => :spec
  require 'spec/rake/spectask'
--Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color --backtrace']}
++Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color --backtrace --debug']}
  
  begin
    require 'jeweler'
diff --cc spec/instafail_spec.rb
index 5e73d0d,5e73d0d..50ee95c
--- a/spec/instafail_spec.rb
+++ b/spec/instafail_spec.rb
@@@ -1,13 -1,13 +1,54 @@@
  describe 'RSpec::Instafail' do
    it "works correctly with RSpec 1.x" do
      output = `cd spec/rspec_1 && bundle exec spec a_test.rb --format RSpec::Instafail`
--    output.should include("1: x a\n -> expected: 2,\n     got: 1 (using ==)\n\.\.\*\.")
--    output.should =~ /Finished in \d\.\d+ seconds/
++    expected_output = <<EXP
++  1\\) x a
++     expected: 2,
++     got: 1 \\(using ==\\)
++     # \\.\\/a_test\\.rb:5:
++\\.\\.\\*\\.
++
++Pending:
++
++x d \\(TODO\\)
++\\.\\/a_test\\.rb:14
++
++1\\)
++'x a' FAILED
++expected: 2,
++     got: 1 \\(using ==\\)
++\\./a_test\\.rb:5:
++
++Finished in \\d\\.\\d+ seconds
++
++5 examples, 1 failure, 1 pending
++EXP
++
++    output.should =~ Regexp.new(expected_output, 'x')
++
    end
  
    it "works correctly with RSpec 2.x" do
      output = `cd spec/rspec_2 && bundle exec rspec a_test.rb --require ../../lib/rspec/instafail --format RSpec::Instafail --no-color`
--    output.should =~ /1: x a\n -> expected: 2,\n     got: 1 .*\.\.\*\./m
--    output.should =~ /Finished in \d\.\d+ seconds/
++    expected_output = <<EXP
++  1\\) x a
++     Failure\\/Error: 1\\.should == 2
++     expected: 2,
++     got: 1 \\(using ==\\)
++     # \\./a_test\\.rb:5
++\\.\\.\\*\\.
++
++Pending:
++  x d
++    # No reason given
++    # \\./a_test\\.rb:14
++
++Finished in \\d\\.\\d+ seconds
++5 examples, 1 failure, 1 pending
++EXP
++
++    output.should =~ Regexp.new(expected_output, 'x')
++    
    end
--end
++end
++

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