coulda 0.4.7 → 0.5.0

data/HISTORY

@@ -64,3 +64,9 @@ Cleanup
 0.4.7
 -----
 - Aded a newline after a Feature has been printed via the coulda:print_features task
+
+0.5.0
+-----
+- 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)

data/README.rdoc

@@ -55,4 +55,4 @@ Thanks to
 ---------
 * David Chelimsky and Jim Weirich for turning me into the test-obsessed developer that I am.
 * Timothy King for putting up with my scotch-powered rambling while working on v0.4.0
-* We Are Titans (http://www.wearetitans.net/) for sponsoring v0.4.0
+* We Are Titans (http://www.wearetitans.net/) for sponsoring v0.4.0 on up

data/Rakefile

@@ -24,7 +24,6 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "coulda"
-    s.version = "0.1.1"
     s.authors = ["Evan David Light"]
     s.email = "evan@tiggerpalace.com"
     s.summary = "Behaviour Driven Development derived from Cucumber but as an internal DSL with methods for reuse"
@@ -32,7 +31,7 @@ begin
     s.description = "Behaviour Driven Development derived from Cucumber but as an internal DSL with methods for reuse"
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: sudo gem install jeweler -s http://gems.github.com"
 end
 
 

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.5.0

data/coulda.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{coulda}
-  s.version = "0.4.7"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan David Light"]
-  s.date = %q{2009-11-30}
+  s.date = %q{2009-12-04}
   s.description = %q{Behaviour Driven Development derived from Cucumber but as an internal DSL with methods for reuse}
   s.email = %q{evan@tiggerpalace.com}
   s.extra_rdoc_files = [
@@ -34,18 +34,20 @@ Gem::Specification.new do |s|
      "lib/coulda.rb",
      "lib/coulda/feature.rb",
      "lib/coulda/scenario.rb",
-     "lib/coulda/world.rb",
      "lib/coulda/tasks.rb",
+     "lib/coulda/pending.rb",
      "lib/coulda/tasks/print_features.rake",
      "lib/coulda/vendor/constantize.rb",
      "lib/coulda/vendor/underscore.rb",
+     "lib/coulda/world.rb",
      "test/feature_test.rb",
      "test/integration/using_coulda_test.rb",
      "test/regression/issue_1_test.rb",
+     "test/regression/pending_scenarios_test.rb",
      "test/scenario_test.rb",
      "test/test_helper.rb"
   ]
-  s.homepage = %q{http://coulda.tiggerpalace.com/}
+  s.homepage = %q{http://evan.tiggerpalace.com/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
@@ -54,6 +56,7 @@ Gem::Specification.new do |s|
     "test/feature_test.rb",
      "test/integration/using_coulda_test.rb",
      "test/regression/issue_1_test.rb",
+     "test/regression/pending_scenarios_test.rb",
      "test/scenario_test.rb",
      "test/test_helper.rb"
   ]
@@ -69,3 +72,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/coulda.rb

@@ -4,21 +4,33 @@ end
 
 require 'test/unit'
 
-gem 'pending', '>= 0.1.1'
-require 'pending'
-
 require 'coulda/world'
 require 'coulda/feature'
 require 'coulda/scenario'
+require 'coulda/pending'
 require 'coulda/vendor/constantize'
 require 'coulda/vendor/underscore'
 
 module Kernel
+  # Factory method for Test::Unit::TestCase subclasses
   def Feature(name, opts = {}, &block)
-    f = Feature.new(name, opts)
-    f.instance_eval &block if block_given?
-    f.assert_presence_of_intent
-    f
+    test_class = Class.new(opts[:testcase_class] || Test::Unit::TestCase)
+    Coulda::assign_class_to_const test_class, name
+    test_class.class_eval &block if block_given?
+    test_class.assert_presence_of_intent
+    World.register_feature(test_class, name)
+    test_class
+  end
+end
+
+module Coulda
+  def assign_class_to_const(test_class, potential_const)
+    base_name = potential_const
+    if potential_const !~ /^[a-zA-Z]/
+      base_name = "a_" + base_name
+    end
+    titleized_underscored_name = base_name.super_custom_underscore.gsub(/\b('?[a-z])/) { $1.upcase }
+    Object.const_set(titleized_underscored_name, test_class)
   end
 end
 

data/lib/coulda/feature.rb

@@ -1,63 +1,57 @@
-module Coulda
-  # The Feature class is composed of an intent and a series of zero or more Scenarios that describe the behavior
-  # that satisfies the intent.  Capturing intent is a key feature of Coulda.  Intent defines the business value 
-  # the Feature is attempting to fulfill.  It serves as a reminder for developers (and customers) as to why this
-  # Feature was implemented and why this spec was written.
-  class Feature
-    include Test::Unit::Assertions
-
-    attr_reader :scenarios, :name
-    attr_accessor :current_scenario, :test_instance
-
-    def initialize(name, opts = {})
-      World.register_feature(self)
-      @name = name
-      @scenarios = []
-      Scenario.testcase_class = opts[:testcase_class] if opts[:testcase_class]
-    end
-
-    %w[in_order_to as_a i_want_to].each do |intent|
-      eval <<-HERE
-        # An intent specifier
-        def #{intent}(val = nil)
-          val ? @#{intent} = val : @#{intent}
-        end
-      HERE
-    end
+module Test
+  module Unit
+    class TestCase
+      include Coulda
+
+      def self.scenarios
+        @scenarios ||= []
+        @scenarios
+      end
 
-    %w[Given When Then And].each do |stmt|
-      eval <<-HERE
-        # Specifies a prereqisite, event, or expectation.  May be used in any order within the spec
-        def #{stmt}(text, &block)
-          @current_scenario.statements << { :type => :#{stmt}, :text => text }
-          @current_scenario.steps << block if block
-        end
-      HERE
-    end
+      def self.current_scenario=(scenario)
+        @current_scenario = scenario
+      end
 
-    # Creates a Scenario instance and adds it to the Feature
-    def Scenario(scenario_name, &block)
-      @scenarios << scenario = Scenario.new(scenario_name, self, &block)
-      scenario
-    end
+      def self.current_scenario
+        @current_scenario
+      end
 
-    # Accessor to the Scenario-created TestCases
-    def tests
-      @scenarios.collect { |s| s.test_class }
-    end
+      %w[in_order_to as_a i_want_to].each do |intent|
+        eval <<-HERE
+          # An intent specifier
+          def self.#{intent}(val = nil)
+            val ? @#{intent} = val : @#{intent}
+          end
+        HERE
+      end
 
+      %w[Given When Then And].each do |stmt|
+        eval <<-HERE
+          # Specifies a prereqisite, event, or expectation.  May be used in any order within the spec
+          def self.#{stmt}(text, &block)
+            step = nil
+            if block_given?
+              current_scenario.steps << step = block
+            end
+            caller[0] =~ (/(.*):(.*)(:in)?/)
+            current_scenario.statements << { :type => :#{stmt}, :text => text, :block => step, :file => $1, :line => $2}
+          end
+        HERE
+      end
 
-    # Raises an error if only some of the intent is captured (i.e., in_order_to and as_a without i_want_to)
-    def assert_presence_of_intent
-      presence = %w[in_order_to as_a i_want_to].map { |intent| instance_variable_get("@#{intent}") }
-      if presence.any? { |p| p } && !presence.all? { |p| p }
-        raise SyntaxError.new("Must have all or none of in_order, as_a, and i_want_to called in a Feature")
+      # Creates a Scenario instance and adds it to the Feature
+      def self.Scenario(scenario_name, &block)
+        @scenarios ||=[]
+        @scenarios << scenario = Scenario.new(scenario_name, self, &block)
+        scenario
       end
-    end
 
-    def method_missing(name, *args)
-      if test_instance
-        test_instance.__send__(name, *args)
+      # Raises an error if only some of the intent is captured (i.e., in_order_to and as_a without i_want_to)
+      def self.assert_presence_of_intent
+        presence = %w[in_order_to as_a i_want_to].map { |intent| instance_variable_get("@#{intent}") }
+        if presence.any? { |p| p } && !presence.all? { |p| p }
+          raise SyntaxError.new("Must have all or none of in_order, as_a, and i_want_to called in a Feature")
+        end
       end
     end
   end

data/lib/coulda/pending.rb

@@ -0,0 +1,25 @@
+module Test
+  module Unit
+    class TestCase
+      @@pending_cases = []
+      @@at_exit = false
+
+      # Loosely based upon Jeremy McAnally's pending
+      
+      def pending(scenario, statement)
+        @@pending_cases << [scenario, statement]
+        print "P"
+        
+        @@at_exit ||= begin
+          at_exit do
+            puts "\nPending Cases:"
+            @@pending_cases.each do |scenario, stmt|
+              puts "#{stmt[:file]}:#{stmt[:line]}: Scenario '#{scenario.name}': #{stmt[:type]} '#{stmt[:text]}'"
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/coulda/scenario.rb

@@ -1,33 +1,18 @@
 module Coulda
-  # A factory for Test::Unit::TestCases (or their subclass).
+  # A factory for Test::Unit::TestCase test methods
   class Scenario
     attr_reader :name, :test_class
     attr_accessor :steps, :statements
 
-    # Class-level method to set the subclass of Test::Unit::TestCase to use as the parent for 
-    # tests manufactured by Scenarios.
-    def self.testcase_class=(klass)
-      unless klass.ancestors.include?(Test::Unit::TestCase)
-        raise Exception.new("class must inherit from Test::Unit:TestCase") 
-      end
-      @testcase_class = klass
-    end
-
-    def self.testcase_class
-      @testcase_class
-    end
-
     def initialize(name, my_feature, &block)
       raise Exception.new("Scenario must have a name") unless name 
       @name = name
       @statements = []
       @steps = []
       @pending = false
-      @test_class = ::Class.new(Scenario.testcase_class || Test::Unit::TestCase)
-      assign_test_class_to_const(my_feature)
-      test_impl = nil
-      if block
-        create_and_provision_test_method_for my_feature, &block
+      @my_feature = my_feature
+      if block_given?
+        create_and_provision_test_method_using &block
       else
         @pending = true
         define_test_method_using { pending }
@@ -41,40 +26,31 @@ module Coulda
     
     private
 
-    def create_and_provision_test_method_for(feature, &block)
-      execute block, :within => feature
-      inject_test_steps_into @test_class
+    def create_and_provision_test_method_using(&block)
+      collect_scenario_statements_from &block
       define_test_method_using do
-        feature.test_instance = self
-        self.class.test_steps.each do |s|
-          feature.instance_eval &s
+        self.class.current_scenario.statements.each do |stmt|
+          if stmt[:block]
+            self.instance_eval &(stmt[:block])
+          else
+            pending self.class.current_scenario, stmt
+            break
+          end
         end
-        feature.test_instance = nil
       end
     end
 
-    def assign_test_class_to_const(my_feature)
-      base_name = "#{my_feature.name}_#{@name}_#{rand(1_000_000_000)}"
-      base_name = "letter_" + base_name if base_name =~ /^[^a-zA-Z]/
-      titleized_underscored_name = base_name.super_custom_underscore.gsub(/\b('?[a-z])/) { $1.upcase }
-      ::Module.const_set(titleized_underscored_name, @test_class)
+    def collect_scenario_statements_from(&block)
+      @my_feature.current_scenario = self
+      @my_feature.instance_eval &block
     end
 
     def define_test_method_using(&block)
-      @test_class.send(:define_method, "test_#{@name.downcase.super_custom_underscore}", &block)
-    end
-
-    def execute(block, params = {})
-      feature = params[:within]
-      feature.current_scenario = self
-      feature.instance_eval &block
-    end
-
-    def inject_test_steps_into(test_class)
-      class << test_class
-        attr_accessor :test_steps
+      scenario = self
+      @my_feature.send(:define_method, "test_#{@name.downcase.super_custom_underscore}") do
+        self.class.current_scenario = scenario
+        self.instance_eval &block
       end
-      test_class.test_steps = @steps
     end
   end
 end

data/lib/coulda/tasks/print_features.rake

@@ -14,8 +14,8 @@ namespace :coulda do
       load file
     end
 
-    Coulda::World.features.each do |feature|
-      puts "Feature: #{feature.name}"
+    Coulda::World.features.each do |feature, name|
+      puts "Feature: #{name}"
       puts "  In order to #{feature.in_order_to}" if feature.in_order_to
       puts "  As a #{feature.as_a}" if feature.as_a
       puts "  I want to #{feature.i_want_to}" if feature.i_want_to

data/lib/coulda/world.rb

@@ -1,7 +1,7 @@
 module Coulda
   class World
-    def self.register_feature(feature)
-      (@features ||= []) << feature
+    def self.register_feature(feature, name)
+      (@features ||= []) << [feature, name]
     end
 
     def self.features

data/test/feature_test.rb

@@ -1,7 +1,15 @@
 require File.join(File.dirname(__FILE__), "test_helper")
 
 class FeatureTest < Test::Unit::TestCase
+
+  should "be able to subclass any child class of TestCase" do
+    MyTestCase = Class.new(Test::Unit::TestCase)
+    feature = Feature "a child class", :testcase_class => MyTestCase
+    assert feature.ancestors.include? Test::Unit::TestCase
+  end
+
   context "A Feature" do
+    @@counter = 1
     setup do
       @feature = Feature "foobarblech#{@@counter}" do
         Scenario "" do
@@ -9,10 +17,11 @@ class FeatureTest < Test::Unit::TestCase
           Then "" do; end
         end
       end
+      @@counter += 1
     end
 
-    should "contain tests" do
-      assert(@feature.tests.first)
+    should "be a Test::Unit::TestCase by default" do
+      assert @feature.ancestors.include? Test::Unit::TestCase
     end
 
     %w[Given When Then And].each do |condition|
@@ -75,20 +84,18 @@ class FeatureTest < Test::Unit::TestCase
         end
       end
 
-      should "not have any test" do
-        assert(@feature_without_scenarios.tests.empty?)
+      should "not have any tests" do
+        assert @feature_without_scenarios.instance_methods.grep(/^test_/).empty?
       end
     end
 
     context "that does not have any errors" do
-      @@counter = 1
       setup do
         @feature_without_errors = Feature @@counter.to_s do
           in_order_to "foo"
           as_a "bar"
           i_want_to "blech"
         end
-        @@counter += 1
       end
 
       ### Integration tests
@@ -98,7 +105,7 @@ class FeatureTest < Test::Unit::TestCase
           @feature_without_errors.Scenario("pending scenario") {}
           test_name = "test_pending_scenario"
           test_name = test_name.to_sym if RUBY_VERSION =~ /^1.9/
-          assert(@feature_without_errors.tests.first.instance_methods.include?(test_name), "Test is missing test method from scenario")
+          assert(@feature_without_errors.instance_methods.include?(test_name), "Test is missing test method from scenario")
         end
 
         should "create a Scenario" do

data/test/integration/using_coulda_test.rb

@@ -1,6 +1,10 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper")
 
+require 'rr'
+
 Feature "Using Coulda", :testcase_class => Test::Unit::TestCase do
+  include RR::Adapters::TestUnit
+
   in_order_to "perform lightweight integration/acceptance testing with Coulda"
   as_a "developer"
   i_want_to "have typical Coulda usage work"
@@ -10,8 +14,10 @@ Feature "Using Coulda", :testcase_class => Test::Unit::TestCase do
   end
 
   Scenario "A pending scenario with a Given/When/Then without a block" do
-    Given "this scenario"
-    When "an event happens" do; end
+    Given "this scenario which should be pending" do
+      mock(self).pending(anything, anything).times(1)
+    end
+    When "an event happens"
     Then "should not error/fail because it is pending" do; end
   end
 

data/test/regression/issue_1_test.rb

@@ -1,5 +1,7 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper")
 
+require 'rr'
+
 module GivenSomething
   def given_something
     Given "something" do; end
@@ -8,9 +10,11 @@ end
 
 # http://github.com/elight/coulda/issues#issue/1
 class Issue1Test < Test::Unit::TestCase
+  include RR::Adapters::TestUnit
+
   context "A Feature that has a Scenario that invokes a 'Given/When/Then' called from a method" do
     setup do
-      pendings_are_errors
+      stub(self).pending { raise Exception.new }
 
       @feature_without_errors = Feature "Issue 1 feature" do
         extend GivenSomething
@@ -28,7 +32,7 @@ class Issue1Test < Test::Unit::TestCase
     end
 
     should "pass" do
-      assert(run_feature(@feature_without_errors.tests.first))
+      assert(run_feature(@feature_without_errors))
     end
   end
 end

data/test/regression/pending_scenarios_test.rb

@@ -0,0 +1,31 @@
+require File.join(File.dirname(__FILE__), "..", "test_helper")
+require 'rr'
+
+# http://github.com/elight/coulda/issues#issue/1
+class PendingScenariosTest < Test::Unit::TestCase
+  include RR::Adapters::TestUnit
+
+  context "A Scenario that has at least one pending step" do
+    @@counter = 0
+    setup do
+      @scenario = nil
+      @feature_without_errors = Feature "with a pending scenario step #{@@counter}" do
+        include RR::Adapters::TestUnit
+
+        @scenario = Scenario "my scenario" do
+          Given "something"
+          When "the when"
+          Then "the then" do
+            mock(self).pending
+          end
+        end
+        @@counter += 1
+      end
+    end
+
+    should "pass" do
+      assert(run_feature(@feature_without_errors))
+    end
+  end
+end
+

data/test/scenario_test.rb

@@ -18,15 +18,5 @@ class ScenarioTest < Test::Unit::TestCase
       end
     end
   end
-
-  should "allow Test::Unit::TestCase class to subclass to be set" do
-    Scenario.testcase_class = Test::Unit::TestCase
-  end
-
-  should "raise an Exception if provided a class that does not inherit from Test::Unit::TestCase" do
-    assert_raises Exception do
-      Scenario.testcase_class = Object
-    end
-  end
 end
 

data/test/test_helper.rb

@@ -21,7 +21,7 @@ end
 
 def pendings_are_errors
   Feature.class_eval do
-    def pending
+    def pending(*args)
       raise Exception.new
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: coulda
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors: 
 - Evan David Light
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -05:00
+date: 2009-12-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,18 +49,20 @@ files:
 - lib/coulda.rb
 - lib/coulda/feature.rb
 - lib/coulda/scenario.rb
-- lib/coulda/world.rb
 - lib/coulda/tasks.rb
+- lib/coulda/pending.rb
 - lib/coulda/tasks/print_features.rake
 - lib/coulda/vendor/constantize.rb
 - lib/coulda/vendor/underscore.rb
+- lib/coulda/world.rb
 - test/feature_test.rb
 - test/integration/using_coulda_test.rb
 - test/regression/issue_1_test.rb
+- test/regression/pending_scenarios_test.rb
 - test/scenario_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://coulda.tiggerpalace.com/
+homepage: http://evan.tiggerpalace.com/
 licenses: []
 
 post_install_message: 
@@ -91,5 +93,6 @@ test_files:
 - test/feature_test.rb
 - test/integration/using_coulda_test.rb
 - test/regression/issue_1_test.rb
+- test/regression/pending_scenarios_test.rb
 - test/scenario_test.rb
 - test/test_helper.rb