jspec 2.11.10 → 2.11.12

data/History.rdoc

@@ -1,8 +1,25 @@
 
+=== 2.11.12 / 2009-11-12
+
+* Changed; DOM formatter displaying several failure messages when present [#89]
+* Changed; displaying multiple error messages for Terminal formatter
+* Updated mock timers to 1.0.2
+* Fixed receive matcher negation issue with the number of times called [#150]
+
+=== 2.11.11 / 2009-10-23
+
+* Added cheat sheet install docs
+* Added Google Group link
+* Added sarah to contrib list
+* Changed Terminal formatter's java.lang.System.exit() -> quit()
+* Removed unnecessary flags from several regexps
+* Fixed DOM paths when using --freeze [#88]
+* Fixed __END__
+
 === 2.11.10 / 2009-10-19
 
-  * Fixed exit status with Terminal reporter [#77] [thanks darxriggs for reporting]
-    This is now fixed when using `jspec run --rhino` as well as `java -jar js.jar spec/spec.rhino.js`.
+* Fixed exit status with Terminal reporter [#77] [thanks darxriggs for reporting]
+  This is now fixed when using `jspec run --rhino` as well as `java -jar js.jar spec/spec.rhino.js`.
 
 === 2.11.9 / 2009-10-16
 

data/README.rdoc

@@ -77,6 +77,13 @@ You may optionally want to use sources in the /pkg directory
 for your project, since it includes compressed alternatives generated
 each release.
 
+== Cheat Sheet
+
+Using the bash cheat sheet library found at http://github.com/visionmedia/ch
+we can get quick cheat sheets for many aspects of development including JSpec!
+
+  $ cd /tmp && git clone git://github.com/visionmedia/ch.git && cd ch && sudo make install && ch jspec
+
 == Example
 
   describe 'ShoppingCart'
@@ -437,6 +444,15 @@ These are equivalent:
 The following expands to the array of [1,2,3,4,5]
 
   n.should.be_within 1..5
+  
+=== __END__
+
+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
+to paste the issue ticket's comment(s) below this area for reference. 
 
 == Formatters
 
@@ -774,6 +790,7 @@ your spec/server.rb file may support additional browsers.
   
 == More Information
 
+* Google Group http://groups.google.com/group/jspec
 * IRC Channel irc://irc.freenode.net#jspec
 * Featured article in JSMag: http://www.jsmag.com/main.issues.description/id=21/
 * Syntax comparison with other frameworks http://gist.github.com/92283

data/bin/jspec

@@ -12,7 +12,7 @@ require 'server/server'
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '2.11.10'
+program :version, '2.11.12'
 program :description, 'JavaScript BDD Testing Framework'
 default_command :bind
 
@@ -258,7 +258,11 @@ def replace_root_in dest, *paths
   
   paths.each do |path|
     path = File.join dest, path
-    contents = File.read(path).gsub 'JSPEC_ROOT', root
+    if path.include? 'dom'
+      contents = File.read(path).gsub 'JSPEC_ROOT/', ''
+    else
+      contents = File.read(path).gsub 'JSPEC_ROOT', root
+    end
     File.open(path, 'w') { |file| file.write contents }
   end
 end

data/jspec.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "2.11.10"
+  s.version = "2.11.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-10-19}
+  s.date = %q{2009-11-12}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}

data/lib/jspec.css

@@ -95,6 +95,8 @@ body.jspec {
   display: block;
 }
 #jspec-report tr td:first-child em {
+	display: block;
+	clear: both;
   font-style: normal;
   font-weight: normal;
   color: #7B8D9B;

data/lib/jspec.js

@@ -5,7 +5,7 @@
 
   JSpec = {
 
-    version   : '2.11.10',
+    version   : '2.11.12',
     cache     : {},
     suites    : [],
     modules   : [],
@@ -160,7 +160,9 @@
                       (spec.passed() && !failuresOnly) ?
                         '<td class="pass">' + escape(spec.description)+ '</td><td>' + spec.assertionsGraph() + '</td>' :
                           !spec.passed() ?
-                            '<td class="fail">' + escape(spec.description) + ' <em>' + escape(spec.failure().message) + '</em>' + '</td><td>' + spec.assertionsGraph() + '</td>' :
+                            '<td class="fail">' + escape(spec.description) + 
+  													map(spec.failures(), function(a){ return '<em>' + escape(a.message) + '</em>' }).join('') +
+ 														'</td><td>' + spec.assertionsGraph() + '</td>' :
                               '') +
                   '<tr class="body"><td colspan="2"><pre>' + bodyContents(spec.body) + '</pre></td></tr>'
               }).join('') + '</tr>'
@@ -196,7 +198,7 @@
                   print(color('  ' + spec.description, 'green') + assertionsGraph)
                 else if (!spec.passed())
                   print(color('  ' + spec.description, 'red') + assertionsGraph + 
-                        "\n" + indent(spec.failure().message) + "\n")
+                        "\n" + indent(map(spec.failures(), function(a){ return a.message }).join("\n")) + "\n")
               })
               print("")
             }
@@ -399,7 +401,7 @@
             this.message = methodString + ' to be called with ' + puts.apply(this, this.expectedArgs) +
              ' but was' + (negate ? '' : ' called with ' + puts.apply(this, this.failingArgs()))
 
-          if (negate ? !this.expectedResult && !this.expectedArgs && this.calls.length == this.times : this.calls.length != this.times)
+          if (negate ? !this.expectedResult && !this.expectedArgs && this.calls.length >= this.times : this.calls.length != this.times)
             this.message = methodString + ' to be called ' + times(this.times) + 
             ', but ' +  (this.calls.length == 0 ? ' was not called' : ' was called ' + times(this.calls.length))
                 
@@ -1340,8 +1342,9 @@
       if (typeof input != 'string') return
       input = hookImmutable('preprocessing', input)
       return input.
-        replace(/\t/gm, '  ').
-        replace(/\r\n|\n|\r/gm, '\n').
+        replace(/\t/g, '  ').
+        replace(/\r\n|\n|\r/g, '\n').
+        replace(/__END__[^]*/, '').
         replace(/([\w\.]+)\.(stub|destub)\((.*?)\)$/gm, '$2($1, $3)').
         replace(/describe\s+(.*?)$/gm, 'describe($1, function(){').
         replace(/^\s+it\s+(.*?)$/gm, ' it($1, function(){').
@@ -1351,9 +1354,8 @@
         replace(/(\d+)\.\.(\d+)/g, function(_, a, b){ return range(a, b) }).
         replace(/\.should([_\.]not)?[_\.](\w+)(?: |;|$)(.*)$/gm, '.should$1_$2($3)').
         replace(/([\/\s]*)(.+?)\.(should(?:[_\.]not)?)[_\.](\w+)\((.*)\)\s*;?$/gm, '$1 expect($2).$3($4, $5)').
-        replace(/, \)/gm, ')').
-        replace(/should\.not/gm, 'should_not').
-        replace(/__END__.*/m, '')
+        replace(/, \)/g, ')').
+        replace(/should\.not/g, 'should_not')
     },
 
     /**

data/lib/jspec.timers.js

@@ -1,5 +1,5 @@
 
-// JSpec - Mock Timers - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
+// Mock Timers - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
 
 ;(function(){
   
@@ -7,7 +7,7 @@
    * Version.
    */
    
-  mockTimersVersion = '1.0.1'
+  mockTimersVersion = '1.0.2'
   
   /**
    * Localized timer stack.
@@ -54,7 +54,7 @@
    * @api public
    */
 
-  clearInterval = function(id) {
+  clearInterval = clearTimeout = function(id) {
     return delete timers[--id]
   }
   

data/spec/spec.grammar.js

@@ -121,6 +121,16 @@ describe 'Grammar'
 		  true.should.be(true);
 		end
 	end
+	
+  describe "with some tabs"
+		before_each
+		  foo = 'baz'
+		end
+    
+    it 'should work'
+      foo.should.eql 'baz'
+    end
+  end
   
   describe 'with nested describe'
     it 'should work'
@@ -235,8 +245,7 @@ end
 
 __END__
 
-describe 'Grammar'
-  it 'should consider everything below __END__ a comment'
-    
-  end
-end
+this should not matter because it is
+considered a comment by the JSpec grammar :)
+and is sometimes useful for temp reference info 
+when writting specs.

data/spec/spec.matchers.js

@@ -456,10 +456,23 @@ describe 'Matchers'
       personWithPets.addPets('izzy')
     end
     
-    it 'should fail with negation with times'
-      personWithPets.should.not.receive('addPets', 'twice')
+    it 'should fail with negation when called once with no times specified'
+      personWithPets.should.not.receive('addPets')
+      personWithPets.addPets('izzy')
+    end
+    
+    it 'should fail with negation when called more than once with no times specified'
+      personWithPets.should.not.receive('addPets')
+      personWithPets.addPets('izzy')
+      personWithPets.addPets('izzy')
+    end
+        
+    it 'should fail with negation when called more than the times specified'
+      personWithPets.should.not.receive('addPets', 3)
+      personWithPets.addPets('izzy')
+      personWithPets.addPets('izzy')
+      personWithPets.addPets('izzy')
       personWithPets.addPets('izzy')
-      personWithPets.addPets('max')
     end
     
     it 'should fail with boolean args'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jspec
 version: !ruby/object:Gem::Version 
-  version: 2.11.10
+  version: 2.11.12
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 -07:00
+date: 2009-11-12 00:00:00 -08:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency