test_unit-given 0.0.1 → 0.1.0

data/README.rdoc

@@ -81,27 +81,8 @@ If you don't want to extend our base class, you can mix in the features explicit
       }
     end
 
-You can also strictly enforce the use in your tests:
 
-    require 'test/unit/given/strict'
-
-    class CircleTest < Test::Unit::TestCase
-      include Test::Unit::Given::Strict
-      include Test::Unit::Given::TestThat
-
-      test_that {
-        @circle = Circle.new(10)
-        When {
-          # this causes an error, because there's no Given
-          @area = @circle.area
-        }
-        Then {
-          assert_equal 314,@area
-        }
-      }
-    end
-
-Finally, you can re-use blocks:
+Finally, you can re-use blocks, and use And to create richer expressions:
 
     class CircleTest < Test::Unit::Given::TestCase
 
@@ -120,14 +101,18 @@ Finally, you can re-use blocks:
       test_that {
         Given circle_with_radius(10)
         When get_radius
+        And {
+          @diameter = @circle.diameter
+        }
         Then area_should_be(314)
+        And {
+          assert_equal 20,@diameter
+        }
       }
     end
 
 === What about block-based assertions, like +assert_raises+
 
-You can use the non-strict version like so:
-
     class CircleTest < Test::Unit::Given::TestCase
 
       test_that "there is no diameter method" do
@@ -144,8 +129,6 @@ You can use the non-strict version like so:
       end
     end
 
-This won't work in strict mode for now.
-
 == WTF?  Why?
 
 Just because you're using Test::Unit doesn't mean you can't write fluent, easy to understand tests.

data/Rakefile

@@ -23,5 +23,6 @@ RDoc::Task.new do |rd|
   rd.title = 'Methadone - Power Up your Command Line Apps'
   rd.markup = "tomdoc"
 end
+CLOBBER << 'coverage'
 
 task :default => :test

data/lib/test/unit/given/simple.rb

@@ -67,6 +67,33 @@ module Test
           Given(existing_block,&block)
         end
 
+        # Public: Continue the previous Given/When/Then in a new block.  The reason
+        # you might do this is if you wanted to use the existing block form of a
+        # Given/When/Then, but also need to do something custom.  This allows you to 
+        # write your test more fluently.
+        #
+        # existing_block - a callable object (e.g. a Proc) that will be called immediately
+        #                  by this Then.  If nil, &block is expected to be passed
+        # block          - a block given to this call that will be executed immediately
+        #                  by this Then.  If existing_block is non-nil, this is ignored
+        #
+        # Examples
+        #     
+        #     then_block = Then {
+        #       assert_equal "bar",@foo
+        #     }
+        #     # => executes block and returns it
+        #     Then then_block
+        #     And {
+        #       assert_equal, "quux",@blah
+        #     }
+        #     # => executes the block again
+        #
+        # Returns the block that was executed
+        def And(existing_block=nil,&block)
+          Given(existing_block,&block)
+        end
+
         private
 
         def call_block_param_or_block_given(existing_block,&block)

data/lib/test/unit/given/version.rb

@@ -1,7 +1,7 @@
 module Test
   module Unit
     module Given
-      VERSION = "0.0.1"
+      VERSION = "0.1.0"
     end
   end
 end

data/test/test_simple_given.rb

@@ -7,12 +7,21 @@ class TestSimpleGiven < Test::Unit::Given::TestCase
     Given {
       @x = nil
     }
+    And {
+      @y = nil
+    }
     When {
       @x = 4
     }
+    And {
+      @y = 10
+    }
     Then {
       assert_equal 4,@x
     }
+    And {
+      assert_equal 10,@y
+    }
   end
 
   def test_cannot_use_locals

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test_unit-given
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000Z
+date: 2011-10-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70106635648040 !ruby/object:Gem::Requirement
+  requirement: &70295687955360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106635648040
+  version_requirements: *70295687955360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70106635647620 !ruby/object:Gem::Requirement
+  requirement: &70295687954940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106635647620
+  version_requirements: *70295687954940
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70106635647200 !ruby/object:Gem::Requirement
+  requirement: &70295687954520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106635647200
+  version_requirements: *70295687954520
 description: We don't need no stinkin' RSpec!  Get all the fluency you want in your
   Test::Unit tests, with no magic required, using straight Ruby syntax
 email:
@@ -60,13 +60,11 @@ files:
 - Rakefile
 - lib/test/unit/given.rb
 - lib/test/unit/given/simple.rb
-- lib/test/unit/given/strict.rb
 - lib/test/unit/given/test_case.rb
 - lib/test/unit/given/test_that.rb
 - lib/test/unit/given/version.rb
 - test/bootstrap.rb
 - test/test_simple_given.rb
-- test/test_strict_given.rb
 - test/test_test_that.rb
 - test_unit-given.gemspec
 homepage: ''
@@ -96,5 +94,4 @@ summary: Use Given/When/Then in your Test::Unit tests
 test_files:
 - test/bootstrap.rb
 - test/test_simple_given.rb
-- test/test_strict_given.rb
 - test/test_test_that.rb

data/lib/test/unit/given/strict.rb

@@ -1,34 +0,0 @@
-module Test
-  module Unit
-    module Given
-      # A strict Given/When/Then that will generate errors if you
-      # omit any one of these in your test.
-      module Strict
-        include Simple
-
-        def setup
-          @__next = :given
-        end
-
-        # Set up the conditions for the test, see Test::Unit::Given::Simple::Given
-        def Given(existing_block=nil,&block)
-          @__next = :when
-          call_block_param_or_block_given(existing_block,&block)
-          end
-        # Execute the code under test, failing if no Given was called first, see Test::Unit::Given::Simple::When
-        def When(existing_block=nil,&block)
-          raise "No Given block?" unless @__next == :when
-          @__next = :then
-          call_block_param_or_block_given(existing_block,&block)
-          end
-        # Verify the results of the test, failing if no When was called first, see Test::Unit::Given::Simple::Then
-        def Then(existing_block=nil,&block)
-          raise "No When block?" unless @__next == :then
-          @__next = :given
-          call_block_param_or_block_given(existing_block,&block)
-        end
-      end
-    end
-  end
-end
-

data/test/test_strict_given.rb

@@ -1,54 +0,0 @@
-require 'test/unit'
-require 'test/unit/given/strict'
-
-class TestStrictGiven < Test::Unit::TestCase
-  include Test::Unit::Given::Strict
-
-  def test_wrong_order_then_first
-    assert_raises RuntimeError do
-      Then {
-        @x = 4
-      }
-    end
-  end
-
-  def test_basics
-    Given {
-      @x = nil
-    }
-    When {
-      @x = 4
-    }
-    Then {
-      assert_equal 4,@x
-    }
-  end
-
-  def test_wrong_order
-    assert_raises RuntimeError do
-      When {
-        @x = 4
-      }
-    end
-  end
-
-  def test_can_reuse_blocks
-    invocations = 0
-    x_is_nil = Given {
-      @x = nil
-      invocations += 1
-    }
-    x_is_assigned_to_four = When {
-      @x = 4
-      invocations += 1
-    }
-    x_should_be_four = Then {
-      assert_equal 4,@x
-      invocations += 1
-    }
-    Given x_is_nil
-    When x_is_assigned_to_four
-    Then x_should_be_four
-    assert_equal 6,invocations
-  end
-end