visionmedia-jspec 2.8.1 → 2.8.2

data/History.rdoc

@@ -1,4 +1,10 @@
 
+=== 2.8.2 / 2009-07-29
+
+* Added JSpec.tryLoading()
+* Added JSpec.request used to reference the original XMLHttpRequest; used to fix [#149]
+* Fixed Mock XHR issue messing up JSpec request related utilities such as fixture() [#149]
+
 === 2.8.1 / 2009-07-27
 
 * Added Lawrence Pit as a contributor

data/bin/jspec

@@ -11,7 +11,7 @@ require 'fileutils'
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '2.8.1'
+program :version, '2.8.2'
 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.8.1"
+  s.version = "2.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-07-27}
+  s.date = %q{2009-07-29}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}

data/lib/jspec.js

@@ -5,13 +5,14 @@
 
   JSpec = {
 
-    version   : '2.8.1',
+    version   : '2.8.2',
     cache     : {},
     suites    : [],
     modules   : [],
     allSuites : [],
     matchers  : {},
     stubbed   : [],
+    request   : 'XMLHttpRequest' in this ? XMLHttpRequest : null,
     stats     : { specs : 0, assertions : 0, failures : 0, passes : 0, specsFinished : 0, suitesFinished : 0 },
     options   : { profile : false },
 
@@ -67,17 +68,13 @@
       
       fixture : function(path) {
         if (JSpec.cache[path]) return JSpec.cache[path]
-        function tryLoading(path) {
-          try { return JSpec.load(path) }
-          catch (e) {}
-        }
         return JSpec.cache[path] = 
-          tryLoading(path) ||
-          tryLoading('fixtures/' + path) ||
-          tryLoading('fixtures/' + path + '.html') ||
-          tryLoading('spec/' + path) ||
-          tryLoading('spec/fixtures/' + path) ||
-          tryLoading('spec/fixtures/' + path + '.html')
+          JSpec.tryLoading(path) ||
+          JSpec.tryLoading('fixtures/' + path) ||
+          JSpec.tryLoading('fixtures/' + path + '.html') ||
+          JSpec.tryLoading('spec/' + path) ||
+          JSpec.tryLoading('spec/fixtures/' + path) ||
+          JSpec.tryLoading('spec/fixtures/' + path + '.html')
       }
     },
 
@@ -1466,14 +1463,12 @@
     /**
      * Instantiate an XMLHttpRequest.
      *
-     * @return {ActiveXObject, XMLHttpRequest}
+     * @return {XMLHttpRequest, ActiveXObject}
      * @api private
      */
     
     xhr : function() {
-      return 'XMLHttpRequest' in main ?
-               new XMLHttpRequest:
-                 new ActiveXObject("Microsoft.XMLHTTP")
+      return new (JSpec.request || ActiveXObject("Microsoft.XMLHTTP"))
     },
     
     /**
@@ -1484,7 +1479,21 @@
      */
     
     hasXhr : function() {
-      return 'XMLHttpRequest' in main || 'ActiveXObject' in main
+      return JSpec.request || 'ActiveXObject' in main
+    },
+    
+    /**
+     * Try loading _file_ returning the contents
+     * string or null. Chain to locate / read a file.
+     *
+     * @param  {string} file
+     * @return {string}
+     * @api public
+     */
+    
+    tryLoading : function(file) {
+      try { return JSpec.load(file) }
+      catch (e) {}
     },
 
     /**

data/spec/spec.jquery.xhr.js

@@ -9,6 +9,13 @@ describe 'jQuery'
       })
     end
     
+    it 'should work with a json fixture'
+      mockRequest().and_return(fixture('test.json'))
+      $.getJSON('foo', function(response){
+        response.users.tj.email.should.eql 'tj@vision-media.ca'
+      })
+    end
+    
     it 'should not invoke callback when response status is 4xx'
       mockRequest().and_return('foo', 'text/plain', 404)
       $.getJSON('foo', function(){

data/spec/spec.utils.js

@@ -268,6 +268,7 @@ describe 'Utility'
       JSpec.cache['test'].should.eql contents
       JSpec.cache['test'] = 'foo'
       fixture('test').should.eql 'foo'
+      delete JSpec.cache['test']
     end
   end
 end

data/spec/spec.xhr.js

@@ -16,14 +16,14 @@ describe 'JSpec'
     describe 'mock response'
       before_each
         mockRequest().and_return('bar', 'text/plain', 200, { 'x-foo' : 'bar' })
-        request = JSpec.xhr()
+        request = new XMLHttpRequest
         request.open('GET', 'path', false, 'foo', 'bar')
         request.send('foo=bar')
       end
       
       it 'should allow setting respose status'
         mockRequest().and_return('bar', 'text/plain', 404)
-        request = JSpec.xhr()
+        request = new XMLHttpRequest
         request.open('GET', 'path', false)
         request.send(null)
         request.status.should.eql 404
@@ -31,7 +31,7 @@ describe 'JSpec'
       end
       
       it 'should default readyState to 0'
-        request = JSpec.xhr()
+        request = new XMLHttpRequest
         request.readyState.should.eql 0
       end
       
@@ -83,10 +83,17 @@ describe 'JSpec'
         request.getResponseHeader('X-Foo').should.eql 'bar'
       end
       
+      it 'should not interrupt JSpec request related functionality'
+        mockRequest().and_return('fail')
+        (JSpec.tryLoading('async') || JSpec.tryLoading('spec/async')).should.eql 'cookies!'
+        fixture('test').should.eql '<p>test</p>'
+        fixture('test.json').should.include '{ user'
+      end
+      
       describe '.onreadystatechange()'
         before_each
           mockRequest().and_return('bar', 'text/plain', 200)
-          request = JSpec.xhr()
+          request = new XMLHttpRequest
         end
         
         it 'should be called when opening request in context to the request'

metadata

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