visionmedia-jspec 2.4.2 → 2.4.3

data/History.rdoc

@@ -1,4 +1,10 @@
 
+=== 2.4.3 / 2009-07-02
+
+* Fixed matcher semicolon matcher issue when using the JSpec grammar
+* Added pass() util; Spec#pass() and Spec#fail() (thanks gisikw)
+* Removing Object.prototype.stubby() after specs are finished to prevent pollution
+
 === 2.4.2 / 2009-06-30
 
 * Fixed trailing comma (thanks Kevin)

data/bin/jspec

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

data/jspec.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "2.4.2"
+  s.version = "2.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-06-30}
+  s.date = %q{2009-07-02}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}

data/lib/jspec.js

@@ -5,7 +5,7 @@
 
   JSpec = {
 
-    version   : '2.4.2',
+    version   : '2.4.3',
     suites    : [],
     modules   : [],
     allSuites : [],
@@ -428,6 +428,20 @@
         description : description,
         assertions : [],
         
+        // Add passing assertion
+        
+        pass : function(message) {
+          this.assertions.push({ passed : true, message : message })
+          ++JSpec.stats.passes
+        },
+        
+        // Add failing assertion
+        
+        fail : function(message) {
+          this.assertions.push({ passed : false, message : message })
+          ++JSpec.stats.failures
+        },
+                
         // Run deferred assertions
         
         runDeferredAssertions : function() {
@@ -555,7 +569,7 @@
      * hook return values is returned.
      *
      * @param  {name} string
-     * @param  {mixed} args ...
+     * @param  {...} args
      * @return {array}
      * @api private
      */
@@ -780,7 +794,7 @@
     /**
      * Convert object(s) to a print-friend string.
      *
-     * @param  {object, ...} object
+     * @param  {...} object
      * @return {string}
      * @api public
      */
@@ -1174,8 +1188,8 @@
         replace(/end(?=\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)').
-        replace(/([\/\s]*)(.+?)\.(should(?:[_\.]not)?)[_\.](\w+)\((.*)\)$/gm, '$1 expect($2).$3($4, $5)').
+        replace(/\.should([_\.]not)?[_\.](\w+)(?: |;|$)(.*)$/gm, '.should$1_$2($3)').
+        replace(/([\/\s]*)(.+?)\.(should(?:[_\.]not)?)[_\.](\w+)\((.*)\)\s*;?$/gm, '$1 expect($2).$3($4, $5)').
         replace(/, \)/gm, ')').
         replace(/should\.not/gm, 'should_not')
     },
@@ -1259,8 +1273,19 @@
      */
      
      fail : function(message) {
-       JSpec.currentSpec.assertions.push({ passed : false, message : message })
-       JSpec.stats.failures++
+       JSpec.currentSpec.fail(message)
+     },
+     
+     
+     /**
+      * Report a passing assertion for the current spec.
+      *
+      * @param  {string} message
+      * @api public
+      */
+      
+     pass : function(message) {
+       JSpec.currentSpec.pass(message)
      },
 
     /**
@@ -1423,8 +1448,8 @@
 
   var main = this
   var find = JSpec.any
-  var utils = 'haveStopped stub hookImmutable hook destub map any last fail range each option inject select error escape \
-               extend puts hash query strip color does addMatchers callIterator argumentsToArray'.split(/\s+/)
+  var utils = 'haveStopped stub hookImmutable hook destub map any last pass fail range each option inject select \
+               error escape extend puts hash query strip color does addMatchers callIterator argumentsToArray'.split(/\s+/)
   while (utils.length) util = utils.shift(), eval('var ' + util + ' = JSpec.' + util)
   if (!main.setTimeout) main.setTimeout = function(callback){ callback() }
 

data/spec/spec.grammar.js

@@ -16,6 +16,12 @@ describe 'Grammar'
     true.should.be_true()
   end
   
+  it 'should allow semicolons'
+    true.should.be_true;
+    true.should.be_true();
+    true.should.be_true() ;
+  end
+  
   it 'should allow parens to be optional with args'
     'foobar'.should.include 'foo'
     'rawr'.should.not_include 'foo'

data/spec/spec.utils.js

@@ -1,5 +1,18 @@
 
 describe 'Utility'
+  describe 'fail()'
+    it 'should fail the current spec'
+      fail('I failed!')
+    end
+  end
+  
+  describe 'pass()'
+    it 'should pass the current spec'
+      pass('yay')
+      pass('wahoo')
+    end
+  end
+  
   describe 'stubbing'
     before_each
       Object.prototype.stubby = function() { return 'Not stubbed' }
@@ -7,6 +20,10 @@ describe 'Utility'
       stub(object, 'stubby').and_return('Im stubbed')
       stub(object, 'toString').and_return('<No im not>')
     end
+    
+    after_each
+      delete Object.prototype.stubby
+    end
 
     describe 'stub()'
       it 'should stub :)'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-jspec
 version: !ruby/object:Gem::Version 
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-30 00:00:00 -07:00
+date: 2009-07-02 00:00:00 -07:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency