rspec 0.5.13 → 0.5.14

data/CHANGES

@@ -1,5 +1,17 @@
 = RSpec Changelog
 
+== Version 0.5.14
+This release introduces better ways to extend specs, improves some of the core API and
+a experimental support for faster rails specs.
+
+* Added proc methods for specifying differences (increments and decrements). See difference_test.rb
+* Methods can now be defined alongside specs. This obsoletes the need for defining methods in setup. (Patch #5002 from Brian Takita)
+* Sugar (underscores) now works correctly with should_be_a_kind_of and should_be_an_instance_of
+* Added support for include and inherit in contexts. (Patch #4971 from Brian Takita)
+* Added rails_spec and rails_spec_runner for faster specs on rails (still buggy - help needed)
+* Fixed bug that caused should_render to break if given a :symbol (in Rails)
+* Added support for comparing exception message in should_raise and should_not_raise
+
 == Version 0.5.13
 This release fixes some subtle bugs in the mock API.
 

data/EXAMPLES.rd

@@ -5,6 +5,11 @@
 # BDD framework
 # * should be adopted quickly
 # * should be intuitive
+# A FileAccessor
+# * should open a file and pass it to the processor's process method
+# An IoProcessor
+# * should raise nothing when the file is exactly 32 bytes
+# * should raise an exception when the file length is less than 32 bytes
 # Mocker
 # * should be able to call mock()
 # An empty stack

data/Rakefile

@@ -184,6 +184,7 @@ task :publish_website => [:verify_user, :website] do
   publisher.upload
 end
 
+desc "Build the Rails extension gem"
 task :package_rails do
   Dir.chdir 'vendor/rspec_on_rails/vendor/generators/rspec' do    
     `rake clobber gem`

data/bin/spec

@@ -7,7 +7,7 @@ $context_runner = ::Spec::Runner::OptionParser.create_context_runner(ARGV, false
 ARGV.each do |file_or_dir|
   if File.directory?(file_or_dir)
     Dir["#{file_or_dir}/**/*.rb"].each do |file| 
-      require "#{file}"
+      require file
     end
   else
     require file_or_dir

data/examples/airport_spec.rb

@@ -10,30 +10,20 @@ class Airport
   end
 end
 
-class Spec::Runner::Context
-  alias should specify
-  alias must specify
-  alias fact specify
-end
-module Kernel
-  alias topic context
-end
-
-topic "Airport at home" do
+context "Airport at home" do
   setup do
     @airport = Airport.new
   end
   
-  fact "should always work" do
+  specify "should always work" do
     @airport.should_be_working
   end
 
-  must "not need cables" do
+  specify "not need cables" do
     @airport.should_not_need :cables
   end
 
-  must "not need electricity" do
-    # This will fail...
+  specify "not need electricity" do
     @airport.should_not_need :electricity
   end
   

data/examples/custom_method_spec.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__)  + '/../lib/spec'
+
+context "Rspec allow you to define custom methods" do
+  specify "Rspec should allow you to define methods" do
+    a_method
+    @a_method_called.should.be true
+  end
+
+  def a_method
+    @a_method_called = true
+  end
+end
+require File.dirname(__FILE__)  + '/../lib/spec'
+
+context "Rspec allow you to define custom methods" do
+  specify "Rspec should allow you to define methods" do
+    a_method
+    @a_method_called.should.be true
+  end
+
+  def a_method
+    @a_method_called = true
+  end
+end

data/examples/test_case_spec.rb

@@ -0,0 +1,63 @@
+require File.dirname(__FILE__)  + '/../lib/spec'
+require 'test/unit'
+
+class RspecIntegrationTest < Test::Unit::TestCase
+  def self.fixtures(*args)
+    @@fixtures = true
+  end
+  
+  def self.verify_class_method
+    @@fixtures.should_be true
+  end
+  
+  def setup
+    @test_case_setup_called = true
+  end
+
+  def teardown
+    @test_case_teardown_called = true
+  end
+
+  def run(result)
+  end
+
+  def helper_method
+    @helper_method_called = true
+  end
+end
+
+module RandomHelperModule
+  def random_task
+    @random_task_called = true
+  end
+end
+
+context "Rspec should integrate with Test::Unit::TestCase" do
+  inherit RspecIntegrationTest
+  include RandomHelperModule
+
+  fixtures :some_table
+
+  setup do
+    @rspec_setup_called = true
+  end
+
+  specify "TestCase#setup should be called." do
+    @test_case_setup_called.should_be true
+    @rspec_setup_called.should_be true
+  end
+
+  specify "Rspec should be able to access TestCase methods" do
+    helper_method
+    @helper_method_called.should_be true
+  end
+
+  specify "Rspec should be able to accept included modules" do
+    random_task
+    @random_task_called.should_be true
+  end
+  
+  teardown do
+    RspecIntegrationTest.verify_class_method
+  end
+end

data/lib/spec/api/helper/should_helper.rb

@@ -61,10 +61,11 @@ module Spec
       fail_with_message(default_message("should include", sub)) unless (@target.include? sub)
     end
     
-    def raise(exception=Exception)
+    def raise(exception=Exception, message=nil)
       begin
         @target.call
-      rescue exception
+      rescue exception => e
+        e.message.should.equal message unless message.nil?
         return
       rescue => e
         fail_with_message("#{default_message("should raise", exception)} but raised #{e.inspect}")
@@ -83,6 +84,16 @@ module Spec
       end
     end
 
+    def increment(object, method, difference=1)
+      initial_value = object.__send__(method)
+      @target.call
+      object.__send__(method).should.equal(initial_value + difference)
+    end
+
+    def decrement(object, method, difference=1)
+      increment(object, method, -difference)
+    end
+
   end
 
 end

data/lib/spec/api/helper/should_negator.rb

@@ -45,10 +45,11 @@ module Spec
         fail_with_message(default_message("should not include", sub)) if (@target.include? sub)
     end
    
-    def raise(exception=Exception)
+    def raise(exception=Exception, message=nil)
       begin
         @target.call
       rescue exception => e
+        return unless message.nil? || e.message == message
         fail_with_message("#{default_message("should not raise", exception)}") if e.instance_of? exception
         fail_with_message("#{default_message("should not raise", exception)} but raised #{e.inspect}") unless e.instance_of? exception
       rescue
@@ -68,6 +69,16 @@ module Spec
       end
     end
     
+    def increment(object, method, difference=1)
+      initial_value = object.__send__(method)
+      @target.call
+      object.__send__(method).should.not.equal(initial_value + difference)
+    end
+
+    def decrement(object, method, difference=1)
+      increment(object, method, -difference)
+    end
+
     def method_missing(sym, *args)
       return unless @target.send("#{sym}?", *args)
       fail_with_message(default_message("should not be #{sym}" + (args.empty? ? '' : (' ' + args.join(', ')))))

data/lib/spec/api/sugar.rb

@@ -10,7 +10,7 @@ module Spec
           while calls.length > 1
             call = calls.shift
             object = object.__send__(call)
-            break if call == "be"
+            break if call == "be" unless ["an","a"].include? calls[0]
           end
           return object.__send__(calls.join("_"), *args, &block)
         end

data/lib/spec/runner.rb

@@ -1,6 +1,7 @@
 require 'spec/runner/formatter'
 require 'spec/runner/instance_exec'
 require 'spec/runner/context'
+require 'spec/runner/context_eval'
 require 'spec/runner/specification'
 require 'spec/runner/execution_context'
 require 'spec/runner/context_runner'

data/lib/spec/runner/context.rb

@@ -1,52 +1,150 @@
 module Spec
   module Runner
     class Context
-      def initialize(name, &context_block)
-        @setup_block = nil
-        @teardown_block = nil
-        @specifications = []
-        @name = name
-        instance_exec(&context_block)
-      end
+      module InstanceMethods
+        def initialize(name, &context_block)
+          @name = name
 
-      def run(reporter, dry_run=false)
-        reporter.add_context(@name)
-        @specifications.each do |specification|
-          specification.run(reporter, @setup_block, @teardown_block, dry_run)
+          @context_eval_module = Module.new
+          @context_eval_module.extend ContextEval::ModuleMethods
+          @context_eval_module.class_eval &context_block
         end
-      end
 
-      def setup(&block)
-        @setup_block = block
-      end
-  
-      def teardown(&block)
-        @teardown_block = block
-      end
-  
-      def specify(spec_name, &block)
-        @specifications << Specification.new(spec_name, &block)
-      end
-      
-      def number_of_specs
-        @specifications.length
-      end
-      
-      def matches? name, matcher=nil
-        matcher ||= SpecMatcher.new name, @name
-        @specifications.each do |spec|
-          return true if spec.matches_matcher? matcher 
+        def inherit(klass)
+          @context_eval_module.inherit klass
         end
-        return false
-      end
-      
-      def run_single_spec name
-        return if @name == name
-        matcher = SpecMatcher.new name, @name
-        @specifications.reject! do |spec|
-          !spec.matches_matcher? matcher
+
+        def include(mod)
+          @context_eval_module.include mod
+        end
+
+        def setup(&block)
+          @context_eval_module.setup &block
+        end
+
+        def teardown(&block)
+          @context_eval_module.teardown &block
+        end
+
+        def specify(spec_name, &block)
+          @context_eval_module.specify spec_name, &block
+        end
+
+        def run(reporter, dry_run=false)
+          reporter.add_context(@name)
+
+          prepare_execution_context_class
+          specifications.each do |specification|
+            execution_context = execution_context_class.new(specification)
+            specification.run(reporter, setup_block, teardown_block, dry_run, execution_context)
+          end
+        end
+
+        def number_of_specs
+          specifications.length
+        end
+
+        def matches? name, matcher=nil
+          matcher ||= SpecMatcher.new name, @name
+          specifications.each do |spec|
+            return true if spec.matches_matcher? matcher
+          end
+          return false
+        end
+
+        def run_single_spec name
+          return if @name == name
+          matcher = SpecMatcher.new name, @name
+          specifications.reject! do |spec|
+            !spec.matches_matcher? matcher
+          end
+        end
+
+        def methods
+          my_methods = super
+          my_methods |= @context_eval_module.methods
+          my_methods
+        end
+
+        protected
+
+        def method_missing(method_name, *args)
+          @context_eval_module.send(method_name, *args)
+        end
+
+        def specifications
+          @context_eval_module.send :specifications
+        end
+
+        def setup_block
+          @context_eval_module.send :setup_block
+        end
+        def setup_block=(value)
+          @context_eval_module.send :setup_block=, value
+        end
+
+        def teardown_block
+          @context_eval_module.send :teardown_block
+        end
+        def teardown_block=(value)
+          @context_eval_module.send :teardown_block=, value
+        end
+
+        def prepare_execution_context_class
+          weave_in_context_modules
+          weave_in_setup_method
+          weave_in_teardown_method
+          execution_context_class
+        end
+
+        def weave_in_context_modules
+          mods = context_modules
+          context_eval_module = @context_eval_module
+          execution_context_class.class_eval do
+            include context_eval_module
+            mods.each do |mod|
+              include mod
+            end
+          end
+        end
+
+        def weave_in_setup_method
+          if context_superclass.method_defined?(:setup)
+            super_setup = context_superclass.instance_method(:setup)
+            context_setup = setup_block if setup_block
+
+            self.setup_block = proc do
+              super_setup.bind(self).call
+              instance_exec(&context_setup) if context_setup
+            end
+          end
+        end
+
+        def weave_in_teardown_method
+          if context_superclass.method_defined?(:teardown)
+            super_teardown = context_superclass.instance_method(:teardown)
+            context_teardown = teardown_block if teardown_block
+
+            self.teardown_block = proc do
+              super_teardown.bind(self).call
+              instance_exec(&context_teardown) if context_teardown
+            end
+          end
+        end
+
+        def context_modules
+          @context_eval_module.send :context_modules
+        end
+
+        def execution_context_class
+          @context_eval_module.send :execution_context_class
+        end
+
+        def context_superclass
+          @context_eval_module.send :context_superclass
         end
       end
+      include InstanceMethods
     end
   end
 end

data/lib/spec/runner/context_eval.rb

@@ -0,0 +1,73 @@
+# Is this file really needed?
+# If I make this an empty file all tests are still passing.
+# But it seems to be used from other files.
+# Can we delete this file?
+module Spec
+  module Runner
+    module ContextEval
+      module ModuleMethods
+        def inherit(klass)
+          @context_superclass = klass
+          derive_execution_context_class_from context_superclass
+        end
+
+        def include(mod)
+          context_modules << mod
+        end
+
+        def setup(&block)
+          @setup_block = block
+        end
+
+        def teardown(&block)
+          @teardown_block = block
+        end
+
+        def specify(spec_name, &block)
+          specifications << Specification.new(spec_name, &block)
+        end
+
+        def methods
+          my_methods = super
+          my_methods |= context_superclass.methods
+          my_methods
+        end
+        protected
+
+        def method_missing(method_name, *args)
+          if context_superclass
+            return context_superclass.send(method_name, *args)
+          end
+          super
+        end
+
+        def specifications
+          @specifications ||= []
+        end
+
+        attr_accessor :setup_block
+        attr_accessor :teardown_block
+
+        def derive_execution_context_class_from(context_superclass)
+          @execution_context_class = Class.new(context_superclass)
+          @execution_context_class.class_eval do
+            include ::Spec::Runner::ExecutionContext::InstanceMethods
+          end
+        end
+
+        def execution_context_class
+          @execution_context_class ||= begin
+            derive_execution_context_class_from context_superclass
+          end
+        end
+        def context_superclass
+          @context_superclass ||= Object
+        end
+
+        def context_modules
+          @context_modules ||= []
+        end
+      end
+    end
+  end
+end

data/lib/spec/runner/execution_context.rb

@@ -1,23 +1,26 @@
 module Spec
   module Runner
     class ExecutionContext
-      def initialize(spec)
-        @spec = spec
-      end
-      
-      def mock(name, options={})
-        mock = Api::Mock.new(name, options)
-        @spec.add_mock(mock)
-        mock
-      end
-      
-      def duck_type(*args)
-        return Api::DuckTypeArgConstraint.new(*args)
-      end
-      
-      def violated(message="")
-        raise Spec::Api::ExpectationNotMetError.new(message)
+      module InstanceMethods
+        def initialize(spec)
+          @spec = spec
+        end
+        
+        def mock(name, options={})
+          mock = Api::Mock.new(name, options)
+          @spec.add_mock(mock)
+          mock
+        end
+
+        def duck_type(*args)
+          return Api::DuckTypeArgConstraint.new(*args)
+        end
+
+        def violated(message="")
+          raise Spec::Api::ExpectationNotMetError.new(message)
+        end
       end
+      include InstanceMethods
     end
   end
 end

data/lib/spec/runner/specification.rb

@@ -7,13 +7,13 @@ module Spec
         @block = block
         @mocks = []
       end
-    
-      def run(reporter=nil, setup_block=nil, teardown_block=nil, dry_run=false)
+
+      def run(reporter=nil, setup_block=nil, teardown_block=nil, dry_run=false, execution_context=nil)
         reporter.spec_started(@name)
         if dry_run
           reporter.spec_finished(@name)
         else
-          execution_context = ::Spec::Runner::ExecutionContext.new(self)
+          execution_context = ::Spec::Runner::ExecutionContext.new(self) unless execution_context
           errors = []
           begin
             execution_context.instance_exec(&setup_block) unless setup_block.nil?
@@ -37,7 +37,7 @@ module Spec
           reporter.spec_finished(@name, errors.first, failure_location(setup_ok, spec_ok, teardown_ok)) unless reporter.nil?
         end
       end
-      
+
       def add_mock(mock)
         @mocks << mock
       end

data/lib/spec/version.rb

@@ -3,7 +3,7 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 5
-      TINY   = 13
+      TINY   = 14
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')

data/test/spec/api/helper/difference_test.rb

@@ -0,0 +1,78 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+
+module Spec
+  module Api
+    module Helper
+      class ShouldIncrementTest < Test::Unit::TestCase
+        def test_should_pass_when_block_increments
+          assert_nothing_raised do
+            arr = []
+            lambda { arr << "something" }.should.increment arr, :length
+          end
+        end
+
+        def test_should_pass_when_block_increments_unsing_underscores
+          assert_nothing_raised do
+            arr = []
+            lambda { arr << "something" }.should_increment arr, :length
+          end
+        end
+  
+        def test_should_fail_when_block_doesnt_increment
+          assert_raise(ExpectationNotMetError) do
+            arr = []
+            lambda {}.should.increment arr, :length
+          end
+        end
+      end
+
+      class ShouldNotIncrementTest < Test::Unit::TestCase
+        def test_should_pass_when_block_doesnt_increment
+          assert_nothing_raised do
+            arr = []
+            lambda {}.should.not.increment arr, :length
+          end
+        end
+  
+        def test_should_fail_when_block_increments
+          assert_raise(ExpectationNotMetError) do
+            arr = []
+            lambda {arr << "something" }.should.not.increment arr, :length
+          end
+        end
+      end
+
+      class ShouldDecrementTest < Test::Unit::TestCase
+        def test_should_pass_when_block_decrements
+          assert_nothing_raised do
+            arr = ["something"]
+            lambda { arr.pop }.should.decrement arr, :length
+          end
+        end
+  
+        def test_should_fail_when_block_doesnt_decrement
+          assert_raise(ExpectationNotMetError) do
+            arr = ["something"]
+            lambda {}.should.decrement arr, :length
+          end
+        end
+      end
+
+      class ShouldNotDecrementTest < Test::Unit::TestCase
+        def test_should_pass_when_block_doesnt_decrement
+          assert_nothing_raised do
+            arr = ["something"]
+            lambda {}.should.not.decrement arr, :length
+          end
+        end
+  
+        def test_should_fail_when_block_decrements
+          assert_raise(ExpectationNotMetError) do
+            arr = ["something"]
+            lambda { arr.pop }.should.not.decrement arr, :length
+          end
+        end
+      end
+    end
+  end
+end

data/test/spec/api/helper/raising_test.rb

@@ -5,19 +5,31 @@ module Spec
     module Helper
       class ShouldRaiseTest < Test::Unit::TestCase
 
-        def test_should_raise_should_pass_when_exact_exception_is_raised
+        def test_should_pass_when_exact_exception_is_raised
           assert_nothing_raised do
             proc { ''.nonexistent_method }.should.raise NoMethodError
           end
         end
   
-        def test_should_raise_should_pass_when_subclass_exception_is_raised
+        def test_should_pass_when_exact_exception_is_raised_with_message
+          assert_nothing_raised do
+            lambda { raise StandardError.new("this is standard") }.should.raise StandardError, "this is standard"
+          end
+        end
+  
+        def test_should_fail_when_exact_exception_is_raised_with_wrong_message
+          assert_raises(Spec::Api::ExpectationNotMetError) do
+            lambda { raise StandardError.new("chunky bacon") }.should.raise StandardError, "rotten tomatoes"
+          end
+        end
+  
+        def test_should_pass_when_subclass_exception_is_raised
           assert_nothing_raised do
             proc { ''.nonexistent_method }.should.raise
           end
         end
   
-        def test_should_raise_should_fail_when_wrong_exception_is_raised
+        def test_should_fail_when_wrong_exception_is_raised
           begin
             proc { ''.nonexistent_method }.should.raise SyntaxError
           rescue => e
@@ -25,7 +37,7 @@ module Spec
           assert_equal("<Proc> should raise <SyntaxError> but raised #<NoMethodError: undefined method `nonexistent_method' for \"\":String>", e.message)
         end
   
-        def test_should_raise_should_fail_when_no_exception_is_raised
+        def test_should_fail_when_no_exception_is_raised
           begin
             proc { }.should.raise SyntaxError
           rescue => e
@@ -36,25 +48,37 @@ module Spec
         
       class ShouldNotRaiseTest < Test::Unit::TestCase
   
-        def test_should_not_raise_should_pass_when_other_exception_is_raised
+        def test_should_pass_when_exact_exception_is_raised_with_wrong_message
+          assert_nothing_raised do
+            lambda { raise StandardError.new("abc") }.should.not.raise StandardError, "xyz"
+          end
+        end
+  
+        def test_should_faile_when_exact_exception_is_raised_with_message
+          assert_raises(Spec::Api::ExpectationNotMetError) do
+            lambda { raise StandardError.new("abc") }.should.not.raise StandardError, "abc"
+          end
+        end
+  
+        def test_should_pass_when_other_exception_is_raised
           assert_nothing_raised do
             proc { ''.nonexistent_method }.should.not.raise SyntaxError
           end
         end
   
-        def test_should_not_raise_should_pass_when_no_exception_is_raised
+        def test_should_pass_when_no_exception_is_raised
           assert_nothing_raised do
             proc { ''.to_s }.should.not.raise NoMethodError
           end
         end
 
-        def test_should_not_raise_without_exception_should_pass_when_no_exception_is_raised
+        def test_without_exception_should_pass_when_no_exception_is_raised
           assert_nothing_raised do
             proc { ''.to_s }.should.not.raise
           end
         end
         
-        def test_should_not_raise_should_fail_when_specific_exception_is_raised
+        def test_should_fail_when_specific_exception_is_raised
           begin
             proc { ''.nonexistent_method }.should.not.raise NoMethodError
           rescue => e

data/test/spec/api/helper/throwing_test.rb

@@ -7,19 +7,19 @@ module Spec
 
         def test_should_pass_when_proper_symbol_is_thrown
           assert_nothing_raised do
-            proc { throw :foo }.should.throw :foo
+            lambda { throw :foo }.should.throw :foo
           end
         end
   
         def test_should_fail_when_wrong_symbol_is_thrown
           assert_raise(ExpectationNotMetError) do
-            proc { throw :bar }.should.throw :foo
+            lambda { throw :bar }.should.throw :foo
           end
         end
    
         def test_should_fail_when_no_symbol_is_thrown
           assert_raise(ExpectationNotMetError) do
-            proc { ''.to_s }.should.throw :foo
+            lambda { ''.to_s }.should.throw :foo
           end
         end
       end
@@ -28,25 +28,25 @@ module Spec
 
         def test_should_fail_when_expected_symbol_is_actually_thrown
           assert_raise(ExpectationNotMetError) do
-            proc { throw :foo }.should.not.throw :foo
+            lambda { throw :foo }.should.not.throw :foo
           end
         end
 
         def test_should_pass_when_expected_symbol_is_thrown
           assert_nothing_raised do
-            proc { throw :bar }.should.not.throw :foo
+            lambda { throw :bar }.should.not.throw :foo
           end
         end
 
         def test_should_pass_when_no_symbol_is_thrown
           assert_nothing_raised do
-            proc { ''.to_s }.should.not.throw :foo
+            lambda { ''.to_s }.should.not.throw :foo
           end
         end
 
         def test_should_pass_when_no_symbol_is_thrown_and_none_is_specified
           assert_nothing_raised do
-            proc { ''.to_s }.should.not.throw
+            lambda { ''.to_s }.should.not.throw
           end
         end
       end

data/test/spec/api/sugar_test.rb

@@ -59,6 +59,34 @@ module Spec
           subject.should_not_be_multi_word_predicate
         end
       end
+      
+      def test_is_an_instance_of_should_work_when_passing
+        n = 10
+        assert_nothing_raised do
+          n.should_be_an_instance_of Fixnum
+        end
+      end
+      
+      def test_is_an_instance_of_should_work_when_failing
+        n = 10
+        assert_raises(Spec::Api::ExpectationNotMetError) do
+          n.should_be_an_instance_of String
+        end
+      end
+      
+      def test_is_a_kind_of_should_work_when_passing
+        n = 10
+        assert_nothing_raised do
+          n.should_be_a_kind_of Numeric
+        end
+      end
+      
+      def test_is_a_kind_of_should_work_when_failing
+        n = 10
+        assert_raises(Spec::Api::ExpectationNotMetError) do
+          n.should_be_a_kind_of Float
+        end
+      end
 
     end
   end

data/test/spec/runner/context_test.rb

@@ -8,11 +8,14 @@ module Spec
         @formatter = Api::Mock.new "formatter"
         @context = Context.new("context") {}
       end
+
+      def teardown
+        @formatter.__verify
+      end
       
       def test_should_add_itself_to_formatter_on_run
         @formatter.should.receive(:add_context).with "context"
         @context.run(@formatter)
-        @formatter.__verify
       end
       
       def test_should_run_spec
@@ -23,8 +26,7 @@ module Spec
         @context.specify("test") {$spec_ran = true}
         @context.run(@formatter)
         assert $spec_ran
-        @formatter.__verify
-      end     
+      end
          
       def test_should_run_spec_dry
         @formatter.should.receive(:add_context).with :any_args
@@ -34,32 +36,143 @@ module Spec
         @context.specify("test") {$spec_ran = true}
         @context.run(@formatter, true)
         assert !$spec_ran
-        @formatter.__verify
       end
       
       def test_setup
         @formatter.should.receive(:add_context).with :any_args
         @formatter.should.receive(:spec_started).with "test"
         @formatter.should.receive(:spec_finished).with :any_args
-        $setup_ran = false
-        @context.setup {$setup_ran = true}
+
+        super_class_setup_ran = false
+        super_class = Class.new do
+          define_method :setup do
+            super_class_setup_ran = true
+          end
+        end
+        @context.inherit super_class
+
+        setup_ran = false
+        @context.setup {setup_ran = true}
         @context.specify("test") {true}
         @context.run(@formatter)
-        assert $setup_ran
-        @formatter.__verify
+        assert super_class_setup_ran
+        assert setup_ran
       end
 
-      def test_teardwown
+      def test_setup__should_allow_method_definitions
         @formatter.should.receive(:add_context).with :any_args
         @formatter.should.receive(:spec_started).with "test"
         @formatter.should.receive(:spec_finished).with :any_args
-        $teardwown_ran = false
-        @context.teardown {$teardwown_ran = true}
+
+        $method_in_setup_called = false
+        @context.setup do
+          def method_in_setup
+            $method_in_setup_called = true
+          end
+        end
+
+        @context.specify("test") {method_in_setup}
+        @context.run(@formatter)
+
+        assert $method_in_setup_called
+      end
+
+      def test_teardown
+        @formatter.should.receive(:add_context).with :any_args
+        @formatter.should.receive(:spec_started).with "test"
+        @formatter.should.receive(:spec_finished).with :any_args
+
+        super_class_teardown_ran = false
+        super_class = Class.new do
+          define_method :teardown do
+            super_class_teardown_ran = true
+          end
+        end
+        @context.inherit super_class
+
+        teardown_ran = false
+        @context.teardown {teardown_ran = true}
         @context.specify("test") {true}
         @context.run(@formatter)
-        assert $teardwown_ran
+        assert super_class_teardown_ran
+        assert teardown_ran
         @formatter.__verify
       end
+
+      def test_inherit__superclass_methods_should_be_accessible
+        @formatter.should.receive(:add_context).with :any_args
+        @formatter.should.receive(:spec_started).with "test"
+        @formatter.should.receive(:spec_finished).with :any_args
+
+        helper_method_ran = false
+        super_class = Class.new do
+          define_method :helper_method do
+            helper_method_ran = true
+          end
+        end
+        @context.inherit super_class
+
+        @context.specify("test") {helper_method}
+        @context.run(@formatter)
+        assert helper_method_ran
+      end
+
+      def test_inherit__class_methods_should_work
+        class_method_ran = false
+        super_class = Class.new
+        (class << super_class; self; end).class_eval do
+          define_method :class_method do
+            class_method_ran = true
+          end
+        end
+        @context.inherit super_class
+        @context.class_method
+        assert class_method_ran
+
+        assert_raise(NoMethodError) {@context.foobar}
+      end
+
+      def test_methods__should_include_inherited_class_methods
+        class_method_ran = false
+        super_class = Class.new
+        class << super_class
+          def super_class_class_method; end
+        end
+        @context.inherit super_class
+
+        assert @context.methods.include?("super_class_class_method")
+      end
+
+      def test_include
+        @formatter.should.receive(:add_context).with :any_args
+        @formatter.should.receive(:spec_started).with "test"
+        @formatter.should.receive(:spec_finished).with :any_args
+
+        mod1_method_called = false
+        mod1 = Module.new do
+          define_method :mod1_method do
+            mod1_method_called = true
+          end
+        end
+
+        mod2_method_called = false
+        mod2 = Module.new do
+          define_method :mod2_method do
+            mod2_method_called = true
+          end
+        end
+
+        @context.include mod1
+        @context.include mod2
+
+        @context.specify("test") do
+          mod1_method
+          mod2_method
+        end
+        @context.run(@formatter)
+        assert mod1_method_called
+        assert mod2_method_called
+      end
       
       def test_spec_count_1
         @context.specify("test") {}

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.5.13
-date: 2006-06-22 00:00:00 -05:00
-summary: RSpec-0.5.13 - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.5.14
+date: 2006-07-14 00:00:00 -05:00
+summary: RSpec-0.5.14 - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -59,6 +59,7 @@ files:
 - lib/spec/rake/spectask.rb
 - lib/spec/runner/backtrace_tweaker.rb
 - lib/spec/runner/context.rb
+- lib/spec/runner/context_eval.rb
 - lib/spec/runner/context_runner.rb
 - lib/spec/runner/execution_context.rb
 - lib/spec/runner/formatter.rb
@@ -84,6 +85,7 @@ files:
 - test/spec/api/helper/arbitrary_predicate_test.rb
 - test/spec/api/helper/containment_test.rb
 - test/spec/api/helper/diff_test.rb
+- test/spec/api/helper/difference_test.rb
 - test/spec/api/helper/identity_test.rb
 - test/spec/api/helper/object_equality_test.rb
 - test/spec/api/helper/raising_test.rb
@@ -121,6 +123,7 @@ files:
 - examples/airport_spec.rb
 - examples/bdd_framework_spec.rb
 - examples/custom_formatter.rb
+- examples/custom_method_spec.rb
 - examples/file_accessor.rb
 - examples/file_accessor_spec.rb
 - examples/io_processor.rb
@@ -129,6 +132,7 @@ files:
 - examples/stack.rb
 - examples/stack_spec.rb
 - examples/sugar_spec.rb
+- examples/test_case_spec.rb
 test_files: []
 
 rdoc_options: