assert 0.2.1 → 0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assert (0.2.1)
+    assert (0.3.0)
       ansi (~> 1.3)
 
 GEM

data/lib/assert/context.rb

@@ -80,12 +80,12 @@ module Assert
         end
       end
 
-      def should(desc_or_macro, &block)
+      def test(desc_or_macro, &block)
         if desc_or_macro.kind_of?(Macro)
           instance_eval(&desc_or_macro)
         else
           raise ArgumentError, "please provide a test block" unless block_given?
-          method_name = "test: should #{desc_or_macro}"
+          method_name = "test: #{desc_or_macro}"
 
           # instead of using the typical 'method_defined?' pattern (which) checks
           # all parent contexts, we really just need to make sure the method_name
@@ -101,6 +101,18 @@ module Assert
         end
       end
 
+      def should(desc_or_macro, &block)
+        if !desc_or_macro.kind_of?(Macro)
+          desc_or_macro = "should #{desc_or_macro}"
+        end
+        test(desc_or_macro, &block)
+      end
+
+      def test_eventually(desc, &block)
+        test(desc) { skip }
+      end
+      alias_method :test_skip, :test_eventually
+
       def should_eventually(desc, &block)
         should(desc) { skip }
       end

data/lib/assert/test.rb

@@ -1,41 +1,51 @@
 require 'assert/result'
 require 'assert/result_set'
+require 'assert/options'
+
+require 'stringio'
 
 module Assert
   class Test
+    include Assert::Options
+    options do
+      default_capture_out true
+    end
 
     # a Test is some code/method to run in the scope of a Context.  After a
     # a test runs, it should have some assertions which are its results.
 
     attr_reader :name, :code, :context_class
-    attr_accessor :results
+    attr_accessor :results, :output
 
     def initialize(name, context_class, code = nil, &block)
       @context_class = context_class
       @name = name_from_context(name)
       @code = (code || block)
       @results = ResultSet.new
+      @output = ""
     end
 
     def run(view=nil)
       @results.view = view
       run_scope = @context_class.new(self)
-      begin
-        @context_class.setup(run_scope)
-        if @code.kind_of?(::Proc)
-          run_scope.instance_eval(&@code)
-        elsif run_scope.respond_to?(@code.to_s)
-          run_scope.send(@code.to_s)
-        end
-      rescue Result::TestSkipped => err
-        @results << Result::Skip.new(self.name, err)
-      rescue Exception => err
-        @results << Result::Error.new(self.name, err)
-      ensure
+      capture_out(StringIO.new(@output, "w+")) do
         begin
-          @context_class.teardown(run_scope)
-        rescue Exception => teardown_err
-          @results << Result::Error.new(self.name, teardown_err)
+          @context_class.setup(run_scope)
+          if @code.kind_of?(::Proc)
+            run_scope.instance_eval(&@code)
+          elsif run_scope.respond_to?(@code.to_s)
+            run_scope.send(@code.to_s)
+          end
+        rescue Result::TestSkipped => err
+          @results << Result::Skip.new(self.name, err)
+        rescue Exception => err
+          @results << Result::Error.new(self.name, err)
+        ensure
+          begin
+            @context_class.teardown(run_scope)
+          rescue Exception => teardown_err
+            @results << Result::Error.new(self.name, teardown_err)
+          end
         end
       end
       @results.view = nil
@@ -69,6 +79,17 @@ module Assert
 
     protected
 
+    def capture_out(io, &block)
+      if self.class.options.capture_out && io
+        orig_stdout = $stdout.clone
+        $stdout = io
+        block.call
+        $stdout = orig_stdout
+      else
+        block.call
+      end
+    end
+
     def name_from_context(name)
       [ @context_class.description,
         name.gsub(/^test:\s+should/, "should")

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/assert/view/terminal.rb

@@ -45,9 +45,15 @@ module Assert::View
     end
 
     def detailed_results
-      details = self.suite.ordered_results.reverse.collect do |result|
-        result_io_msg(result.to_s, result.to_sym) if show_result_details?(result)
-      end.compact
+      details = self.suite.ordered_tests.reverse.collect do |test|
+        test.results.collect do |result|
+          if show_result_details?(result)
+            [ result_io_msg(result.to_s, result.to_sym),
+              output_io_msg(test.output.to_s)
+            ].join("\n")
+          end
+        end
+      end.flatten.compact
       "\n\n" + details.join("\n\n") if !details.empty?
     end
 
@@ -93,6 +99,15 @@ module Assert::View
       io_msg(msg, :term_styles => term_styles)
     end
 
+    def output_io_msg(output)
+      if output && !output.empty?
+        [ "--- stdout ---",
+          io_msg(output),
+          "--------------"
+        ].collect{|i| i.strip}.join("\n")
+      end
+    end
+
     def io_msg(msg, opts={})
       val = super
       if !(style = term_style(*opts[:term_styles])).empty?

data/test/context/class_methods_test.rb

@@ -15,7 +15,9 @@ class Assert::Context
 
     should have_instance_methods :setup_once, :before_once, :setup, :before, :setups
     should have_instance_methods :teardown_once, :after_once, :teardown, :after, :teardowns
-    should have_instance_methods :description, :desc, :subject, :should, :should_eventually, :should_skip
+    should have_instance_methods :description, :desc, :subject
+    should have_instance_methods :test, :test_eventually, :test_skip
+    should have_instance_methods :should, :should_eventually, :should_skip
   end
 
 
@@ -236,6 +238,50 @@ class Assert::Context
 
 
 
+  class TestMethTest < ClassMethodsTest
+    desc "test method"
+    setup do
+      should_desc = "be true"
+      should_block = @should_block = ::Proc.new{ assert(true) }
+      @context_class = Factory.context_class do
+        test(should_desc, &should_block)
+      end
+      @method_name = "test: #{should_desc}"
+      @context = @context_class.new(Factory.test("something", @context_class))
+    end
+    subject{ @context }
+
+    should "define a test method named after the should desc" do
+      assert_respond_to @method_name, subject
+      assert_equal subject.instance_eval(&@should_block), subject.send(@method_name)
+    end
+
+  end
+
+  class TestEventuallyTest < ClassMethodsTest
+    desc "test_eventually method"
+    setup do
+      should_desc = @should_desc = "be true"
+      should_block = @should_block = ::Proc.new{ assert(true) }
+      @context_class = Factory.context_class do
+        test_eventually(should_desc, &should_block)
+      end
+      @method_name = "test: #{@should_desc}"
+      @context = @context_class.new(Factory.test("something", @context_class))
+    end
+    subject{ @context }
+
+    should "define a test method named after the should desc that raises a test skipped" do
+      assert_respond_to @method_name, subject
+      assert_raises(Assert::Result::TestSkipped) do
+        subject.send(@method_name)
+      end
+    end
+
+  end
+
+
+
   class ShouldTest < ClassMethodsTest
     desc "should method"
     setup do

data/test/test_test.rb

@@ -20,7 +20,7 @@ class Assert::Test
     subject{ @test }
 
     should have_readers :name, :code, :context_class
-    should have_accessor :results
+    should have_accessor :results, :output
     should have_instance_methods :run, :result_count
     should have_instance_methods *Assert::Result.types.keys.collect{|k| "#{k}_results".to_sym }
 
@@ -183,4 +183,59 @@ class Assert::Test
 
   end
 
+  class CaptureOutTest < BasicTest
+    desc "when capturing std out"
+    setup {
+      @test = Factory.test("stdout") {
+        puts "std out from the test"
+        assert true
+      }
+      @orig_capture = @test.class.options.capture_out
+      @test.class.options.capture_out(true)
+      @test.run
+    }
+    teardown {
+      @test.class.options.capture_out(@orig_capture)
+    }
+
+    should "capture any io from the test" do
+      assert_equal "std out from the test\n", @test.output
+    end
+
+  end
+
+
+
+  class FullOutputCaptureTest < BasicTest
+    desc "when collecting std out across setup, teardown, and meth calls"
+    setup do
+      @test = Factory.test("fullstdouttest") {
+        puts "std out from the test"
+        assert a_method_an_assert_calls.inspect
+      }
+      @test.context_class.setup { puts "std out from the setup" }
+      @test.context_class.teardown { puts "std out from the teardown" }
+      @test.context_class.send(:define_method, "a_method_an_assert_calls") do
+        puts "std out from a method an assert called"
+        true
+      end
+
+      @orig_capture = @test.class.options.capture_out
+      @test.class.options.capture_out(true)
+      @test.run
+    end
+    teardown {
+      @test.class.options.capture_out(@orig_capture)
+    }
+
+    should "collect it on itself in the output accessor" do
+      assert_equal([
+        "std out from the setup",
+        "std out from the test",
+        "std out from a method an assert called",
+        "std out from the teardown\n"
+      ].join("\n"), @test.output)
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,12 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 Z
+date: 2011-08-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  type: :development
   prerelease: false
+  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +31,11 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  name: bundler
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ansi
-  type: :runtime
   prerelease: false
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,6 +46,7 @@ dependencies:
         - 1
         - 3
         version: "1.3"
+  name: ansi
   version_requirements: *id002
 description: Test::Unit style testing framework, just better than Test::Unit.
 email: