rspec-instafail 0.1.9 → 0.2.0

data/lib/rspec/instafail/rspec_1.rb

@@ -3,25 +3,7 @@ require 'spec/runner/formatter/progress_bar_formatter'
 module RSpec
   class Instafail < Spec::Runner::Formatter::ProgressBarFormatter
     def example_failed(example, counter, failure)
-      short_padding = '  '
-      padding = '     '
-
-      output.puts
-      output.puts red("#{short_padding}#{counter}) #{example_group.description} #{example.description}")
-      output.puts "#{padding}#{red(failure.exception)}"
-
-      [*format_backtrace(failure.exception.backtrace)].each do |backtrace_info|
-        output.puts insta_gray("#{padding}# #{backtrace_info.strip}")
-      end
-
-      output.flush
-    end
-
-    private
-
-    # there is a gray() that returns nil, so we use our own...
-    def insta_gray(text)
-      colour(text, "\e[90m")
+      dump_failure(counter, failure)
     end
   end
 end

data/lib/rspec/instafail/rspec_2.rb

@@ -3,26 +3,13 @@ require 'rspec/core/formatters/progress_formatter'
 module RSpec
   class Instafail < RSpec::Core::Formatters::ProgressFormatter
     def example_failed(example)
-      @counter ||= 0
-      @counter += 1
+      # do what BaseFormatter#example_failed would do
+      @failed_examples << example
 
-      result = example.metadata[:execution_result]
-
-      exception = result[:exception_encountered] || result[:exception] # rspec 2.0 || rspec 2.2
-      short_padding = '  '
-      padding = '     '
-      output.puts
-      output.puts "#{short_padding}#{@counter}) #{example.full_description}"
-      output.puts "#{padding}#{red("Failure/Error:")} #{red(read_failed_line(exception, example).strip)}"
-      output.puts "#{padding}#{red(exception)}"
-      if exception.respond_to?(:original_exception)
-        output.puts "#{padding}#{red(exception.original_exception)}"
-      end
-      format_backtrace(exception.backtrace, example).each do |backtrace_info|
-        color = defined?(cyan) ? :cyan : :grey # cyan was added in rspec 2.6
-        output.puts send(color, "#{padding}# #{backtrace_info}")
-      end
-      output.flush
+      # do what BaseTextFormatter#dump_failures would do
+      index = failed_examples.size - 1
+      dump_pending_example_fixed(example, index) || dump_failure(example, index)
+      dump_backtrace(example)
     end
   end
 end

data/lib/rspec/instafail/version.rb

@@ -1,2 +1,2 @@
 require 'rspec/instafail'
-RSpec::Instafail::VERSION = '0.1.9'
+RSpec::Instafail::VERSION = '0.2.0'

data/lib/rspec/instafail.rb

@@ -1,12 +1,14 @@
 module RSpec
-  # when installed as plugin in jruby, lib is not in load-path
+  # Rails 3: when installed as plugin, lib is not in load-path when running tests
   # https://github.com/grosser/rspec-instafail/pull/3
-  lib = File.dirname(File.dirname(__FILE__))
+  lib = File.expand_path(File.dirname(File.dirname(__FILE__)))
+  $LOAD_PATH << lib unless $LOAD_PATH.include?(lib)
+
+  require 'rspec/instafail/version'
+
   begin
-    require "#{lib}/rspec/instafail/rspec_2"
+    require "rspec/instafail/rspec_2"
   rescue LoadError # try rspec 1
-    require "#{lib}/rspec/instafail/rspec_1"
+    require "rspec/instafail/rspec_1"
   end
-
-  require 'rspec/instafail/version'
 end

data/spec/instafail_spec.rb

@@ -1,101 +1,45 @@
 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`
-    expected_output = <<EXP
-  1\\) x a
-     expected: 2,
-     got: 1 \\(using ==\\)
-     # (\\.\\/)?a_test\\.rb:5:(in `block \\(2 levels\\) in <top \\(required\\)>')?
-\\.\\.\\*\\.
+  context "RSpec 1.x" do
+    before :all do
+      @rspec_result = `cd spec/rspec_1 && bundle exec spec a_test.rb --format RSpec::Instafail`
+    end
 
-Pending:
+    before do
+      @output = @rspec_result.dup
+    end
 
-x d \\(TODO\\)
-(\\.\\/)?a_test\\.rb:14(\:in `block in <top \\(required\\)>')?
+    it "outputs failures at start of output" do
+      @output.should =~ /^\s*1\)\s*'x fails logically'/m
+    end
 
-1\\)
-'x a' FAILED
-expected: 2,
-     got: 1 \\(using ==\\)
-(\\./)?a_test\\.rb:5:(in `block \\(2 levels\\) in <top \\(required\\)>')?
-EXP
+    it 'outputs errors in middle of output' do
+      @output.should =~ /\.\.\*\s*2\)\s*RuntimeError in 'x raises a simple error'/m
+    end
 
-    output.should =~ Regexp.new(expected_output, 'x')
+    it 'outputs the the ending block' do
+      @output.should =~ /Finished in \d\.\d+ seconds\s*7 examples, 3 failures, 1 pending/
+    end
   end
 
   context 'Rspec 2.x' do
-    before(:all)do
+    before :all do
       @rspec_result = `cd spec/rspec_2 && bundle exec rspec a_test.rb --require ../../lib/rspec/instafail --format RSpec::Instafail --no-color`
     end
+
     before do
       @output = @rspec_result.dup
     end
 
-    it "outputs logical failures" do
-      expected = <<EXP
-  1\\) x fails logically
-     Failure\\/Error: 1\\.should == 2
-     expected: 2,
-     got: 1 \\(using ==\\)
-EXP
-      @output.should =~ Regexp.new(expected, 'x')
-
-      @output.should include('/a_test.rb:5')
-    end
-
-    it 'outputs a simple error' do
-      expected = <<EXP
-\\.\\.\\*
-  2\\) x raises a simple error
-     Failure\\/Error: raise 'shallow failure'
-     shallow failure
-EXP
-      @output.should =~ Regexp.new(expected, 'x')
-    end
-
-    it 'outputs an error which responds to original_exception' do
-      expected = <<EXP
-  3\\) x raises a hidden error
-     Failure\\/Error: raise error
-     There is an error in this error\\.
-     There is no error in this error\\.
-EXP
-      @output.should =~ Regexp.new(expected, 'x')
+    it "outputs failures at start of output" do
+      @output.should =~ /^\s+1\) x fails logically/m
     end
-    it 'outputs the remaining passing specs and the ending block' do
-      expected = <<EXP
-\\.
-
-Pending:
-  x pends
-    # No reason given
-    # \\./a_test\\.rb:14
 
-Finished in \\d\\.\\d+ seconds
-7 examples, 3 failures, 1 pending
-EXP
-      @output.should =~ Regexp.new(expected, 'x')
+    it 'outputs errors in middle of output' do
+      @output.should =~ /\.\.\*\s*2\) x raises a simple error/m
     end
 
-    it "works correctly with RSpec 2.x" do
-      pending 'the backtrace for the error is always absolute on my machine'
-      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
-7 examples, 3 failures, 1 pending
-EXP
-      @output.should =~ Regexp.new(expected_output, 'x')
+    it 'outputs the the ending block' do
+      @output.should =~ /Finished in \d\.\d+ seconds\s*7 examples, 3 failures, 1 pending/
     end
   end
 end

data/spec/rspec_1/a_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'rspec', 'instafail'))
 
 describe 'x' do
-  it 'a' do
+  it 'fails logically' do
     1.should == 2
   end
 
@@ -11,11 +11,25 @@ describe 'x' do
   it 'c' do
   end
 
-  it 'd' do
+  it 'pends' do
     pending
     raise
   end
 
+  it 'raises a simple error' do
+    raise 'shallow failure'
+  end
+
+  it 'raises a hidden error' do
+    error = ExceptionWrappingException.new('There is an error in this error.')
+    error.original_exception = RuntimeError.new('There is no error in this error.')
+    raise error
+  end
+
   it 'e' do
   end
-end
+end
+
+class ExceptionWrappingException < RuntimeError
+  attr_accessor :original_exception
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-instafail
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 -07:00
+date: 2011-11-21 00:00:00 -08:00
 default_executable: 
 dependencies: []