visionmedia-jspec 2.0.0 → 2.0.1

data/History.rdoc

@@ -1,4 +1,9 @@
 
+=== 2.0.1 / 2009-05-01
+
+* Added better failure messages for throw_error matcher
+* Renamed print() to puts() [#108]
+
 === 2.0.0 / 2009-04-27
 
 * Added DOM loading indicator [#105]

data/bin/jspec

@@ -10,7 +10,7 @@ require 'fileutils'
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '2.0.0'
+program :version, '2.0.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.0.0"
+  s.version = "2.0.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-04-27}
+  s.date = %q{2009-05-01}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}
@@ -18,12 +18,12 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Jspec", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{jspec}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{JavaScript BDD Testing Framework}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<visionmedia-commander>, [">= 3.2.9"])

data/lib/jspec.js

@@ -5,7 +5,7 @@
 
   var JSpec = {
 
-    version   : '2.0.0',
+    version   : '2.0.1',
     suites    : [],
     allSuites : [],
     matchers  : {},
@@ -81,13 +81,13 @@
        */
 
       DOM : function(results, options) {
-        id = option('reportToId') || 'jspec'
-        report = document.getElementById(id)
-        failuresOnly = option('failuresOnly')
-        classes = results.stats.failures ? 'has-failures' : ''
+        var id = option('reportToId') || 'jspec'
+        var report = document.getElementById(id)
+        var failuresOnly = option('failuresOnly')
+        var classes = results.stats.failures ? 'has-failures' : ''
         if (!report) throw 'JSpec requires the element #' + id + ' to output its reports'
 
-        markup =
+        var markup =
         '<div id="jspec-report" class="' + classes + '"><div class="heading">           \
         <span class="passes">Passes: <em>' + results.stats.passes + '</em></span>       \
         <span class="failures">Failures: <em>' + results.stats.failures + '</em></span> \
@@ -101,7 +101,7 @@
         }
         
         renderSuite = function(suite) {
-          displaySuite = failuresOnly ? suite.ran && !suite.passed() : suite.ran
+          var displaySuite = failuresOnly ? suite.ran && !suite.passed() : suite.ran
           if (displaySuite && suite.hasSpecs()) {
             markup += '<tr class="description"><td colspan="2">' + suite.description + '</td></tr>'
             each(suite.specs, function(i, spec){
@@ -150,7 +150,7 @@
            if (displaySuite && suite.hasSpecs()) {
              puts(color(' ' + suite.description, 'bold'))
              each(suite.specs, function(spec){
-               assertionsGraph = inject(spec.assertions, '', function(graph, assertion){
+               var assertionsGraph = inject(spec.assertions, '', function(graph, assertion){
                  return graph + color('.', assertion.passed ? 'green' : 'red')
                })
                if (spec.requiresImplementation())
@@ -189,7 +189,7 @@
           if (suite.ran) {
             console.group(suite.description)
             each(suite.specs, function(spec){
-              assertionCount = spec.assertions.length + ':'
+              var assertionCount = spec.assertions.length + ':'
               if (spec.requiresImplementation())
                 console.warn(spec.description)
               else if (spec.passed())
@@ -233,9 +233,9 @@
         run : function() {
           // TODO: remove unshifting of expected
           expected.unshift(actual == null ? null : actual.valueOf())
-          this.result = matcher.match.apply(JSpec, expected)
+          this.result = matcher.match.apply(this, expected)
           this.passed = negate ? !this.result : this.result
-          if (!this.passed) this.message = matcher.message(actual, expected, negate, matcher.name)
+          if (!this.passed) this.message = matcher.message.call(this, actual, expected, negate, matcher.name)
           return this
         }
       })
@@ -330,8 +330,9 @@
         // Run the assertion
                 
         run : function() {
-          methodString = 'expected ' + object.toString() + '.' + method + '()'
-          times = function(n) {
+          var methodString = 'expected ' + object.toString() + '.' + method + '()'
+          
+          function times(n) {
             return n > 2 ?  n + ' times' : { 1 : 'once', 2 : 'twice' }[n]
           }
           
@@ -340,12 +341,12 @@
             ', but ' +  (this.calls.length == 0 ? ' was not called' : ' was called ' + times(this.calls.length))
               
           if (this.expectedResult && this.anyResultsFail())
-            this.message = methodString + ' to return ' + print(this.expectedResult) + 
-              ' but got ' + print(this.failingResult())
+            this.message = methodString + ' to return ' + puts(this.expectedResult) + 
+              ' but got ' + puts(this.failingResult())
               
           if (this.expectedArgs && this.anyArgsFail())
-            this.message = methodString + ' to be called with ' + print.apply(this, this.expectedArgs) +
-             ' but was called with ' + print.apply(this, this.failingArgs())
+            this.message = methodString + ' to be called with ' + puts.apply(this, this.expectedArgs) +
+             ' but was called with ' + puts.apply(this, this.failingArgs())
                 
           if (!this.message.length) 
             this.passed = true
@@ -376,7 +377,7 @@
         // Add a spec to the suite
 
         addSpec : function(description, body) {
-          spec = new JSpec.Spec(description, body)
+          var spec = new JSpec.Spec(description, body)
           this.specs.push(spec)
           JSpec.stats.specs++ // TODO: abstract
           spec.suite = this
@@ -391,7 +392,7 @@
         // Add a nested suite
 
         addSuite : function(description, body) {
-          suite = new JSpec.Suite(description, body)
+          var suite = new JSpec.Suite(description, body)
           JSpec.allSuites.push(suite)
           suite.name = suite.description
           suite.description = this.description + ' ' + suite.description
@@ -554,7 +555,7 @@
     
     shareBehaviorsOf : function(description) {
       if (suite = this.findSuite(description)) this.copySpecs(suite, this.currentSuite)
-      else throw 'failed to share behaviors. ' + print(description) + ' is not a valid Suite name'
+      else throw 'failed to share behaviors. ' + puts(description) + ' is not a valid Suite name'
     },
     
     /**
@@ -581,7 +582,7 @@
      */
     
     argumentsToArray : function(arguments, offset) {
-      args = []
+      var args = []
       for (i = 0; i < arguments.length; i++) args.push(arguments[i])
       return args.slice(offset || 0)
     },
@@ -616,10 +617,10 @@
      */
     
     defaultMatcherMessage : function(actual, expected, negate, name) {
-      return 'expected ' + print(actual) + ' to ' + 
+      return 'expected ' + puts(actual) + ' to ' + 
                (negate ? 'not ' : '') + 
                   name.replace(/_/g, ' ') +
-                    ' ' + print.apply(this, expected.slice(1))
+                    ' ' + puts.apply(this, expected.slice(1))
     },
     
     /**
@@ -730,10 +731,10 @@
      * @api public
      */
 
-    print : function(object) {
+    puts : function(object) {
       if (arguments.length > 1) {
         return map(argumentsToArray(arguments), function(arg){
-          return print(arg)
+          return puts(arg)
         }).join(', ')
       }
       if (object === undefined) return ''
@@ -741,7 +742,7 @@
       if (object === true) return 'true'
       if (object === false) return 'false'
       if (object.an_instance_of) return 'an instance of ' + object.an_instance_of.name
-      if (object.jquery && object.selector.length > 0) return 'selector ' + print(object.selector) + ''
+      if (object.jquery && object.selector.length > 0) return 'selector ' + puts(object.selector) + ''
       if (object.jquery) return escape(object.html())
       if (object.nodeName) return escape(object.outerHTML)
       switch (object.constructor) {
@@ -749,11 +750,11 @@
         case Number: return object
         case Array : 
           return inject(object, '[', function(b, v){
-            return b + ', ' + print(v)
+            return b + ', ' + puts(v)
           }).replace('[,', '[') + ' ]'
         case Object:
           return inject(object, '{', function(b, k, v) {
-            return b + ', ' + print(k) + ' : ' + print(v)
+            return b + ', ' + puts(k) + ' : ' + puts(v)
           }).replace('{,', '{') + ' }'
         default: 
           return escape(object.toString())
@@ -794,7 +795,7 @@
       */
      
      does : function(actual, matcher, expected) {
-       assertion = new JSpec.Assertion(JSpec.matchers[matcher], actual, argumentsToArray(arguments, 2))
+       var assertion = new JSpec.Assertion(JSpec.matchers[matcher], actual, argumentsToArray(arguments, 2))
        return assertion.run().result
      },
 
@@ -812,7 +813,7 @@
 
     expect : function(actual) {
       assert = function(matcher, args, negate) {
-        expected = []
+        var expected = []
         for (i = 1; i < args.length; i++) expected.push(args[i])        
         assertion = new JSpec.Assertion(matcher, actual, expected, negate)
         if (matcher.defer) assertion.run()
@@ -1000,7 +1001,7 @@
      */
     
     describe : function(description, body) {
-      suite = new JSpec.Suite(description, body)
+      var suite = new JSpec.Suite(description, body)
       this.allSuites.push(suite)
       this.suites.push(suite)
     },
@@ -1027,10 +1028,10 @@
      */
 
     evalBody : function(body, errorMessage) {
-      dsl = this.DSL || this.DSLs.snake
-      matchers = this.matchers
-      context = this.context || this.defaultContext
-      contents = this.contentsOf(body)
+      var dsl = this.DSL || this.DSLs.snake
+      var matchers = this.matchers
+      var context = this.context || this.defaultContext
+      var contents = this.contentsOf(body)
       try { eval('with (dsl){ with (context) { with (matchers) { ' + contents + ' }}}') }
       catch(e) { error(errorMessage, e) }
     },
@@ -1067,7 +1068,7 @@
      */
 
     range : function(start, end) {
-      current = parseInt(start), end = parseInt(end), values = [current]
+      var current = parseInt(start), end = parseInt(end), values = [current]
       if (end > current) while (++current <= end) values.push(current)
       else               while (--current >= end) values.push(current)
       return '[' + values + ']'
@@ -1212,7 +1213,7 @@
      */
 
     query : function(key, queryString) {
-      queryString = (queryString || (main.location ? main.location.search : null) || '').substring(1)
+      var queryString = (queryString || (main.location ? main.location.search : null) || '').substring(1)
       return inject(queryString.split('&'), null, function(value, pair){
         parts = pair.split('=')
         return parts[0] == key ? parts[1].replace(/%20|\+/gmi, ' ') : value
@@ -1241,7 +1242,7 @@
      */
     
     post : function(url, data) {
-      request = this.xhr()
+      var request = this.xhr()
       request.open('POST', url, false)
       request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded')
       request.send(data)
@@ -1294,7 +1295,7 @@
 
     load : function(file) {
       if (this.hasXhr()) {
-        request = this.xhr()
+        var request = this.xhr()
         request.open('GET', file, false)
         request.send(null)
         if (request.readyState == 4) return request.responseText
@@ -1322,7 +1323,6 @@
   // --- Utility functions
 
   var main   = this
-  var puts   = main.print
   var map    = JSpec.map
   var any    = JSpec.any
   var find   = JSpec.any
@@ -1336,7 +1336,7 @@
   var error  = JSpec.error
   var escape = JSpec.escape
   var extend = JSpec.extend
-  var print  = JSpec.print
+  var puts  = JSpec.puts
   var hash   = JSpec.hash
   var query  = JSpec.query
   var strip  = JSpec.strip
@@ -1407,9 +1407,10 @@
       return true
     },
 
-    throw_error : function(actual, expected) {
+    throw_error : { match : function(actual, expected) {
       try { actual() }
       catch (e) {
+        this.e = e
         if (expected == undefined) return true
         switch (expected.constructor) {
           case RegExp   : return expected.test(e)
@@ -1417,7 +1418,19 @@
           case String   : return expected == e.toString()
         }
       }
-    },
+    }, message : function(actual, expected, negate) {
+      // TODO: fix when expected is ONLY expected values
+      expected = (function(){
+        if (expected[1] == undefined) return 'exception'
+        switch (expected[1].constructor) {
+          case RegExp   : return 'exception matching ' + puts(expected[1])
+          case Function : return 'instance of ' + expected[1].name
+          case String   : return 'exception of ' + puts(expected[1])
+        }
+      })()
+      return 'expected ' + (negate ? 'no ' : 'an ' ) + expected + 
+               ' to be thrown, but ' + (this.e ? 'got ' + puts(this.e) : 'nothing was')
+    }},
     
     have : function(actual, length, property) {
       return actual[property].length == length

data/spec/spec.js

@@ -41,6 +41,29 @@ describe 'Negative specs'
     -{ throw 'foo' }.should.not.throw_error
   end
   
+  it 'should fail saying which error has been thrown'
+    -{ throw 'foo' }.should.throw_error 'bar'
+  end
+  
+  it 'should fail saying no error was thrown'
+    -{ }.should.throw_error 'foo'
+  end
+  
+  it 'should fail saying no error matching was thrown'
+    -{ throw 'bar' }.should.throw_error(/foo/)
+  end
+  
+  it 'should fail saying no error matching foo should be thrown'
+    -{ throw 'foo' }.should.not.throw_error(/foo/)
+  end
+  
+  it 'should fail with constructor name'
+    function Foo(){}
+    function Bar(){}
+    Bar.prototype.toString = function(){ return 'Bar error: oh no' }
+    -{ throw new Bar }.should.throw_error Foo
+  end
+  
   it 'should fail with message of first failure'
     true.should.be_true
     'bar'.should.match(/foo/gm)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-jspec
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 -07:00
+date: 2009-05-01 00:00:00 -07:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,7 +114,7 @@ requirements: []
 rubyforge_project: jspec
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: JavaScript BDD Testing Framework
 test_files: []