assert 0.5.0 → 0.6.0

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    assert (0.5.0)
-      ansi (~> 1.3)
-      assert-view
+    assert (0.6.0)
+      assert-view (~> 0.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
     ansi (1.3.0)
-    assert-view (0.2.0)
+    assert-view (0.3.0)
+      ansi (~> 1.3)
       undies (~> 1.1)
     rake (0.9.2)
     undies (1.1.0)

data/README.rdoc

@@ -5,9 +5,9 @@ Test::Unit style testing framework, just better than Test::Unit.
 == What Assert is
 
 * *Framework*: you define tests and the context they run in - Assert runs them.  Everything is pure ruby so use any 3rd party testing tools you like.  Create 3rd party tools that extend Assert behavior.
-* *First Class*: everything is a first class object and can be extended to your liking (and should be)
+* *First* *Class*: everything is a first class object and can be extended to your liking (and should be)
 * *MVC*: tests and how they are defined (M) and executed (C) are distinct from how you view the test results (V).
-* *Backwards compatible*: (assuming a few minor tweaks) with Test::Unit test suites
+* *Backwards* *compatible*: (assuming a few minor tweaks) with Test::Unit test suites
 
 == What Assert is not
 
@@ -125,8 +125,8 @@ These are all tools that use and extend Assert.  If you write your own, share it
 === assert-view
 Assert::View (https://github.com/teaminsight/assert-view) is a collection of views that can be used with Assert.  Specify what view you want to use in your ~/.assert/options.rb settings file, ie:
 
-    # default is Assert::View::Terminal.new(Assert.suite, $stdout)
-    Assert.options.view Assert::View::DifferentView.new(Assert.suite, $stdout)
+    # default is Assert::View::DefaultView on $stdout
+    Assert.options.view Assert::View::SuperCoolView.new($stdout)
 
 
 

data/assert.gemspec

@@ -18,6 +18,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency("bundler", ["~> 1.0"])
-  s.add_dependency("assert-view")
-  s.add_dependency("ansi", ["~> 1.3"])
+  s.add_dependency("assert-view", ["~> 0.3"])
 end

data/lib/assert/context.rb

@@ -26,21 +26,27 @@ module Assert
         Assert.suite.setup(&block)
       end
       alias_method :before_once, :setup_once
+      alias_method :startup, :setup_once
 
       def teardown_once(&block)
         Assert.suite.teardown(&block)
       end
       alias_method :after_once, :teardown_once
+      alias_method :shutdown, :teardown_once
 
       # Add a setup block to run before each test or run the list of teardown blocks in given scope
       def setup(scope_or_method_name = nil, &block)
         is_method = scope_or_method_name.kind_of?(String) || scope_or_method_name.kind_of?(Symbol)
         if block_given? || is_method
+          # arg is a block or method that needs to be stored as a setup
           self.setups << (block || scope_or_method_name)
         elsif !is_method
+          # arg is an instance of this class (the scope for a test),
+          # run the setups for this context in the scope
           scope = scope_or_method_name
-          # setup parent before child
+          # setup parent...
           self.superclass.setup(scope) if self.superclass.respond_to?(:setup)
+          # ... before child
           self.setups.each do |setup|
             setup.kind_of?(::Proc) ? scope.instance_eval(&setup) : scope.send(setup)
           end
@@ -52,13 +58,17 @@ module Assert
       def teardown(scope_or_method_name = nil, &block)
         is_method = scope_or_method_name.kind_of?(String) || scope_or_method_name.kind_of?(Symbol)
         if block_given? || is_method
+          # arg is a block or method that needs to be stored as a teardown
           self.teardowns << (block || scope_or_method_name)
         elsif !is_method
+          # arg is an instance of this class (the scope for a test),
+          # run the setups for this context in the scope
           scope = scope_or_method_name
-          # teardown child before parent
+          # teardown child...
           self.teardowns.each do |teardown|
             teardown.kind_of?(::Proc) ? scope.instance_eval(&teardown) : scope.send(teardown)
           end
+          # ... before parent
           self.superclass.teardown(scope) if self.superclass.respond_to?(:teardown)
         end
       end
@@ -77,6 +87,7 @@ module Assert
         end
       end
       alias_method :desc, :description
+      alias_method :describe, :description
 
       def subject(&block)
         if block_given?

data/lib/assert/setup/view.rb

@@ -1,29 +1,11 @@
-require 'assert/view/terminal'
-require 'assert/view/helpers/ansi'
+require 'assert/view/default_view'
 
 module Assert
 
-  # define an Assert::View:Terminal view that renders ansi output using the
-  # 'assert.ansi' template and setting up some styling defaults
-  class AnsiTerminal < View::Terminal
-
-    helper View::Helpers::AnsiStyles
-    options do
-      default_template        'assert.ansi'
-      default_styled          false
-      default_passed_styles   :green
-      default_failed_styles   :red, :bold
-      default_errored_styles  :yellow, :bold
-      default_skipped_styles  :cyan
-      default_ignored_styles  :magenta
-    end
-
-  end
-
-  # Setup the above view, rendering on $stdout, as the default view for assert
+  # Setup the default view, rendering on $stdout
   # (override in user or package helpers)
   options do
-    default_view AnsiTerminal.new($stdout)
+    default_view View::DefaultView.new($stdout)
   end
 
   # setup the global Assert.view method

data/lib/assert/suite.rb

@@ -84,6 +84,7 @@ module Assert
         self.setups.each{|setup| setup.call}
       end
     end
+    alias_method :startup, :setup
 
     def teardown(&block)
       if block_given?
@@ -92,6 +93,7 @@ module Assert
         self.teardowns.reverse.each{|teardown| teardown.call}
       end
     end
+    alias_method :shutdown, :teardown
 
     protected
 

data/lib/assert/test.rb

@@ -30,7 +30,14 @@ module Assert
       run_scope = @context_class.new(self)
       capture_output(StringIO.new(@output, "w+")) do
         begin
+          # run any assert style 'setup do' setups
           @context_class.setup(run_scope)
+          # run any classic test/unit style 'def setup' setups
+          if run_scope.respond_to?(:setup)
+            run_scope.setup
+          end
+
+          # run the actual test code
           if @code.kind_of?(::Proc)
             run_scope.instance_eval(&@code)
           elsif run_scope.respond_to?(@code.to_s)
@@ -42,6 +49,11 @@ module Assert
           @results << Result::Error.new(self.name, err)
         ensure
           begin
+            # run any classic test/unit style 'def teardown' teardowns
+            if run_scope.respond_to?(:teardown)
+              run_scope.teardown
+            end
+            # run any assert style 'teardown do' teardowns
             @context_class.teardown(run_scope)
           rescue Exception => teardown_err
             @results << Result::Error.new(self.name, teardown_err)

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/test/assert_test.rb

@@ -1,7 +1,7 @@
 require 'assert'
 
 require 'assert/options'
-require 'assert/view/terminal'
+require 'assert/view/default_view'
 require 'assert/runner'
 require 'assert/suite'
 
@@ -15,7 +15,7 @@ module Assert
     end
 
     should "default the view option" do
-      assert_kind_of Assert::View::Terminal, subject.default_view
+      assert_kind_of Assert::View::DefaultView, subject.default_view
     end
 
     should "default the suite option" do

data/test/context/class_methods_test.rb

@@ -13,9 +13,11 @@ class Assert::Context
     end
     subject{ @context_class }
 
-    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 have_instance_methods :setup_once, :before_once, :startup
+    should have_instance_methods :teardown_once, :after_once, :shutdown
+    should have_instance_methods :setup, :before, :setups
+    should have_instance_methods :teardown, :after, :teardowns
+    should have_instance_methods :description, :desc, :describe, :subject
     should have_instance_methods :test, :test_eventually, :test_skip
     should have_instance_methods :should, :should_eventually, :should_skip
   end
@@ -102,7 +104,6 @@ class Assert::Context
   end
 
 
-
   class MultipleSetupsTest < ClassMethodsTest
     desc "a context class with multiple setups"
     setup do

data/test/default_view_test.rb

@@ -7,36 +7,8 @@ module Assert
     desc "assert's default view"
     subject { Assert.options.default_view }
 
-    should "be the AnsiTerminal" do
-      assert_kind_of AnsiTerminal, subject
-    end
-
-  end
-
-  class OptionsTests < DefaultViewTests
-    desc "options"
-    subject do
-      Assert.options.default_view.options
-    end
-
-    should "be an Options::Base object" do
-      assert_kind_of Assert::Options::Base, subject
-    end
-
-    should "default the template" do
-      assert_equal 'assert.ansi', subject.default_template
-    end
-
-    should "default the styled option" do
-      assert_equal false, subject.default_styled
-    end
-
-    should "default its result styles" do
-      assert_equal :green, subject.default_passed_styles
-      assert_equal [:red, :bold], subject.default_failed_styles
-      assert_equal :magenta, subject.default_ignored_styles
-      assert_equal :cyan, subject.default_skipped_styles
-      assert_equal [:yellow, :bold], subject.default_errored_styles
+    should "be the DefaultView" do
+      assert_kind_of View::DefaultView, subject
     end
 
   end

data/test/options_test.rb

@@ -35,11 +35,6 @@ module Assert::Options
       assert_equal "changed", subject.a_value
     end
 
-    should "be provided for the terminal view" do
-      assert_respond_to :options, Assert::View::Terminal
-      assert_respond_to :options, Assert::View::Terminal.new("suite", "io")
-    end
-
   end
 
 end

data/test/suite_test.rb

@@ -19,6 +19,7 @@ class Assert::Suite
     should have_instance_method  :<<
     should have_instance_methods :contexts, :tests, :ordered_tests, :ordered_results
     should have_instance_methods :count, :test_count, :result_count
+    should have_instance_methods :setup, :startup, :teardown, :shutdown
 
     should have_accessors :start_time, :end_time
     should have_instance_method  :run_time, :runner_seed

data/test/test/running_test.rb

@@ -265,22 +265,44 @@ class Assert::Test
 
 
   class WithSetupTest < RunningTest
-    desc "a Test that runs and has assertions that depend on a setup block"
+    desc "a Test that runs and has assertions that depend on setups"
     setup do
+      assert_style_msg = @asm = "set by assert style setup"
+      testunit_style_msg = @tusm = "set by test/unit style setup"
       @context_class = Factory.context_class do
-        setup{ @needed = true }
+        # assert style setup
+        setup do
+          # get msgs into test scope
+          @assert_style_msg = assert_style_msg
+          @testunit_style_msg = testunit_style_msg
+
+          @setup_asm = @assert_style_msg
+        end
+        # classic test/unit style setup
+        def setup; @setup_tusm = @testunit_style_msg; end
       end
       @test = Factory.test("something", @context_class) do
-        assert(@needed)
+        assert @assert_style_msg
+        assert @testunit_style_msg
+
+        @__running_test__.pass_results.first.
+          instance_variable_set("@message", @setup_asm)
+
+        @__running_test__.pass_results.last.
+          instance_variable_set("@message", @setup_tusm)
       end
       @test.run
     end
 
-    should "have 1 total result" do
-      assert_equal 1, subject.result_count
+    should "have a passing result for each setup type" do
+      assert_equal 2, subject.result_count
+      assert_equal 2, subject.result_count(:pass)
     end
-    should "have 1 pass result" do
-      assert_equal 1, subject.result_count(:pass)
+    should "have run the assert style setup" do
+      assert_equal @asm, subject.pass_results.first.message
+    end
+    should "have run the test/unit style setup" do
+      assert_equal @tusm, subject.pass_results.last.message
     end
 
   end
@@ -288,29 +310,44 @@ class Assert::Test
 
 
   class WithTeardownTest < RunningTest
-    desc "a Test that runs and has assertions with a teardown block"
+    desc "a Test that runs and has assertions with teardowns"
     setup do
-      new_message = @new_message = "HOLLA"
+      assert_style_msg = @asm = "set by assert style teardown"
+      testunit_style_msg = @tusm = "set by test/unit style teardown"
       @context_class = Factory.context_class do
+        setup do
+          # get msgs into test scope
+          @assert_style_msg = assert_style_msg
+          @testunit_style_msg = testunit_style_msg
+        end
+        # assert style teardown
         teardown do
-          pass_result = @__running_test__.pass_results.first
-          pass_result.instance_variable_set("@message", new_message)
+          @__running_test__.pass_results.first.
+            instance_variable_set("@message", @assert_style_msg)
+        end
+        # classic test/unit style teardown
+        def teardown
+          @__running_test__.pass_results.last.
+            instance_variable_set("@message", @testunit_style_msg)
         end
       end
       @test = Factory.test("something amazing", @context_class) do
-        assert(true)
+        assert(true) # first pass result
+        assert(true) # last pass result
       end
       @test.run
     end
 
-    should "have 1 total result" do
-      assert_equal 1, subject.result_count
+    should "have a passing result for each teardown type" do
+      puts subject.results.inspect
+      assert_equal 2, subject.result_count
+      assert_equal 2, subject.result_count(:pass)
     end
-    should "have 1 pass result" do
-      assert_equal 1, subject.result_count(:pass)
+    should "have run the assert style teardown" do
+      assert_equal @asm, subject.pass_results.first.message
     end
-    should "have modifed the message" do
-      assert_equal @new_message, subject.pass_results.first.message
+    should "have run test/unit style teardown" do
+      assert_equal @tusm, subject.pass_results.last.message
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 Z
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -39,29 +39,15 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
         - 0
-        version: "0"
+        - 3
+        version: "0.3"
   version_requirements: *id002
   name: assert-view
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  version_requirements: *id003
-  name: ansi
 description: Test::Unit style testing framework, just better than Test::Unit.
 email: 
 - kelly@kelredd.com