cutest 0.1.0 → 0.1.1

data/README.markdown

@@ -80,8 +80,10 @@ To run the tests:
 
 If you get an error, the report will look like this:
 
+    >> should preserve the original values from the setup
     => assert 24 == params[:a]
-    test/a_test.rb:14
+       test/a_test.rb +14
+
 
 Instead of a description of the error, you get to see the assertion
 that failed along with the file and line number. Adding a debugger and

data/Rakefile

@@ -3,7 +3,7 @@ require File.expand_path("../lib/cutest", __FILE__)
 $VERBOSE = true
 
 task :test do
-  Cutest.run(Dir["test/*"])
+  Cutest.run(Dir["test/*.rb"])
 end
 
 task :default => :test

data/cutest.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name              = "cutest"
-  s.version           = "0.1.0"
+  s.version           = "0.1.1"
   s.summary           = "Forking tests."
   s.description       = "Run tests in separate processes to avoid shared state."
   s.authors           = ["Damian Janowski", "Michel Martens"]
   s.email             = ["djanowski@dimaion.com", "michel@soveran.com"]
   s.homepage          = "http://github.com/djanowski/cutest"
-  s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/cutest.rb", "cutest.gemspec", "test/assert.rb", "test/assert_raise.rb", "test/prepare.rb", "test/scopes.rb", "test/setup.rb"]
+  s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/cutest.rb", "cutest.gemspec", "test/assert.rb", "test/assert_raise.rb", "test/prepare.rb", "test/run.rb", "test/scopes.rb", "test/setup.rb"]
   s.add_dependency "batch", "~> 0.0.3"
 end

data/lib/cutest.rb

@@ -1,7 +1,7 @@
 require "batch"
 
 class Cutest < Batch
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
   def report_error(_, error)
     $stderr.puts "#{error}\n"
@@ -16,10 +16,11 @@ class Cutest < Batch
 
         begin
           load(file, anonymous)
-        rescue => e
-          error = [e.message] + e.backtrace.take_while { |line| !line.start_with?(__FILE__) }
-          write.write error.join("\n")
-          write.write "\n"
+
+        rescue Exception => e
+          error = [e.message] +
+                  e.backtrace.take_while { |line| !line.index(__FILE__) }
+          write.puts error.join("\n")
           write.close
         end
       end
@@ -34,7 +35,11 @@ class Cutest < Batch
     end
   end
 
-  class AssertionFailed < StandardError; end
+  class AssertionFailed < StandardError
+    def backtrace
+      []
+    end
+  end
 
   class Scope
     def initialize(&scope)
@@ -124,17 +129,13 @@ private
     end
   end
 
-  # Stop the tests and raise an error where the message is the last line executed
-  # before flunking.
-  def flunk(caller = caller[1])
-    ex = Cutest::AssertionFailed.new(@_test)
-    ex.set_backtrace(caller)
-
-    file, line = ex.backtrace.shift.split(":")
+  # Stop the tests and raise an error where the message is the last line
+  # executed before flunking.
+  def flunk
+    file, line = caller[1].split(":")
     code = File.readlines(file)[line.to_i - 1]
+    msg = ">> #{@_test}\n=> #{code.strip}\n   #{file} +#{line}"
 
-    ex.message.replace(">> #{@_test}\n=> #{code.strip}\n   #{file} +#{line}")
-
-    raise ex
+    raise Cutest::AssertionFailed.new(msg)
   end
 end

data/test/run.rb

@@ -0,0 +1,60 @@
+require "stringio"
+
+def capture
+  stdout, $stdout = $stdout, StringIO.new
+  stderr, $stderr = $stderr, StringIO.new
+  yield
+  [$stdout.string, $stderr.string]
+ensure
+  $stdout = stdout
+  $stderr = stderr
+end
+
+test "output of successful run" do
+  expected = "  0% .\n100% \n"
+
+  stdout, stderr = capture do
+    Cutest.run(Dir["test/fixtures/success.rb"])
+  end
+
+  assert stdout == expected
+end
+
+test "output of failed run" do
+  alternatives = [
+    ["  0% E\n100% \n", "\nSome errors occured:\n\n>> failed assertion\n=> assert false\n   test/fixtures/failure.rb +2\n\n"],
+    ["  0% E\n100% \n", "\nSome errors occured:\n\n>> failed assertion\n=> assert false\n   ./test/fixtures/failure.rb +2\n\n"]
+  ]
+
+  stdout, stderr = capture do
+    Cutest.run(Dir["test/fixtures/failure.rb"])
+  end
+
+  assert alternatives.any? { |expected| [stdout, stderr] == expected }
+end
+
+test "output of failed run on a custom assertion" do
+  alternatives = [
+    ["  0% E\n100% \n", "\nSome errors occured:\n\n>> failed custom assertion\n=> assert_empty \"foo\"\n   test/fixtures/fail_custom_assertion.rb +6\n\n"],
+    ["  0% E\n100% \n", "\nSome errors occured:\n\n>> failed custom assertion\n=> assert_empty \"foo\"\n   ./test/fixtures/fail_custom_assertion.rb +6\n\n"]
+  ]
+
+  stdout, stderr = capture do
+    Cutest.run(Dir["test/fixtures/fail_custom_assertion.rb"])
+  end
+
+  assert alternatives.any? { |expected| [stdout, stderr] == expected }
+end
+
+test "output of failed run on an exception" do
+  alternatives = [
+    ["  0% E\n100% \n", "\nSome errors occured:\n\nOops\ntest/fixtures/exception.rb:2:in `foo'\ntest/fixtures/exception.rb:6:in `block in <top (required)>'\n\n"],
+    ["  0% E\n100% \n", "\nSome errors occured:\n\nOops\n./test/fixtures/exception.rb:2:in `foo'\n./test/fixtures/exception.rb:6\n\n"]
+  ]
+
+  stdout, stderr = capture do
+    Cutest.run(Dir["test/fixtures/exception.rb"])
+  end
+
+  assert alternatives.any? { |expected| [stdout, stderr] == expected }
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Damian Janowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -03:00
+date: 2010-09-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,7 @@ files:
 - test/assert.rb
 - test/assert_raise.rb
 - test/prepare.rb
+- test/run.rb
 - test/scopes.rb
 - test/setup.rb
 has_rdoc: true