rspec 0.6.2 → 0.6.3

data/CHANGES

@@ -1,5 +1,15 @@
 = RSpec Changelog
 
+== Version 0.6.3
+
+This release fixes some minor bugs related to RSpec on Rails
+Note that if you upgrade a rails app with this version of the rspec_on_rails plugin
+you should remove your lib/tasks/rspec.rake if it exists.
+
+* Backtraces from drb (and other standard ruby libraries) are now stripped from backtraces.
+* Applied [#5557] Put rspec.rake into the task directory of the RSpec on Rails plugin (Patch from Daniel Siemssen)
+* Applied [#5556] rails_spec_runner loads environment.rb twice (Patch from Daniel Siemssen)
+
 == Version 0.6.2
 This release fixes a couple of regressions with the rake task that were introduced in the previous version (0.6.1)
 

data/EXAMPLES.rd

@@ -16,28 +16,29 @@
 # * should raise an exception when the file length is less than 32 bytes
 # A consumer of a mock
 # * should be able to send messages to the mock
+# A stack (in general)
+# * should add to the top when sent 'push'
+# * should return the top item when sent 'peek'
+# * should NOT remove the top item when sent 'peek'
+# * should return the top item when sent 'pop'
+# * should remove the top item when sent 'pop'
 # An empty stack
-# * should accept an item when sent push
-# * should complain when sent top
-# * should complain when sent pop
-# A stack with one item
-# * should accept an item when sent push
-# * should return top when sent top
-# * should not remove top when sent top
-# * should return top when sent pop
-# * should remove top when sent pop
+# * should be empty
+# * should no longer be empty after 'push'
+# * should complain when sent 'peek'
+# * should complain when sent 'pop'
+# An almost empty stack (with one item)
+# * should not be empty
+# * should remain not empty after 'peek'
+# * should become empty after 'pop'
 # An almost full stack (with one item less than capacity)
-# * should accept an item when sent push
-# * should return top when sent top
-# * should not remove top when sent top
-# * should return top when sent pop
-# * should remove top when sent pop
+# * should not be full
+# * should become full when sent 'push'
 # A full stack
-# * should complain on push
-# * should return top when sent top
-# * should not remove top when sent top
-# * should return top when sent pop
-# * should remove top when sent pop
+# * should be full
+# * should remain full after 'peek'
+# * should no longer be full after 'pop'
+# * should complain on 'push'
 # Underscore sugar
 # * should be available for regular objects
 # * should be available for mocks

data/examples/stack.rb

@@ -20,7 +20,7 @@ class Stack
     @items.delete @items.last
   end
   
-  def top
+  def peek
     raise StackUnderflowError if @items.empty?
     @items.last
   end
@@ -28,9 +28,9 @@ class Stack
   def empty?
     @items.empty?
   end
-  
-  def size
-    @items.length
+
+  def full?
+    @items.length == 10
   end
   
 end

data/examples/stack_spec.rb

@@ -1,115 +1,117 @@
 require File.dirname(__FILE__) + '/../lib/spec'
 require File.dirname(__FILE__) + "/stack"
 
-context "An empty stack" do
-  
+context "A stack (in general)" do
   setup do
     @stack = Stack.new
+    ["a","b","c"].each { |x| @stack.push x }
   end
   
-  specify "should accept an item when sent push" do
-    lambda { @stack.push Object.new }.should_not_raise
+  specify "should add to the top when sent 'push'" do
+    @stack.push "d"
+    @stack.peek.should_equal "d"
   end
   
-  specify "should complain when sent top" do
-    lambda { @stack.top }.should_raise StackUnderflowError
+  specify "should return the top item when sent 'peek'" do
+    @stack.peek.should_equal "c"
   end
   
-  specify "should complain when sent pop" do
-    lambda { @stack.pop }.should_raise StackUnderflowError
+  specify "should NOT remove the top item when sent 'peek'" do
+    @stack.peek.should_equal "c"
+    @stack.peek.should_equal "c"
+  end
+  
+  specify "should return the top item when sent 'pop'" do
+    @stack.pop.should_equal "c"
   end
   
+  specify "should remove the top item when sent 'pop'" do
+    @stack.pop.should_equal "c"
+    @stack.pop.should_equal "b"
+  end
 end
 
-context "A stack with one item" do
-
+context "An empty stack" do
   setup do
     @stack = Stack.new
-    @stack.push 3
-  end
-
-  specify "should accept an item when sent push" do
-    lambda { @stack.push Object.new }.should_not_raise
   end
   
-  specify "should return top when sent top" do
-    @stack.top.should_be 3
+  specify "should be empty" do
+    @stack.should_be_empty
   end
   
-  specify "should not remove top when sent top" do
-    @stack.top.should_be 3
-    @stack.top.should_be 3
+  specify "should no longer be empty after 'push'" do
+    @stack.push "anything"
+    @stack.should_not_be_empty
   end
   
-  specify "should return top when sent pop" do
-    @stack.pop.should_be 3
+  specify "should complain when sent 'peek'" do
+    lambda { @stack.peek }.should_raise StackUnderflowError
   end
   
-  specify "should remove top when sent pop" do
-    @stack.pop.should_be 3
+  specify "should complain when sent 'pop'" do
     lambda { @stack.pop }.should_raise StackUnderflowError
   end
-  
 end
 
-context "An almost full stack (with one item less than capacity)" do
-  
+context "An almost empty stack (with one item)" do
   setup do
     @stack = Stack.new
-    (1..9).each { |i| @stack.push i }
-  end
-
-  specify "should accept an item when sent push" do
-    @stack.push Object.new
+    @stack.push 3
   end
   
-  specify "should return top when sent top" do
-    @stack.top.should_be 9
+  specify "should not be empty" do
+    @stack.should_not_be_empty
   end
   
-  specify "should not remove top when sent top" do
-    @stack.top.should_be 9
-    @stack.top.should_be 9
+  specify "should remain not empty after 'peek'" do
+    @stack.peek
+    @stack.should_not_be_empty
   end
   
-  specify "should return top when sent pop" do
-    @stack.pop.should_be 9
+  specify "should become empty after 'pop'" do
+    @stack.pop
+    @stack.should_be_empty
+  end
+end
+
+context "An almost full stack (with one item less than capacity)" do
+  setup do
+    @stack = Stack.new
+    (1..9).each { |i| @stack.push i }
   end
   
-  specify "should remove top when sent pop" do
-    @stack.pop.should_be 9
-    @stack.pop.should_be 8
+  specify "should not be full" do
+    @stack.should_not_be_full
   end
   
+  specify "should become full when sent 'push'" do
+    @stack.push Object.new
+    @stack.should_be_full
+  end
 end
 
 context "A full stack" do
-  
   setup do
     @stack = Stack.new
     (1..10).each { |i| @stack.push i }
   end
-
-  specify "should complain on push" do
-    lambda { @stack.push Object.new }.should_raise StackOverflowError
-  end
   
-  specify "should return top when sent top" do
-    @stack.top.should_be 10
+  specify "should be full" do
+    @stack.should_be_full
   end
   
-  specify "should not remove top when sent top" do
-    @stack.top.should_be 10
-    @stack.top.should_be 10
+  specify "should remain full after 'peek'" do
+    @stack.peek
+    @stack.should_be_full
   end
   
-  specify "should return top when sent pop" do
-    @stack.pop.should_be 10
+  specify "should no longer be full after 'pop'" do
+    @stack.pop
+    @stack.should_not_be_full
   end
-  
-  specify "should remove top when sent pop" do
-    @stack.pop.should_be 10
-    @stack.pop.should_be 9
+
+  specify "should complain on 'push'" do
+    lambda { @stack.push Object.new }.should_raise StackOverflowError
   end
-  
 end

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

@@ -4,6 +4,7 @@ module Spec
 
     def initialize(target)
       @target = target
+      @be_seen = false
     end
     
     def not

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

@@ -4,6 +4,7 @@ module Spec
     
     def initialize(target)
       @target = target
+      @be_seen = false
     end
   
     def satisfy

data/lib/spec/api/mocks/message_expectation.rb

@@ -62,7 +62,7 @@ module Spec
 
       def handle_order_constraint
         return unless @ordered
-        return @ordering.consume(@self) if @ordering.ready_for?(self)
+        return @ordering.consume(self) if @ordering.ready_for?(self)
         message = "Mock '#{@mock_name}' received '#{@sym}' out of order"
         Kernel::raise(Spec::Api::MockExpectationError, message) 
       end

data/lib/spec/runner/backtrace_tweaker.rb

@@ -24,13 +24,14 @@ module Spec
         return if error.backtrace.nil?
         error.backtrace.collect! do |line|
           line = tweak_instance_exec_line line, spec_name
+          line = nil if line =~ /\/lib\/ruby\//
           line = nil if line =~ /\/lib\/spec\/api\//
           line = nil if line =~ /\/lib\/spec\/runner\//
           line = nil if line =~ /bin\/spec:/
+          line = nil if line =~ /lib\/rspec_on_rails/
+          line = nil if line =~ /script\/rails_spec/
           # TextMate's Ruby plugin
           line = nil if line =~ /Ruby\.tmbundle\/Support\/tmruby.rb:/
-          # RSpec on Rails
-          line = nil if line =~ /gems\/rspec_generator/
           line
         end
         error.backtrace.compact!

data/lib/spec/runner/reporter.rb

@@ -8,6 +8,8 @@ module Spec
         @failures = []
         @spec_names = []
         @backtrace_tweaker = backtrace_tweaker
+        @start_time = nil
+        @end_time = nil
       end
   
       def add_context(name)

data/lib/spec/version.rb

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

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
-date: 2006-08-26 00:00:00 +02:00
-summary: RSpec-0.6.2 - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.6.3
+date: 2006-08-29 00:00:00 +02:00
+summary: RSpec-0.6.3 - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org