visionmedia-jspec 2.2.0 → 2.2.1

data/History.rdoc

@@ -1,4 +1,19 @@
 
+=== 2.2.1 / 2009-06-22
+
+* Changed; reportToServer() now accepts url arg
+
+* Fixed be_empty matcher; now considers {} empty, however { foo : bar } is not
+* Fixed throw_error error messages for Opera
+* Fixed throw_error in Rhino (Opera is broken now)
+* Fixed stray console.log() call
+
+* Fixed some tab issues.
+  When using the JSpec grammar option you should
+  use the 'soft tabs' feature of your IDE or text editor.
+  A patch for tabs is pending and should be available soon,
+  however be aware that a 'parse error' may occur otherwise.
+
 === 2.2.0 / 2009-06-18
 
 * Added link to JSpec in JSMag June 2009

data/README.rdoc

@@ -134,7 +134,7 @@ JSpec.options.failuresOnly = true, and ?failuresOnly=1 will both work.
   - be_at_least        >=
   - be_at_most         <=
   - be_null            == null
-  - be_empty           length of 0
+  - be_empty           length < 0 or {}
   - be_true            == true
   - be_false           == false
   - be_type            be type of x
@@ -206,7 +206,6 @@ For more examples view spec/spec.matchers.js
 
   * Core
 
-  - wait             delay execution of a spec for the duration set (async support)
   - an_instance_of   used in conjunction with the 'receive' matcher
                 
   * jQuery      
@@ -247,19 +246,6 @@ common functionality. For example an Admin, would inherit all specs of User:
 
 NOTE: both User and Administrator's before hooks implement the 'user' variable
 
-== Async Support Using wait()
-
-When using jQuery with JSpec all requests are switched to sync, allowing specs
-to run naturally, however when testing functionality using setTimeout, setInterval etc
-JSpec supplies the wait() utility to delay a spec from running:
-
-  it 'should wait for n milliseconds'
-    wait(2, 'seconds')
-    setTimeout(function(){
-      true.should.be true
-    }, 1500)
-  end
-
 == Hooks
 
 Currently the following hooks are supported, and may be utilized any number of times as they
@@ -461,6 +447,11 @@ Initialize project with:
 
 Run with:
   $ jspec run --server
+  
+== Known Issues
+
+* 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).
 
 == More Information
 

data/bin/jspec

@@ -10,7 +10,7 @@ require 'fileutils'
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '2.2.0'
+program :version, '2.2.1'
 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.2.0"
+  s.version = "2.2.1"
 
   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-18}
+  s.date = %q{2009-06-22}
   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.2.0',
+    version   : '2.2.1',
     suites    : [],
     allSuites : [],
     matchers  : {},
@@ -44,25 +44,6 @@
       
       an_instance_of : function(constructor) {
         return { an_instance_of : constructor }
-      },
-      
-      /**
-       * Sets the current spec's wait duration to _n_.
-       *
-       *   wait(3000)
-       *   wait(1, 'second')
-       *   wait(3, 'seconds')
-       *
-       * @param  {number} n
-       * @param  {string} unit
-       * @api public
-       */
-      
-      wait : function(n, unit) {
-        JSpec.currentSpec.wait = {
-          'second'  : n * 1000,
-          'seconds' : n * 1000
-        }[unit] || n
       }
     },
 
@@ -1045,14 +1026,14 @@
 
     preprocess : function(input) {
       return input.
-        replace(/describe (.*?)$/gm, 'describe($1, function(){').
-        replace(/ it (.*?)$/gm, ' it($1, function(){').
+        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(?= |\n|$)/gm, '});').
+        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(/([\/ ]*)(.+?)\.(should(?:[_\.]not)?)[_\.](\w+)\((.*)\)$/gm, '$1 expect($2).$3($4, $5)').
+        replace(/([\/\s]*)(.+?)\.(should(?:[_\.]not)?)[_\.](\w+)\((.*)\)$/gm, '$1 expect($2).$3($4, $5)').
         replace(/, \)/gm, ')').
         replace(/should\.not/gm, 'should_not')
     },
@@ -1072,18 +1053,6 @@
       else               while (--current >= end) values.push(current)
       return '[' + values + ']'
     },
-    
-    /**
-     * Call _callback_ when all specs have finished.
-     *
-     * @param  {function} callback
-     * @api public
-     */
-    
-    whenFinished : function(callback) {
-      if (this.stats.specsFinished >= this.stats.specs) callback()
-      else setTimeout(function(){ JSpec.whenFinished(callback) }, 50)
-    },
 
     /**
      * Report on the results. 
@@ -1092,11 +1061,9 @@
      */
 
     report : function() {
-      this.whenFinished(function() {
-        JSpec.options.formatter ? 
-          new JSpec.options.formatter(JSpec, JSpec.options):
-            new JSpec.formatters.DOM(JSpec, JSpec.options)
-      })
+      JSpec.options.formatter ? 
+        new JSpec.options.formatter(JSpec, JSpec.options):
+          new JSpec.formatters.DOM(JSpec, JSpec.options)
     },
 
     /**
@@ -1116,20 +1083,6 @@
       return this
     },
     
-    /**
-     * When the current spec's wait duration has passed
-     * the _callback_ will be called.
-     *
-     * @param  {function} callback
-     * @api public
-     */
-    
-    whenCurrentSpecIsFinished : function(callback) {
-      if (this.currentSpec && this.currentSpec.wait)
-        setTimeout(callback, this.currentSpec.wait)
-      else callback()
-    },
-
     /**
      * Run a suite.
      *
@@ -1143,11 +1096,9 @@
       suite.ran = true
       suite.hook('before')
       each(suite.specs, function(spec) {
-        JSpec.whenCurrentSpecIsFinished(function(){
-          suite.hook('before_each')
-          JSpec.runSpec(spec)
-          suite.hook('after_each')
-        })
+        suite.hook('before_each')
+        JSpec.runSpec(spec)
+        suite.hook('after_each')
       })
       if (suite.hasSuites()) {
         each(suite.suites, function(suite) {
@@ -1248,16 +1199,15 @@
     },
 
     /**
-     * Report back to server with statistics.
+     * Report to server with statistics.
      *
+     * @param  {string} url
      * @api private
      */
     
-    reportToServer : function() {
-      this.whenFinished(function(){
-        JSpec.post('http://localhost:4444', 'passes=' + JSpec.stats.passes + '&failures=' + JSpec.stats.failures)
-  			if ('close' in main) main.close()
-      })
+    reportToServer : function(url) {
+      JSpec.post(url || 'http://localhost:4444', 'passes=' + JSpec.stats.passes + '&failures=' + JSpec.stats.failures)
+			if ('close' in main) main.close()
     },
     
     /**
@@ -1359,7 +1309,6 @@
     be_an              : "alias be_a",
     be_an_instance_of  : "actual instanceof expected",
     be_null            : "actual == null",
-    be_empty           : "actual.length == 0",
     be_true            : "actual == true",
     be_false           : "actual == false",
     be_type            : "typeof actual == expected",
@@ -1381,6 +1330,13 @@
       JSpec.currentSpec.assertions.push(proxy)
       return proxy
     }},
+    
+    be_empty : function(actual) {
+      if (actual.constructor == Object && actual.length == undefined)
+        for (var key in actual)
+          return false;
+      return !actual.length
+    },
 
     include : function(actual) {
       for (state = true, i = 1; i < arguments.length; i++) {
@@ -1411,11 +1367,10 @@
       catch (e) {
         this.e = e
         var assert = function(arg) {
-          console.log(e.constructor);
           switch (arg.constructor) {
             case RegExp   : return arg.test(e)
-            case Function : return e.constructor == arg
             case String   : return arg == (e.message || e.toString())
+            case Function : return (e.name || 'Error') == arg.name
           }
         }
         return message ? assert(expected) && assert(message) :
@@ -1428,13 +1383,10 @@
         if (expected[i] == undefined) return 'exception'
         switch (expected[i].constructor) {
           case RegExp   : return 'exception matching ' + puts(expected[i])
-          case Function : return expected[i].name
           case String   : return 'exception of ' + puts(expected[i])
+          case Function : return expected[i].name || 'Error'
         }
       }
-      if (expected[1] == Error && expected[2] == 'oh no!') {
-        console.log(expected);
-      }
       exception = message_for(1) + (expected[2] ? ' and ' + message_for(2) : '')
       return 'expected ' + exception + (negate ? ' not ' : '' ) +
                ' to be thrown, but ' + (this.e ? 'got ' + puts(this.e) : 'nothing was')
@@ -1472,4 +1424,5 @@
     }
   })
 
-})()
+})()
+

data/spec/spec.grammar.js

@@ -1,11 +1,12 @@
 
 describe 'Grammar'
   
-  it 'should allow "it" spec literal'
+  it  'should allow "it" spec literal'
     true.should.be_true
   end
   
   n = 10
+  
   it 'should allow literal javascript outside of blocks'
     n.should.eql 10
   end

data/spec/spec.js

@@ -61,7 +61,7 @@ describe 'Negative specs'
     -{ throw new TypeError('oh no') }.should.throw_error(Error)
   end
   
-  it 'should should fail saying multiple arg messages'
+  it 'should fail saying multiple arg messages'
     -{ throw new TypeError('oh no') }.should.throw_error(TypeError, /foo/)
   end
   

data/spec/spec.matchers.js

@@ -58,11 +58,16 @@ describe 'Matchers'
   end
   
   describe 'be_empty'
-    it 'should consider any object responding to a length of 0 to be empty'
+    it 'should consider any object with zero length to be empty'
       ''.should.be_empty
       ' '.should.not.be_empty
       [].should.be_empty
       { length : 0 }.should.be_empty
+      {}.should.be_empty
+      'cookies'.should.not.be_empty
+      [0].should.not.be_empty
+      { length : 1 }.should.not.be_empty
+      { foo : 'bar' }.should.not.be_empty
     end
   end
   
@@ -196,7 +201,8 @@ describe 'Matchers'
     it 'should check if an error of a specific constructor is thrown'
       -{ throw new Error('foo') }.should.throw_error(Error)
       -{ throw new TypeError('foo') }.should.throw_error(TypeError)
-      -{ throw 'foo' }.should.not.throw_error(Error)
+      -{ throw 'foo' }.should.throw_error Error
+      -{ throw 'foo' }.should.not.throw_error TypeError
     end
     
     it 'should check if an error with a specific constructor and message is thrown'

data/spec/spec.utils.js

@@ -1,21 +1,5 @@
 
 describe 'Utility'
-  describe 'wait'
-    it 'should wait for n milliseconds'
-      wait(2000)
-      setTimeout(function(){
-        true.should.be true
-      }, 1500)
-    end
-    
-    it 'should wait for n seconds'
-      wait(3, 'seconds')
-      setTimeout(function(){
-        true.should.be true
-      }, 2500)
-    end
-  end
-  
   describe 'query'
     it 'should return a pairs value'
       query('suite', '?suite=Positive%20specs').should.equal 'Positive specs'
@@ -135,4 +119,10 @@ describe 'Utility'
       JSpec.currentSpec.assertions.should.have_length 0
     end
   end
+  
+  describe 'contentsOf'
+    it 'should return a function body'
+      JSpec.contentsOf(-{ return 'foo' }).should.include 'return', 'foo'
+    end
+  end
 end

metadata

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