jspec 4.2.0 → 4.2.1

data/History.md

@@ -1,4 +1,10 @@
 
+4.2.1 / 2010-04-15
+==================
+
+  * Fixed; strict type checks for have_prop[erty]
+  * Removed some globals
+
 4.2.0 / 2010-04-07
 ==================
 

data/bin/jspec

@@ -12,7 +12,7 @@ require 'src/installables'
 require 'src/server'
 
 program :name, 'JSpec'
-program :version, '4.2.0'
+program :version, '4.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 = "4.2.0"
+  s.version = "4.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{2010-04-07}
+  s.date = %q{2010-04-15}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}

data/lib/jspec.js

@@ -4,7 +4,7 @@
 ;(function(){
 
   JSpec = {
-    version   : '4.2.0',
+    version   : '4.2.1',
     assert    : true,
     cache     : {},
     suites    : [],
@@ -260,14 +260,14 @@
     },
     
     ProxyAssertion : function(object, method, times, negate) {
-      var self = this
-      var old = object[method]
+      var self = this,
+          old = object[method]
       
       // Proxy
       
       object[method] = function(){
-        args = toArray(arguments)
-        result = old.apply(object, args)
+        var args = toArray(arguments),
+            result = old.apply(object, args)
         self.calls.push({ args : args, result : result })
         return result
       }
@@ -960,6 +960,7 @@
      */
     
     normalizeMatcherBody : function(body) {
+      var captures
       switch (body.constructor) {
         case String:
           if (captures = body.match(/^alias (\w+)/)) return JSpec.matchers[last(captures)]
@@ -1151,7 +1152,7 @@
       function assert(matcher, args, negate) {
         var expected = toArray(args, 1)
         matcher.negate = negate  
-        assertion = new JSpec.Assertion(matcher, actual, expected, negate)
+        var assertion = new JSpec.Assertion(matcher, actual, expected, negate)
         hook('beforeAssertion', assertion)
         if (matcher.defer) assertion.run()
         else JSpec.currentSpec.assertions.push(assertion.run().report()), hook('afterAssertion', assertion)
@@ -1269,6 +1270,7 @@
       */
      
      destub : function(object, method) {
+       var captures
        if (method) {
          if (object['__prototype__' + method])
            delete object[method]
@@ -1786,7 +1788,7 @@
     have_length_within : "actual.length >= expected[0] && actual.length <= last(expected)",
     
     receive : { defer : true, match : function(actual, method, times) {
-      proxy = new JSpec.ProxyAssertion(actual, method, times, this.negate)
+      var proxy = new JSpec.ProxyAssertion(actual, method, times, this.negate)
       JSpec.currentSpec.assertions.push(proxy)
       return proxy
     }},
@@ -1799,8 +1801,8 @@
     },
 
     include : function(actual) {
-      for (state = true, i = 1; i < arguments.length; i++) {
-        arg = arguments[i]
+      for (var state = true, i = 1; i < arguments.length; i++) {
+        var arg = arguments[i]
         switch (actual.constructor) {
           case String: 
           case Number:
@@ -1847,39 +1849,39 @@
           case Function : return expected[i].name || 'Error'
         }
       }
-      exception = message_for(1) + (expected[2] ? ' and ' + message_for(2) : '')
+      var 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')
     }},
     
     have : function(actual, length, property) {
-      return actual[property].length == length
+      return actual[property] == null ? false : actual[property].length == length
     },
     
     have_at_least : function(actual, length, property) {
-      return actual[property].length >= length
+      return actual[property] == null ? (length === 0) : actual[property].length >= length
     },
     
     have_at_most :function(actual, length, property) {
-      return actual[property].length <= length
+      return actual[property] == null || actual[property].length <= length
     },
     
     have_within : function(actual, range, property) {
-      length = actual[property].length
+      var length = actual[property] == undefined ? 0 : actual[property].length
       return length >= range.shift() && length <= range.pop()
     },
     
     have_prop : function(actual, property, value) {
-      return actual[property] == null || 
+      return actual[property] === undefined ||
                actual[property] instanceof Function ? false:
-                 value == null ? true:
+                 value === undefined ? true:
                    does(actual[property], 'eql', value)
     },
     
     have_property : function(actual, property, value) {
-      return actual[property] == null ||
+      return actual[property] === undefined ||
                actual[property] instanceof Function ? false:
-                 value == null ? true:
+                 value === undefined ? true:
                    value === actual[property]
     }
   })

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 4
   - 2
-  - 0
-  version: 4.2.0
+  - 1
+  version: 4.2.1
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -07:00
+date: 2010-04-15 00:00:00 -07:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency