visionmedia-jspec 2.7.0 → 2.7.1

data/History.rdoc

@@ -1,4 +1,12 @@
 
+=== 2.7.1 / 2009-07-17
+
+* Changed; hash() now accepts null
+* Fixed should_receive issue with validating boolean args or return values
+* Fixed --server-only switch
+* Fixed jQuery dependency error message when jQuery is not available
+  when using jspec.jquery.js
+
 === 2.7.0 / 2009-07-14
 
 * Added fixture() utility function

data/Manifest

@@ -20,7 +20,6 @@ spec/env.js
 spec/fixtures/test.html
 spec/fixtures/test.json
 spec/fixtures/test.xml
-spec/jquery-1.3.1.js
 spec/modules.js
 spec/spec.dom.html
 spec/spec.grammar-less.js

data/README.rdoc

@@ -624,6 +624,7 @@ Or run via the terminal using Rhino:
 * Syntax comparison with other frameworks http://gist.github.com/92283
 * Get the TextMate bundle at https://github.com/visionmedia/jspec.tmbundle/tree
 * For more information consult the JSpec source code documentation or visit http://visionmedia.github.com/jspec
+* jQuery + HTML fixture example http://gist.github.com/147831
 
 == Contributors
 

data/bin/jspec

@@ -11,7 +11,7 @@ require 'fileutils'
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '2.7.0'
+program :version, '2.7.1'
 program :description, 'JavaScript BDD Testing Framework'
 default_command :bind
 
@@ -95,6 +95,8 @@ command :run do |c|
     if options.rhino
       spec = args.shift || path_to('spec.rhino.js')
       action = lambda { rhino spec }
+    elsif options.server_only
+      start_server options, nil
     elsif options.server
       spec = args.shift || path_to('spec.server.html')
       action = lambda { start_server options, spec }

data/jspec.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "2.7.0"
+  s.version = "2.7.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-07-14}
+  s.date = %q{2009-07-17}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}
   s.executables = ["jspec"]
   s.extra_rdoc_files = ["bin/jspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "README.rdoc"]
-  s.files = ["bin/jspec", "History.rdoc", "jspec.gemspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "Manifest", "Rakefile", "README.rdoc", "server/browsers.rb", "server/server.rb", "spec/async", "spec/env.js", "spec/fixtures/test.html", "spec/fixtures/test.json", "spec/fixtures/test.xml", "spec/jquery-1.3.1.js", "spec/modules.js", "spec/spec.dom.html", "spec/spec.grammar-less.js", "spec/spec.grammar.js", "spec/spec.jquery.js", "spec/spec.js", "spec/spec.matchers.js", "spec/spec.modules.js", "spec/spec.node.js", "spec/spec.rhino.js", "spec/spec.server.html", "spec/spec.shared-behaviors.js", "spec/spec.utils.js", "templates/default/History.rdoc", "templates/default/lib/yourlib.core.js", "templates/default/README.rdoc", "templates/default/spec/spec.core.js", "templates/default/spec/spec.dom.html", "templates/default/spec/spec.rhino.js", "templates/default/spec/spec.server.html", "templates/rails/spec.application.js", "templates/rails/spec.dom.html", "templates/rails/spec.rhino.js", "templates/rails/spec.server.html"]
+  s.files = ["bin/jspec", "History.rdoc", "jspec.gemspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "Manifest", "Rakefile", "README.rdoc", "server/browsers.rb", "server/server.rb", "spec/async", "spec/env.js", "spec/fixtures/test.html", "spec/fixtures/test.json", "spec/fixtures/test.xml", "spec/modules.js", "spec/spec.dom.html", "spec/spec.grammar-less.js", "spec/spec.grammar.js", "spec/spec.jquery.js", "spec/spec.js", "spec/spec.matchers.js", "spec/spec.modules.js", "spec/spec.node.js", "spec/spec.rhino.js", "spec/spec.server.html", "spec/spec.shared-behaviors.js", "spec/spec.utils.js", "templates/default/History.rdoc", "templates/default/lib/yourlib.core.js", "templates/default/README.rdoc", "templates/default/spec/spec.core.js", "templates/default/spec/spec.dom.html", "templates/default/spec/spec.rhino.js", "templates/default/spec/spec.server.html", "templates/rails/spec.application.js", "templates/rails/spec.dom.html", "templates/rails/spec.rhino.js", "templates/rails/spec.server.html"]
   s.homepage = %q{http://visionmedia.github.com/jspec}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Jspec", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/jspec.jquery.js

@@ -1,12 +1,13 @@
 
 // JSpec - jQuery - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
 
-JSpec.include({
+JSpec
+.requires('jQuery', 'when using jspec.jquery.js')
+.include({
   
   // --- Initialize
   
   init : function() {
-    this.requires('jQuery', 'when using jspec.jquery.js')
     jQuery.ajaxSetup({ async : false })
   },
   

data/lib/jspec.js

@@ -5,7 +5,7 @@
 
   JSpec = {
 
-    version   : '2.7.0',
+    version   : '2.7.1',
     cache     : {},
     suites    : [],
     modules   : [],
@@ -49,6 +49,22 @@
         return { an_instance_of : constructor }
       },
       
+      /**
+       * Load fixture at _path_. This utility function
+       * supplies the means to resolve, and cache fixture contents
+       * via the DOM or Rhino.
+       *
+       * Fixtures are resolved as:
+       *
+       *  - <path>
+       *  - fixtures/<path>
+       *  - fixtures/<path>.html
+       *
+       * @param  {string} path
+       * @return {string}
+       * @api public
+       */
+      
       fixture : function(path) {
         if (JSpec.cache[path]) return JSpec.cache[path]
         function tryLoading(path) {
@@ -293,6 +309,8 @@
           })
         },
         
+        // Check if any calls have passing results
+        
         anyResultsPass : function() {
           return any(this.calls, function(call){
             return self.expectedResult.an_instance_of ?
@@ -301,6 +319,8 @@
           })
         },
         
+        // Return the passing result
+        
         passingResult : function() {
           return this.anyResultsPass().result
         },
@@ -316,6 +336,7 @@
         anyArgsFail : function() {
           return any(this.calls, function(call){
             return any(self.expectedArgs, function(i, arg){
+              if (arg == null) return call.args[i] == null
               return arg.an_instance_of ?
                        call.args[i].constructor != arg.an_instance_of:
                          hash(arg) != hash(call.args[i])
@@ -324,6 +345,8 @@
           })
         },
         
+        // Check if any arguments pass
+        
         anyArgsPass : function() {
           return any(this.calls, function(call){
             return any(self.expectedArgs, function(i, arg){
@@ -335,6 +358,8 @@
           })
         },
         
+        // Return the passing args
+        
         passingArgs : function() {
           return this.anyArgsPass().args
         },
@@ -361,7 +386,7 @@
             return n > 2 ?  n + ' times' : { 1 : 'once', 2 : 'twice' }[n]
           }
           
-          if (this.expectedResult && (negate ? this.anyResultsPass() : this.anyResultsFail()))
+          if (this.expectedResult != null && (negate ? this.anyResultsPass() : this.anyResultsFail()))
             this.message = methodString + ' to return ' + puts(this.expectedResult) + 
               ' but ' + (negate ? 'it did' : 'got ' + puts(this.failingResult())) 
 
@@ -532,9 +557,6 @@
     
     Module : function(methods) {
       extend(this, methods)
-      extend(this, {
-        requires : JSpec.requires
-      })
     },
     
     // --- DSLs
@@ -813,6 +835,7 @@
      */
 
     hash : function(object) {
+      if (object == null) return 'null'
       if (object == undefined) return 'undefined'
       serialize = function(prefix) {
         return inject(object, prefix + ':', function(buffer, key, value){
@@ -1367,6 +1390,7 @@
      *
      * @param  {string} dependency
      * @param  {string} message (optional)
+     * @return {JSpec}
      * @api public
      */
 
@@ -1374,6 +1398,7 @@
       hook('requiring', dependency, message)
       try { eval(dependency) }
       catch (e) { throw 'JSpec depends on ' + dependency + ' ' + message }
+      return this
     },
 
     /**

data/spec/spec.dom.html

@@ -1,7 +1,7 @@
 <html>
 	<head>
 		<link type="text/css" rel="stylesheet" href="../lib/jspec.css" />
-		<script src="jquery-1.3.1.js"></script>
+		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.1/jquery.min.js"></script>
 		<script src="../lib/jspec.js"></script>
 		<script src="../lib/jspec.jquery.js"></script>
 		<script src="modules.js"></script>

data/spec/spec.matchers.js

@@ -362,7 +362,38 @@ describe 'Matchers'
       personWithPets.should.not.receive('addPets', 'twice')
       personWithPets.addPets('izzy')
     end
-                            
+    
+    it 'should pass with boolean args'
+      foo = { bar : function(arg){ return arg }}
+      foo.should.receive('bar', 'twice').with_args(true)
+      foo.bar(true)
+      foo.bar(true)
+    end
+    
+    it 'should pass with null args'
+      foo = { bar : function(arg){ return arg }}
+      foo.should.receive('bar').with_args(null)
+      foo.bar(null)
+    end
+    
+    it 'should pass with boolean return value true'
+      foo = { bar : function(){ return true }}
+      foo.should.receive('bar').and_return(true)
+      foo.bar()
+    end
+    
+    it 'should pass with boolean return value false'
+      foo = { bar : function(){ return false }}
+      foo.should.receive('bar').and_return(false)
+      foo.bar()
+    end
+    
+    it 'should pass with null return value'
+      foo = { bar : function(){ return null }}
+      foo.should.receive('bar').and_return(null)
+      foo.bar()
+    end
+                                     
     it 'should fail when the method does not exist'
       person.should.receive('getPets')
     end
@@ -432,6 +463,24 @@ describe 'Matchers'
       personWithPets.addPets('izzy')
       personWithPets.addPets('max')
     end
+    
+    it 'should fail with boolean args'
+      foo = { bar : function(arg){ return arg }}
+      foo.should.receive('bar').with_args(true)
+      foo.bar(false)
+    end
+    
+    it 'should fail with boolean return value true'
+      foo = { bar : function(){ return true }}
+      foo.should.receive('bar').and_return(false)
+      foo.bar()
+    end
+    
+    it 'should fail with boolean return value false'
+      foo = { bar : function(){ return false }}
+      foo.should.receive('bar').and_return(true)
+      foo.bar()
+    end
   end
   
 end

data/spec/spec.rhino.js

@@ -10,5 +10,5 @@ JSpec
 .exec('spec/spec.utils.js')
 .exec('spec/spec.shared-behaviors.js')
 .exec('spec/spec.modules.js')
-.run({ formatter : JSpec.formatters.Terminal, failuresOnly : true })
+.run({ formatter : JSpec.formatters.Terminal, failuresOnly : false })
 .report()

data/spec/spec.server.html

@@ -1,6 +1,6 @@
 <html>
 	<head>
-		<script src="jquery-1.3.1.js"></script>
+		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.1/jquery.min.js"></script>
 		<script src="jspec.js"></script>
 		<script src="jspec.jquery.js"></script>
 		<script src="modules.js"></script>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-jspec
 version: !ruby/object:Gem::Version 
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-14 00:00:00 -07:00
+date: 2009-07-17 00:00:00 -07:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +73,6 @@ files:
 - spec/fixtures/test.html
 - spec/fixtures/test.json
 - spec/fixtures/test.xml
-- spec/jquery-1.3.1.js
 - spec/modules.js
 - spec/spec.dom.html
 - spec/spec.grammar-less.js