coulda 0.5.0 → 0.5.1

data/HISTORY

@@ -70,3 +70,8 @@ Cleanup
 - Coulda::Features created from the Kernel::Feature method now create and return a subclass of Test::Unit::TestCase (or a subclass of the specified :testcase_class).
 - The block passed to Kernel::Feature changes self to be the Test::Unit::TestCase subclass.  That way, it's virtually identical to a "class Foo < Test::Unit::TestCase"
 - Removed dependency on Jeremy McAnally's "pending" gem in favor of an implementation targetted specifically to Coulda's needs (File names and line numbers of the Given/When/Then/And that is unimplemented)
+
+0.5.1
+-----
+- Adds support for call-by-name/symbol (i.e., "Given :some_method invokes the 'some_method' method")
+- Mocked pending within test Scenarios so that the test suite passes instead of incorrectly reporting pending tests

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/coulda.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coulda}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan David Light"]

data/lib/coulda/feature.rb

@@ -31,10 +31,14 @@ module Test
           def self.#{stmt}(text, &block)
             step = nil
             if block_given?
-              current_scenario.steps << step = block
+              step = block
             end
             caller[0] =~ (/(.*):(.*)(:in)?/)
-            current_scenario.statements << { :type => :#{stmt}, :text => text, :block => step, :file => $1, :line => $2}
+            stmt = { :type => :#{stmt}, :text => text, :block => step, :file => $1, :line => $2 }
+            if text.is_a? Symbol
+              stmt[:method] = text
+            end
+            current_scenario.statements << stmt
           end
         HERE
       end

data/lib/coulda/scenario.rb

@@ -2,26 +2,19 @@ module Coulda
   # A factory for Test::Unit::TestCase test methods
   class Scenario
     attr_reader :name, :test_class
-    attr_accessor :steps, :statements
+    attr_accessor :statements
 
     def initialize(name, my_feature, &block)
       raise Exception.new("Scenario must have a name") unless name 
       @name = name
       @statements = []
-      @steps = []
-      @pending = false
       @my_feature = my_feature
-      if block_given?
-        create_and_provision_test_method_using &block
-      else
-        @pending = true
-        define_test_method_using { pending }
-      end
+      create_and_provision_test_method_using &block
     end
 
     # Predicate indicating if the Scenario was provided with an example
     def pending?
-      @pending
+      statements.empty? || has_pending_statements?
     end
     
     private
@@ -30,7 +23,13 @@ module Coulda
       collect_scenario_statements_from &block
       define_test_method_using do
         self.class.current_scenario.statements.each do |stmt|
-          if stmt[:block]
+          if stmt[:method]
+            if stmt[:block]
+              raise Exception.new "Passing a block to a method called-by-name is currently unhandle"
+            else
+              self.__send__(stmt[:method])
+            end
+          elsif stmt[:block]
             self.instance_eval &(stmt[:block])
           else
             pending self.class.current_scenario, stmt
@@ -42,15 +41,21 @@ module Coulda
 
     def collect_scenario_statements_from(&block)
       @my_feature.current_scenario = self
-      @my_feature.instance_eval &block
+      if block_given?
+        @my_feature.instance_eval &block 
+      end
     end
 
     def define_test_method_using(&block)
       scenario = self
       @my_feature.send(:define_method, "test_#{@name.downcase.super_custom_underscore}") do
         self.class.current_scenario = scenario
-        self.instance_eval &block
+        self.instance_eval &block if block
       end
     end
+
+    def has_pending_statements?
+      statements.find { |s| s[:block].nil? && s[:method].nil? }
+    end
   end
 end

data/test/integration/using_coulda_test.rb

@@ -9,6 +9,8 @@ Feature "Using Coulda", :testcase_class => Test::Unit::TestCase do
   as_a "developer"
   i_want_to "have typical Coulda usage work"
 
+  def some_method; end
+
   def prove_methods_from_then_invokes_method_on_feature
     assert true
   end
@@ -42,4 +44,14 @@ Feature "Using Coulda", :testcase_class => Test::Unit::TestCase do
     Then "something else" do; end
     And "should pass" do; end
   end
+
+  Scenario "A scenario that invokes a method by name" do
+    Given "a method" do
+      mock(self).some_method
+    end
+
+    When :some_method
+
+    Then "'some_method' should have been called" do; end
+  end
 end

data/test/regression/pending_scenarios_test.rb

@@ -13,11 +13,11 @@ class PendingScenariosTest < Test::Unit::TestCase
         include RR::Adapters::TestUnit
 
         @scenario = Scenario "my scenario" do
-          Given "something"
-          When "the when"
-          Then "the then" do
+          Given "this scenario that will call #pending because it has a pending step" do
             mock(self).pending
           end
+          When "I have this pending step"
+          Then "the test should pass anyway because I mocked pending"
         end
         @@counter += 1
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: coulda
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Evan David Light