visionmedia-jspec 2.3.0 → 2.3.1

data/History.rdoc

@@ -1,4 +1,10 @@
 
+=== 2.3.1 / 2009-06-25
+
+* Fixed; all stubs generated with stub() are restored
+  to their original methods after each 'it' block. See
+  README for details.
+
 === 2.3.0 / 2009-06-25
 
 * Added stub()

data/README.rdoc

@@ -209,6 +209,14 @@ JSpec currently provides very simple stubbing support shown below:
 
   person = { toString : function(){ return '<Person>' } }
   stub(person, 'toString').and_return('Ive been stubbed!')
+  
+After each spec all stubs are restored to their original methods so
+there is no reason to explicitly call destub(). To persist stubs, 
+use a before_each hook:
+
+  before_each
+    stub(someObject, 'method').and_return({ some : thing })
+  end
 
 To destub a method simply call destub() at any time:
 

data/bin/jspec

@@ -10,7 +10,7 @@ require 'fileutils'
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '2.3.0'
+program :version, '2.3.1'
 program :description, 'JavaScript BDD Testing Framework'
 default_command :bind
 

data/jspec.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "2.3.0"
+  s.version = "2.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]

data/lib/jspec.js

@@ -5,10 +5,11 @@
 
   JSpec = {
 
-    version   : '2.3.0',
+    version   : '2.3.1',
     suites    : [],
     allSuites : [],
     matchers  : {},
+    stubbed   : [],
     stats     : { specs : 0, assertions : 0, failures : 0, passes : 0, specsFinished : 0, suitesFinished : 0 },
     options   : { profile : false },
 
@@ -899,7 +900,9 @@
      
      /**
       * Destub _object_'s _method_. When no _method_ is passed
-      * all stubbed methods are destubbed.
+      * all stubbed methods are destubbed. When no arguments
+      * are passed every object found in JSpec.stubbed will be
+      * destubbed.
       *
       * @param  {mixed} object
       * @param  {string} method
@@ -915,14 +918,19 @@
          delete object['__prototype__' + method]
          delete object['__original____' + method]
        }
-       else
+       else if (object) {
          for (var key in object)
            if (captures = key.match(/^(?:__prototype__|__original__)(.*)/))
              destub(object, captures[1])
+       }
+       else
+         while (JSpec.stubbed.length)
+            destub(JSpec.stubbed.shift())
      },
      
      /**
-      * Stub _object_'s _method_. Example:
+      * Stub _object_'s _method_. 
+      *
       * stub(foo, 'toString').and_return('bar')
       *
       * @param  {mixed} object
@@ -934,13 +942,14 @@
      stub : function(object, method) {
        return {
          and_return : function(result) {
+           JSpec.stubbed.push(object)
            var type = object.hasOwnProperty(method) ? '__original__' : '__prototype__'
            object[type + method] = object[method]
            object[method] = function(){ return result }
          }
       }
      },
-         
+     
     /**
      * Map callback return values.
      *
@@ -1179,6 +1188,7 @@
       catch (e) { fail(e) }
       spec.runDeferredAssertions()
       if (option('profile')) console.timeEnd(spec.description)
+      destub()
       this.stats.specsFinished++
       this.stats.assertions += spec.assertions.length
     },

data/spec/spec.utils.js

@@ -29,11 +29,30 @@ describe 'Utility'
         object.stubby().should.eql 'Oh no im new'
       end
       
-      it 'should with a single argument should destub all methods stubbed related to the object passed'
+      it 'should destub all methods stubbed related to the object passed when no method is given'
         destub(object)
         object.toString().should.eql '<Im an object>'
         object.stubby().should.eql 'Not stubbed'
       end
+      
+      describe 'should restore after each spec'
+        before
+          a = { toString : function(){ return 'Wahoo' }}
+          b = { toString : function(){ return 'Wahhhhhooo' }}
+        end
+        
+        it 'should stub'
+          stub(a, 'toString').and_return('Oh no')
+          stub(b, 'toString').and_return('Oh noooo')
+          a.toString().should.eql 'Oh no'
+          b.toString().should.eql 'Oh noooo'
+        end
+        
+        it 'should restore'
+          a.toString().should.eql 'Wahoo'
+          b.toString().should.eql 'Wahhhhhooo'
+        end
+      end
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-jspec
 version: !ruby/object:Gem::Version 
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors: 
 - TJ Holowaychuk