visionmedia-jspec 2.4.3 → 2.5.0

data/History.rdoc

@@ -1,4 +1,17 @@
 
+=== 2.5.0 / 2009-07-03
+
+* Added contrib in README (thanks to anyone who has helped)
+* Added more shared behavior specs
+* Added Module.DSLs support for extending / adding new DSLs (DSL exchange not yet fully implemented)
+* Added spec to make sure methods like end() will not fail due to the grammar
+* Changed; giving hook precedence to suite hooks (before_each, etc) over module hooks (beforeSuite, etc) ; (thanks mpd)
+* Changed; calls to stub() without and_return() now simply stub an arbitrary method with no return value
+* Changed JSpec.include(); now returns JSpec allowing chaining
+* Fixed having "end" in descriptions which would be replaced with '});'
+* Fixed negation of should.receive('foo') matcher
+* Fixed shared behavior assertion count issue
+
 === 2.4.3 / 2009-07-02
 
 * Fixed matcher semicolon matcher issue when using the JSpec grammar

data/Manifest

@@ -18,12 +18,14 @@ server/server.rb
 spec/async
 spec/env.js
 spec/jquery-1.3.1.js
+spec/modules.js
 spec/spec.dom.html
 spec/spec.grammar-less.js
 spec/spec.grammar.js
 spec/spec.jquery.js
 spec/spec.js
 spec/spec.matchers.js
+spec/spec.modules.js
 spec/spec.rhino.js
 spec/spec.server.html
 spec/spec.shared-behaviors.js

data/README.rdoc

@@ -454,9 +454,13 @@ The following methods or properties are utilized by JSpec:
   - init      : called to initialize a module
   - utilities : hash of utility functions merged with JSpec.defaultContext
   - matchers  : hash of matchers merged with JSpec's core matchers via JSpec.addMatchers()
+  - DSLs      : hash of DSL methods; for example DSLs.snake contains before_each, after_each, etc.
+                Where as DSLs.camel may contain beforeEach, afterEach, etc.
 
 Below is a list of hooks, descriptions, and valid return values which
-may simply be implemented as module methods.
+may simply be implemented as module methods. beforeSuite, afterSuite, beforeSpec, and afterSpec have lower
+precedence than before_each, after_each etc within the specs themselves, allowing them to override or undo
+anything that has been done by a Module.
 
   - running(options)                 : started running JSpec with the options passed    : returning 'stop' will halt running
   - loading(file)                    : loading a file                                   : returning 'stop' will prevent loading
@@ -559,9 +563,6 @@ Run with:
 * Tabs may cause a parse error. To prevent this use 'soft tabs' (setting in your IDE/Editor)
   or use JSpec's grammar-less alternative (mentioned above).
   
-* The negation of the should_receive matcher is currently not available. (ex:
-  foo.should.not.receive('toString()') will not work)
-
 == More Information
 
 * Featured article in JSMag: http://www.jsmag.com/main.issues.description/id=21/
@@ -569,6 +570,15 @@ Run with:
 * Get the TextMate bundle at https://github.com/visionmedia/jspec.tmbundle/tree
 * For more information consult the JSpec source code documentation or visit http://visionmedia.github.com/jspec
 
+== Contributors
+
+Many ideas and bug reports were contributed by
+the following developers, thankyou for making
+JSpec more enjoyable, and bug free ;)
+
+* mpd@jesters-court.ne
+* kevin.gisi@gmail.com
+
 == License 
 
 (The MIT License)

data/bin/jspec

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

data/jspec.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "2.4.3"
+  s.version = "2.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-07-02}
+  s.date = %q{2009-07-03}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}
   s.executables = ["jspec"]
   s.extra_rdoc_files = ["bin/jspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "README.rdoc"]
-  s.files = ["bin/jspec", "History.rdoc", "jspec.gemspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "Manifest", "Rakefile", "README.rdoc", "server/browsers.rb", "server/server.rb", "spec/async", "spec/env.js", "spec/jquery-1.3.1.js", "spec/spec.dom.html", "spec/spec.grammar-less.js", "spec/spec.grammar.js", "spec/spec.jquery.js", "spec/spec.js", "spec/spec.matchers.js", "spec/spec.rhino.js", "spec/spec.server.html", "spec/spec.shared-behaviors.js", "spec/spec.utils.js", "templates/default/History.rdoc", "templates/default/lib/yourlib.core.js", "templates/default/README.rdoc", "templates/default/spec/spec.core.js", "templates/default/spec/spec.dom.html", "templates/default/spec/spec.rhino.js", "templates/default/spec/spec.server.html"]
+  s.files = ["bin/jspec", "History.rdoc", "jspec.gemspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "Manifest", "Rakefile", "README.rdoc", "server/browsers.rb", "server/server.rb", "spec/async", "spec/env.js", "spec/jquery-1.3.1.js", "spec/modules.js", "spec/spec.dom.html", "spec/spec.grammar-less.js", "spec/spec.grammar.js", "spec/spec.jquery.js", "spec/spec.js", "spec/spec.matchers.js", "spec/spec.modules.js", "spec/spec.rhino.js", "spec/spec.server.html", "spec/spec.shared-behaviors.js", "spec/spec.utils.js", "templates/default/History.rdoc", "templates/default/lib/yourlib.core.js", "templates/default/README.rdoc", "templates/default/spec/spec.core.js", "templates/default/spec/spec.dom.html", "templates/default/spec/spec.rhino.js", "templates/default/spec/spec.server.html"]
   s.homepage = %q{http://visionmedia.github.com/jspec}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Jspec", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/jspec.js

@@ -5,7 +5,7 @@
 
   JSpec = {
 
-    version   : '2.4.3',
+    version   : '2.5.0',
     suites    : [],
     modules   : [],
     allSuites : [],
@@ -224,7 +224,7 @@
       })
     },
     
-    ProxyAssertion : function(object, method, times) {
+    ProxyAssertion : function(object, method, times, negate) {
       var self = this
       var old = object[method]
       
@@ -244,13 +244,12 @@
         'twice' : 2
       }[times] || times || 1
       
-      // TODO: negation
-      
       extend(this, {
         calls : [],
         message : '',
         defer : true,
         passed : false,
+        negate : negate,
         object : object,
         method : method,
         
@@ -277,6 +276,18 @@
                        hash(self.expectedResult) != hash(call.result)
           })
         },
+        
+        anyResultsPass : function() {
+          return any(this.calls, function(call){
+            return self.expectedResult.an_instance_of ?
+                     call.result.constructor == self.expectedResult.an_instance_of:
+                       hash(self.expectedResult) == hash(call.result)
+          })
+        },
+        
+        passingResult : function() {
+          return this.anyResultsPass().result
+        },
 
         // Return the failing result
         
@@ -297,6 +308,21 @@
           })
         },
         
+        anyArgsPass : function() {
+          return any(this.calls, function(call){
+            return any(self.expectedArgs, function(i, arg){
+              return arg.an_instance_of ?
+                       call.args[i].constructor == arg.an_instance_of:
+                         hash(arg) == hash(call.args[i])
+                       
+            })
+          })
+        },
+        
+        passingArgs : function() {
+          return this.anyArgsPass().args
+        },
+                
         // Return the failing args
         
         failingArgs : function() {
@@ -313,23 +339,23 @@
         // Run the assertion
                 
         run : function() {
-          var methodString = 'expected ' + object.toString() + '.' + method + '()'
+          var methodString = 'expected ' + object.toString() + '.' + method + '()' + (negate ? ' not' : '' )
           
           function times(n) {
             return n > 2 ?  n + ' times' : { 1 : 'once', 2 : 'twice' }[n]
           }
           
-          if (this.calls.length < this.times)
-            this.message = methodString + ' to be called ' + times(this.times) + 
-            ', but ' +  (this.calls.length == 0 ? ' was not called' : ' was called ' + times(this.calls.length))
-              
-          if (this.expectedResult && this.anyResultsFail())
+          if (this.expectedResult && (negate ? this.anyResultsPass() : this.anyResultsFail()))
             this.message = methodString + ' to return ' + puts(this.expectedResult) + 
-              ' but got ' + puts(this.failingResult())
-              
-          if (this.expectedArgs && this.anyArgsFail())
+              ' but ' + (negate ? 'it did' : 'got ' + puts(this.failingResult())) 
+
+          if (this.expectedArgs && (negate ? !this.expectedResult && this.anyArgsPass() : this.anyArgsFail()))
             this.message = methodString + ' to be called with ' + puts.apply(this, this.expectedArgs) +
-             ' but was called with ' + puts.apply(this, this.failingArgs())
+             ' but was' + (negate ? '' : ' called with ' + puts.apply(this, this.failingArgs()))
+
+          if (negate ? !this.expectedResult && !this.expectedArgs && this.calls.length == this.times : this.calls.length != this.times)
+            this.message = methodString + ' to be called ' + times(this.times) + 
+            ', but ' +  (this.calls.length == 0 ? ' was not called' : ' was called ' + times(this.calls.length))
                 
           if (!this.message.length) 
             this.passed = true
@@ -552,6 +578,7 @@
      * Include _object_ which may be a hash or Module instance.
      *
      * @param  {has, Module} object
+     * @return {JSpec}
      * @api public
      */
     
@@ -561,6 +588,12 @@
       if ('init' in module) module.init()
       if ('utilities' in module) extend(this.defaultContext, module.utilities)
       if ('matchers' in module) this.addMatchers(module.matchers)
+      if ('DSLs' in module)
+        each(module.DSLs, function(name, methods){
+          JSpec.DSLs[name] = JSpec.DSLs[name] || {}
+          extend(JSpec.DSLs[name], methods)
+        })
+      return this
     },
     
     /**
@@ -578,7 +611,7 @@
       args = argumentsToArray(arguments, 1)
       return inject(JSpec.modules, [], function(results, module){
         if (typeof module[name] == 'function')
-          results.push(module[name].apply(module, args))
+          results.push(module[name].apply(this, args))
       })
     },
     
@@ -597,7 +630,7 @@
     hookImmutable : function(name, arg) {
       return inject(JSpec.modules, arg, function(result, module){
         if (typeof module[name] == 'function')
-          return module[name].call(module, result)
+          return module[name].call(this, result)
       })
     },
     
@@ -638,6 +671,7 @@
     
     copySpecs : function(fromSuite, toSuite) {
       each(fromSuite.specs, function(spec){
+        spec.assertions = []
         toSuite.specs.push(spec)
       })
     },
@@ -885,7 +919,8 @@
 
     expect : function(actual) {
       assert = function(matcher, args, negate) {
-        var expected = argumentsToArray(args, 1)        
+        var expected = argumentsToArray(args, 1)
+        matcher.negate = negate  
         assertion = new JSpec.Assertion(matcher, actual, expected, negate)
         hook('beforeAssertion', assertion)
         if (matcher.defer) assertion.run()
@@ -1031,12 +1066,13 @@
       */
      
      stub : function(object, method) {
+       hook('stubbing', object, method)
+       JSpec.stubbed.push(object)
+       var type = object.hasOwnProperty(method) ? '__original__' : '__prototype__'
+       object[type + method] = object[method]
+       object[method] = function(){}
        return {
          and_return : function(result) {
-           hook('stubbing', object, method, result)
-           JSpec.stubbed.push(object)
-           var type = object.hasOwnProperty(method) ? '__original__' : '__prototype__'
-           object[type + method] = object[method]
            object[method] = function(){ return result }
          }
       }
@@ -1185,7 +1221,7 @@
         replace(/describe\s+(.*?)$/gm, 'describe($1, function(){').
         replace(/\sit\s+(.*?)$/gm, ' it($1, function(){').
         replace(/^(?: *)(before_each|after_each|before|after)(?= |\n|$)/gm, 'JSpec.currentSuite.addHook("$1", function(){').
-        replace(/end(?=\s|$)/gm, '});').
+        replace(/\bend(?=\s|$)/gm, '});').
         replace(/-\{/g, 'function(){').
         replace(/(\d+)\.\.(\d+)/g, function(_, a, b){ return range(a, b) }).
         replace(/\.should([_\.]not)?[_\.](\w+)(?: |;|$)(.*)$/gm, '.should$1_$2($3)').
@@ -1250,10 +1286,12 @@
       this.currentSuite = suite
       this.evalBody(suite.body)
       suite.ran = true
-      suite.hook('before'), hook('beforeSuite', suite)
+      hook('beforeSuite', suite), suite.hook('before')
       each(suite.specs, function(spec) {
+        hook('beforeSpec', spec)
         suite.hook('before_each')
         JSpec.runSpec(spec)
+        hook('afterSpec', spec)
         suite.hook('after_each')
       })
       if (suite.hasSuites()) {
@@ -1261,7 +1299,7 @@
           JSpec.runSuite(suite)
         })
       }
-      suite.hook('after'), hook('afterSuite', suite)
+      hook('afterSuite', suite), suite.hook('after')
       this.stats.suitesFinished++
     },
          
@@ -1298,12 +1336,10 @@
     runSpec : function(spec) {
       this.currentSpec = spec
       if (option('profile')) console.time(spec.description)
-      hook('beforeSpec', spec)
       try { this.evalBody(spec.body) }
       catch (e) { fail(e) }
-      spec.runDeferredAssertions()
-      hook('afterSpec', spec)
       if (option('profile')) console.timeEnd(spec.description)
+      spec.runDeferredAssertions()
       destub()
       this.stats.specsFinished++
       this.stats.assertions += spec.assertions.length
@@ -1483,7 +1519,7 @@
     },
     
     receive : { defer : true, match : function(actual, method, times) {
-      proxy = new JSpec.ProxyAssertion(actual, method, times)
+      proxy = new JSpec.ProxyAssertion(actual, method, times, this.negate)
       JSpec.currentSpec.assertions.push(proxy)
       return proxy
     }},

data/spec/modules.js

@@ -0,0 +1,36 @@
+
+ExampleModule = {
+  utilities : {
+    doFoo : function(){ return 'foo' },
+    doBar : function(){ return 'bar' }
+  },
+  randomHook : function(a, b) {
+    return [a, b]
+  },
+  beforeSpec  : function() { addedBeforeSpec = true, addedBeforeSpecHook = false },
+  afterSpec   : function() { addedAfterSpec = true, addedAfterSpecHook = false },
+  beforeSuite : function() { addedBeforeSuite = true },
+  afterSuite  : function() {
+    addedAfterSuite = true
+    addedBeforeSuite = addedBeforeSpec = addedAfterSpec = false
+  },
+  matchers : {
+    be_foo_bar : function() {
+      return true
+    }
+  },
+  DSLs : {
+    snake : {
+      some_snake_case_stuff : function(){
+        return true
+      }
+    },
+    camel : {
+      someCamelCaseStuff : function() {
+        return true
+      }
+    }
+  }
+}
+
+JSpec.include(ExampleModule)

data/spec/spec.dom.html

@@ -4,16 +4,18 @@
 		<script src="jquery-1.3.1.js"></script>
 		<script src="../lib/jspec.js"></script>
 		<script src="../lib/jspec.jquery.js"></script>
+		<script src="modules.js"></script>
 		<script src="spec.grammar-less.js"></script>
 		<script>
 			function runSuites() {
 				JSpec
-				.exec('spec.grammar.js')
-				.exec('spec.js')
-				.exec('spec.matchers.js')
-				.exec('spec.utils.js')
-				.exec('spec.shared-behaviors.js')
-				.exec('spec.jquery.js')
+        .exec('spec.grammar.js')
+        .exec('spec.js')
+        .exec('spec.matchers.js')
+        .exec('spec.utils.js')
+        .exec('spec.shared-behaviors.js')
+        .exec('spec.jquery.js')
+        .exec('spec.modules.js')
 				.run()
 				.report()
 			}

data/spec/spec.grammar.js

@@ -16,6 +16,10 @@ describe 'Grammar'
     true.should.be_true()
   end
   
+  it 'should not mess up with words like it or append in descriptions'
+    -{ element.append().end() }.should.throw_error
+  end
+  
   it 'should allow semicolons'
     true.should.be_true;
     true.should.be_true();

data/spec/spec.js

@@ -2,7 +2,7 @@
 describe 'Negative specs'
 
   it 'should fail'
-    'test'.should.not_eql 'test' 
+    'test'.should.not_eql 'test'
   end
 
   it 'should fail with one faulty assertion'

data/spec/spec.matchers.js

@@ -286,15 +286,6 @@ describe 'Matchers'
         addPets  : function(a, b) { return ['izzy', a, b] }
       }
     end
-    
-    it 'should fail when the method does not exist'
-      person.should.receive('getPets')
-    end
-    
-    it 'should fail when the method is never invoked'
-      personWithPets.should.receive('getPets')
-    end
-    
     it 'should pass when the method is invoked'
       personWithPets.should.receive('getPets')
       personWithPets.getPets()
@@ -310,11 +301,79 @@ describe 'Matchers'
       personWithPets.getPets()
     end
     
+    it 'should pass when invoked the expected number of times'
+      personWithPets.should.receive('getPets', 'twice').and_return(['izzy'])
+      personWithPets.getPets()
+      personWithPets.getPets()
+    end
+    
+    it 'should pass when a method is invoked with specific arguments'
+      personWithPets.should.receive('addPet', 'once').with_args('suki')
+      personWithPets.addPet('suki')
+    end
+    
+    it 'should pass with multiple arguments'
+      personWithPets.should.receive('addPets').with_args('suki', 'max')
+      personWithPets.addPets('suki', 'max')
+    end
+    
+    it 'should pass with arguments and return value'
+      personWithPets.should.receive('addPet').with_args('suki').and_return(['izzy', 'suki'])
+      personWithPets.addPet('suki')
+    end 
+     
+    it 'should pass when argument is the correct type'
+      personWithPets.should.receive('addPet').with_args(an_instance_of(String))
+      personWithPets.addPet('suki')
+    end
+    
+    it 'should pass when return type is correct'
+      personWithPets.should.receive('addPet').and_return(an_instance_of(Array))
+      personWithPets.addPet('suki')
+    end
+    
+    it 'should pass when checking the type of multiple args and return types'
+      personWithPets.should.receive('addPets').with_args(an_instance_of(String), an_instance_of(String)).and_return(an_instance_of(Array))
+      personWithPets.addPets('suki', 'max')
+    end
+    
+    it 'should pass with negation when a method is not called'
+      personWithPets.should.not.receive('addPets')
+    end
+    
+    it 'should pass with negation with args'
+      personWithPets.should.not.receive('addPets').with_args('izzy')
+      personWithPets.addPets('max')
+    end
+    
+    it 'should pass with negation with return values'
+      personWithPets.should.not.receive('addPets').with_args('izzy').and_return('test')
+      personWithPets.addPets('izzy')
+    end
+    
+    it 'should pass with negation with times'
+      personWithPets.should.not.receive('addPets', 'twice')
+      personWithPets.addPets('izzy')
+    end
+                            
+    it 'should fail when the method does not exist'
+      person.should.receive('getPets')
+    end
+    
+    it 'should fail when the method is never invoked'
+      personWithPets.should.receive('getPets')
+    end
+    
     it 'should fail when improper value is returned'
       personWithPets.should.receive('getPets').and_return(['niko'])
       personWithPets.getPets()
     end
     
+    it 'should fail when checking the type of multiple args and return types'
+      personWithPets.should.receive('addPets').with_args(an_instance_of(String), an_instance_of(Array)).and_return(an_instance_of(Array))
+      personWithPets.addPets('suki', 'max')
+    end
+        
     it 'should fail when not invoked the expected number of times'
       personWithPets.should.receive('getPets', 'twice').and_return(['izzy'])
       personWithPets.getPets()
@@ -326,71 +385,45 @@ describe 'Matchers'
       personWithPets.getPets()
     end
     
-    it 'should pass when invoked the expected number of times'
-      personWithPets.should.receive('getPets', 'twice').and_return(['izzy'])
-      personWithPets.getPets()
-      personWithPets.getPets()
-    end
-    
     it 'should fail when not invoked with specific arguments'
       personWithPets.should.receive('addPet', 'once').with_args('suki')
       personWithPets.addPet('niko')
     end
     
-    it 'should pass when a method is invoked with specific arguments'
-      personWithPets.should.receive('addPet', 'once').with_args('suki')
-      personWithPets.addPet('suki')
-    end
-    
     it 'should fail when expecting multiple arguments'
       personWithPets.should.receive('addPets').with_args('suki', 'max')
       personWithPets.addPets('suki')
     end
     
-    it 'should pass with multiple arguments'
-      personWithPets.should.receive('addPets').with_args('suki', 'max')
-      personWithPets.addPets('suki', 'max')
-    end
-    
-    it 'should pass with arguments and return value'
-      personWithPets.should.receive('addPet').with_args('suki').and_return(['izzy', 'suki'])
-      personWithPets.addPet('suki')
-    end
-    
     it 'should fail when argument is of the wrong type'
       personWithPets.should.receive('addPet').with_args(an_instance_of(String))
       personWithPets.addPet(['suki'])
     end
     
-    it 'should pass when argument is the correct type'
-      personWithPets.should.receive('addPet').with_args(an_instance_of(String))
-      personWithPets.addPet('suki')
-    end
-    
     it 'should fail when return type is incorrect'
       personWithPets.should.receive('addPet').and_return(an_instance_of(String))
       personWithPets.addPet('suki')
     end
         
-    it 'should pass when return type is correct'
-      personWithPets.should.receive('addPet').and_return(an_instance_of(Array))
-      personWithPets.addPet('suki')
+    it 'should fail with negation when a method is called'
+      personWithPets.should.not.receive('addPets')
+      personWithPets.addPets('izzy')
     end
-    
-    it 'should fail when checking the type of multiple args and return types'
-      personWithPets.should.receive('addPets').with_args(an_instance_of(String), an_instance_of(Array)).and_return(an_instance_of(Array))
-      personWithPets.addPets('suki', 'max')
+
+    it 'should fail with negation with args'
+      personWithPets.should.not.receive('addPets').with_args('izzy')
+      personWithPets.addPets('izzy')
     end
-        
-    it 'should pass when checking the type of multiple args and return types'
-      personWithPets.should.receive('addPets').with_args(an_instance_of(String), an_instance_of(String)).and_return(an_instance_of(Array))
-      personWithPets.addPets('suki', 'max')
+    
+    it 'should fail with negation with return values'
+      personWithPets.should.not.receive('addPets').with_args('izzy').and_return(an_instance_of(Array))
+      personWithPets.addPets('izzy')
     end
     
-    it 'should pass when checking for method calls to core prototypes'
-      array = ['foo', 'bar']
-      array.should.receive('toString').and_return('foo,bar')
-      'array: ' + array
+    it 'should fail with negation with times'
+      personWithPets.should.not.receive('addPets', 'twice')
+      personWithPets.addPets('izzy')
+      personWithPets.addPets('max')
     end
   end
   

data/spec/spec.modules.js

@@ -0,0 +1,70 @@
+
+describe 'JSpec'
+  describe 'module'
+    describe 'hooks'
+      before_each
+        addedBeforeSpecHook = true
+      end
+      
+      after_each
+        addedAfterSpecHook = true
+      end
+      
+      it 'should run in context with beforeSpec'
+        addedBeforeSpec.should.be_true
+        addedAfterSpec.should.be_false
+        addedAfterSpecHook.should.be_false
+      end
+      
+      it 'should run beforeSpec BEFORE the before_each blocks'
+        addedBeforeSpecHook.should.be_true
+      end
+
+      it 'should run in context with afterSpec'
+        addedBeforeSpec.should.be_true
+        addedAfterSpec.should.be_true
+      end
+      
+      it 'should run afterSpec BEFORE after_each blocks'
+        addedAfterSpecHook.should.be_true
+      end
+
+      it 'should run in context with beforeSuite'
+        addedBeforeSuite.should.be_true
+      end
+
+      describe 'another suite'
+        it 'should run in context with afterSuite'
+          addedAfterSuite.should.be_true
+        end
+      end
+    end
+    
+    describe '.hook()'
+      it 'should invoke hooks, returning an array of results'
+        results = hook('randomHook', 'foo', 'bar')
+        results.should.eql [['foo', 'bar']]
+      end
+    end
+    
+    describe '.utilities'
+      it 'should be merged with the default utilities'
+        doFoo().should.eql 'foo'
+        doBar().should.eql 'bar'
+      end
+    end
+    
+    describe '.matchers'
+      it 'should be merged with default matchers'
+        'test'.should.be_foo_bar
+      end
+    end
+    
+    describe '.DSLs'
+      it 'should be merged with default DSLs'
+        JSpec.DSLs.snake.some_snake_case_stuff().should.be_true
+        JSpec.DSLs.camel.someCamelCaseStuff().should.be_true
+      end
+    end
+  end
+end

data/spec/spec.rhino.js

@@ -1,5 +1,6 @@
 
 load('lib/jspec.js')
+load('spec/modules.js')
 load('spec/spec.grammar-less.js')
 
 JSpec
@@ -8,5 +9,6 @@ JSpec
 .exec('spec/spec.matchers.js')
 .exec('spec/spec.utils.js')
 .exec('spec/spec.shared-behaviors.js')
+.exec('spec/spec.modules.js')
 .run({ formatter : JSpec.formatters.Terminal, failuresOnly : true })
 .report()

data/spec/spec.server.html

@@ -3,6 +3,7 @@
 		<script src="jquery-1.3.1.js"></script>
 		<script src="jspec.js"></script>
 		<script src="jspec.jquery.js"></script>
+		<script src="modules.js"></script>
 		<script src="spec.grammar-less.js"></script>
 		<script>
 			function runSuites() {
@@ -13,6 +14,7 @@
 				.exec('spec.utils.js')
 				.exec('spec.shared-behaviors.js')
 				.exec('spec.jquery.js')
+				.exec('spec.modules.js')
 				.run()
 				.reportToServer()
 			}

data/spec/spec.shared-behaviors.js

@@ -21,6 +21,7 @@ describe 'Shared Behaviors'
 
       it 'should have access to all permissions'
         user.may('edit pages').should.be_true
+        user.may('delete users').should.be_true
       end
 
       describe 'Super Administrator'
@@ -34,7 +35,35 @@ describe 'Shared Behaviors'
       end
     end
   end
-
+  
+  describe 'User with toString()'
+    before
+      user = { toString : function() { return '<User tj>' }}
+    end
+    
+    it 'should return &lt;User NAME&gt;'
+      user.toString().should.match(/\<User/)
+    end
+  end
+  
+  describe 'Manager'
+    should_behave_like('User')
+    should_behave_like('User with toString()')
+    
+    before
+      Manager = function(name) { this.name = name }
+      Manager.prototype.may = function(perm){ return perm == 'hire' || perm == 'fire' }
+      Manager.prototype.toString = function(){ return '<User ' + this.name + '>' }
+      user = new Manager('tj')
+    end
+    
+    it 'should have access to hire or fire employees'
+      user.may('hire').should.be_true
+      user.may('fire').should.be_true
+      user.may('do anything else').should.be_false
+    end
+  end
+  
   describe 'findSuite'
     it 'should find a suite by full description'
       JSpec.findSuite('Shared Behaviors User Administrator').should.be_a JSpec.Suite

data/spec/spec.utils.js

@@ -38,6 +38,29 @@ describe 'Utility'
         foo.destub()
         foo.bar().should.eql 'baz'
       end
+      
+      it 'should stub methods starting with an underscore'
+        object._foo = function(){ return 'bar' }
+        object.stub('_foo').and_return('something else')
+        object._foo().should.eql 'something else'
+        object.destub()
+        object._foo().should.eql 'bar'
+      end
+      
+      it 'should stub methods with whitespace'
+        object['foo bar'] = function(){ return 'rawr' }
+        object.stub('foo bar').and_return('baz')
+        object['foo bar']().should.eql 'baz'
+        object.destub()
+        object['foo bar']().should.eql 'rawr'
+      end
+      
+      it 'should stub with arbitrary method when no return value is set'
+        object.stub(' super cool ')
+        object[' super cool '].should.be_a Function
+        destub(object)
+        object[' super cool '].should.be_null
+      end
     end
     
     describe 'destub()'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-jspec
 version: !ruby/object:Gem::Version 
-  version: 2.4.3
+  version: 2.5.0
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-02 00:00:00 -07:00
+date: 2009-07-03 00:00:00 -07:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,12 +71,14 @@ files:
 - spec/async
 - spec/env.js
 - spec/jquery-1.3.1.js
+- spec/modules.js
 - spec/spec.dom.html
 - spec/spec.grammar-less.js
 - spec/spec.grammar.js
 - spec/spec.jquery.js
 - spec/spec.js
 - spec/spec.matchers.js
+- spec/spec.modules.js
 - spec/spec.rhino.js
 - spec/spec.server.html
 - spec/spec.shared-behaviors.js