jspec 4.1.0 → 4.2.0

data/History.md

@@ -1,4 +1,13 @@
 
+4.2.0 / 2010-04-07
+==================
+
+  * Merge branch 'master' of git://github.com/vipulb/jspec into xml
+  * Added support for mock requests to parse xml
+  * Added have_event_handlers matcher
+  * Adding be_animated matcher
+  * Add option "disableColors" to disable coloring in terminal reporter
+
 4.1.0 / 2010-03-25
 ==================
 

data/README.md

@@ -238,12 +238,14 @@ The following options may be passed to _JSpec.run()_.
  - have_value     
  - have_class
  - have_classes
+ - have_event_handlers
  - be_visible
  - be_hidden
  - be_enabled
  - be_disabled
  - be_selected
  - be_checked
+ - be_animated
  
 ## Growl Support
 
@@ -327,7 +329,7 @@ To destub a method simply call `destub()` at any time:
 
     destub(person, 'toString')
   
-If you would like to whipe an object clear of stubs simply pass it
+If you would like to wipe an object clear of stubs simply pass it
 to `destub()` without an additional method argument:
 
     destub(person)
@@ -460,7 +462,11 @@ The mock_request().and_return signature is as follows:
     mock_request().and_return(<data>, [content-type], [response-status-code], [headers-hash])
   
 At the moment `mock_request()` itself does not accept any arguments, however in the future
-this will be used to target specific uris for mocking.
+this will be used to target specific URIs for mocking.
+
+Also, if the content-type of response is specified as XML, as specified in the XMLHttpRequest 
+draft specification at : http://www.w3.org/TR/XMLHttpRequest/, the responseXML attribute of the response
+will be an XML document generated by parsing the response body.
 
 **NOTE**: works with Rhino as well
 
@@ -519,7 +525,7 @@ requests to sync, which preserves execution order, and reports correctly.
       })
     end
 
-## Grammer Pre-processor
+## Grammar Pre-processor
 
 The pre-processing capability of JSpec is extremely powerful. Your JavaScript
 code is not necessarily what it seems. For example when you seemingly invoke a
@@ -563,7 +569,7 @@ Any text placed after **__END__** is considered irrelevant and
 is striped out before evaluation. This is sometimes useful for
 document or code reference while writing specs. 
 
-For example when writting regression specs it is sometimes useful
+For example when writing regression specs it is sometimes useful
 to paste the issue ticket's comment(s) below this area for reference. 
 
 ## Formatters
@@ -987,7 +993,7 @@ your _spec/server.rb_ file may support additional browsers.
 ## Contributors
 
 Many ideas and bug reports were contributed by
-the following developers, thankyou for making
+the following developers, thank you for making
 JSpec more enjoyable, and bug free. If I have 
 missed you on this list please let me know 
 (aka the fellow who donated [jspec.info](http://jspec.info))

data/bin/jspec

@@ -12,7 +12,7 @@ require 'src/installables'
 require 'src/server'
 
 program :name, 'JSpec'
-program :version, '4.1.0'
+program :version, '4.2.0'
 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.1.0"
+  s.version = "4.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2010-03-25}
+  s.date = %q{2010-04-07}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}

data/lib/jspec.jquery.js

@@ -24,7 +24,7 @@ JSpec
   
   // --- Matchers
   
-  matchers : {
+  matchers : {    
     have_tag      : "jQuery(expected, actual).length === 1",
     have_one      : "alias have_tag",
     have_tags     : "jQuery(expected, actual).length > 1",
@@ -36,7 +36,8 @@ JSpec
     have_value    : "jQuery(actual).val() === expected",
     be_enabled    : "!jQuery(actual).attr('disabled')",
     have_class    : "jQuery(actual).hasClass(expected)",
-    
+    be_animated   : "jQuery(actual).queue().length > 0",        
+        
     be_visible : function(actual) {
       return jQuery(actual).css('display') != 'none' &&
              jQuery(actual).css('visibility') != 'hidden' &&
@@ -46,7 +47,7 @@ JSpec
     be_hidden : function(actual) {
       return !JSpec.does(actual, 'be_visible')
     },
-
+    
     have_classes : function(actual) {
       return !JSpec.any(JSpec.toArray(arguments, 1), function(arg){
         return !JSpec.does(actual, 'have_class', arg)
@@ -58,6 +59,12 @@ JSpec
                      jQuery(actual).attr(attr)
     },
     
+    have_event_handlers : function(actual, expected) {
+      return jQuery(actual).data('events') ?
+        jQuery(actual).data('events').hasOwnProperty(expected) :
+          false
+    },
+    
     'be disabled selected checked' : function(attr) {
       return 'jQuery(actual).attr("' + attr + '")'
     },

data/lib/jspec.js

@@ -4,7 +4,7 @@
 ;(function(){
 
   JSpec = {
-    version   : '4.1.0',
+    version   : '4.2.0',
     assert    : true,
     cache     : {},
     suites    : [],
@@ -894,17 +894,21 @@
      */
     
     color : function(string, color) {
-      return "\u001B[" + {
-       bold    : 1,
-       black   : 30,
-       red     : 31,
-       green   : 32,
-       yellow  : 33,
-       blue    : 34,
-       magenta : 35,
-       cyan    : 36,
-       white   : 37
-      }[color] + 'm' + string + "\u001B[0m"
+      if (option('disableColors')) {
+        return string
+      } else {
+        return "\u001B[" + {
+         bold    : 1,
+         black   : 30,
+         red     : 31,
+         green   : 32,
+         yellow  : 33,
+         blue    : 34,
+         magenta : 35,
+         cyan    : 36,
+         white   : 37
+        }[color] + 'm' + string + "\u001B[0m"
+      }
     },
     
     /**
@@ -1070,6 +1074,26 @@
       }
     },
 
+    /**
+     * Parse an XML String and return a 'document'.
+     *
+     * @param {string} text
+     * @return {document}
+     * @api public
+     */
+
+    parseXML : function(text) {
+      var xmlDoc
+      if (window.DOMParser)
+        xmlDoc = (new DOMParser()).parseFromString(text, "text/xml")
+      else {
+        xmlDoc = new ActiveXObject("Microsoft.XMLDOM")
+        xmlDoc.async = "false"
+        xmlDoc.loadXML(text)
+      }
+      return xmlDoc
+    },
+
     /**
      * Escape HTML.
      *

data/lib/jspec.xhr.js

@@ -2,28 +2,29 @@
 // JSpec - XHR - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
 
 (function(){
-  
+
   var lastRequest
-  
+
   // --- Original XMLHttpRequest
-  
-  var OriginalXMLHttpRequest = 'XMLHttpRequest' in this ? 
+
+  var OriginalXMLHttpRequest = 'XMLHttpRequest' in this ?
                                  XMLHttpRequest :
                                    function(){}
   var OriginalActiveXObject = 'ActiveXObject' in this ?
                                  ActiveXObject :
                                    undefined
-                                   
+
   // --- MockXMLHttpRequest
 
   var MockXMLHttpRequest = function() {
     this.requestHeaders = {}
   }
-  
+
   MockXMLHttpRequest.prototype = {
     status: 0,
     async: true,
     readyState: 0,
+	  responseXML: null,
     responseText: '',
     abort: function(){},
     onreadystatechange: function(){},
@@ -35,7 +36,7 @@
     getAllResponseHeaders : function(){
       return this.responseHeaders
     },
-    
+
     /**
      * Return case-insensitive value for header _name_.
      */
@@ -43,7 +44,7 @@
     getResponseHeader : function(name) {
       return this.responseHeaders[name.toLowerCase()]
     },
-    
+
     /**
      * Set case-insensitive _value_ for header _name_.
      */
@@ -51,7 +52,7 @@
     setRequestHeader : function(name, value) {
       this.requestHeaders[name.toLowerCase()] = value
     },
-    
+
     /**
      * Open mock request.
      */
@@ -65,7 +66,7 @@
       if (async != undefined) this.async = async
       if (this.async) this.onreadystatechange()
     },
-    
+
     /**
      * Send request _data_.
      */
@@ -77,14 +78,26 @@
       if (this.method == 'HEAD') this.responseText = null
       this.responseHeaders['content-length'] = (this.responseText || '').length
       if(this.async) this.onreadystatechange()
+	    this.populateResponseXML()
       lastRequest = function(){
         return self
       }
-    }
+    },
+
+	/**
+	 * Parse request body and populate responseXML if response-type is xml
+	 * Based on the standard specification : http://www.w3.org/TR/XMLHttpRequest/
+	 */
+	populateResponseXML: function() {
+		var type = this.getResponseHeader("content-type")
+		if (!type || !this.responseText || !type.match(/(text\/xml|application\/xml|\+xml$)/g))
+			return
+		this.responseXML = JSpec.parseXML(this.responseText)
+	  }
   }
-  
+
   // --- Response status codes
-  
+
   JSpec.statusCodes = {
     100: 'Continue',
     101: 'Switching Protocols',
@@ -128,7 +141,7 @@
     504: 'Gateway Timeout',
     505: 'HTTP Version Not Supported'
   }
-  
+
   /**
    * Mock XMLHttpRequest requests.
    *
@@ -137,7 +150,7 @@
    * @return {hash}
    * @api public
    */
-  
+
   function mockRequest() {
     return { and_return : function(body, type, status, headers) {
       XMLHttpRequest = MockXMLHttpRequest
@@ -153,18 +166,18 @@
       })
     }}
   }
-  
+
   /**
    * Unmock XMLHttpRequest requests.
    *
    * @api public
    */
-  
+
   function unmockRequest() {
     XMLHttpRequest = OriginalXMLHttpRequest
     ActiveXObject = OriginalActiveXObject
   }
-  
+
   JSpec.include({
     name: 'Mock XHR',
 
@@ -180,9 +193,9 @@
     afterSpec : function() {
       unmockRequest()
     },
-    
+
     // --- DSLs
-    
+
     DSLs : {
       snake : {
         mock_request: mockRequest,
@@ -192,4 +205,4 @@
     }
 
   })
-})()
+})()

data/spec/unit/spec.jquery.js

@@ -113,6 +113,14 @@ describe 'jQuery'
         $('select', elem).should.not.have_classes 'foo', 'save'
       end
     end
+    
+    describe 'have_event_handlers'
+      it 'should check if an element has handlers for a given event'
+        elem.should.not.have_event_handlers 'click'
+        elem.bind('click', function(){})
+        elem.should.have_event_handlers 'click'
+      end
+    end
 
     describe 'be_visible'
       it 'should check that an element is not hidden or set to display of none'
@@ -139,6 +147,14 @@ describe 'jQuery'
       end
     end
     
+    describe 'be_animated'            
+      it 'should check if an element is currently animated'
+        elem.should.not.be_animated
+        elem.fadeIn(1000)
+        elem.should.be_animated
+      end
+    end
+    
     describe 'have_ATTR'
       it 'should check if an attribute exists'
         '<input type="checkbox"/>'.should.have_type

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 4
-  - 1
+  - 2
   - 0
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 -07:00
+date: 2010-04-07 00:00:00 -07:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency