visionmedia-jspec 2.7.1 → 2.7.2

data/History.rdoc

@@ -1,4 +1,11 @@
 
+=== 2.7.2 / 2009-07-24
+
+* Fixed "end" in spec bodies when using the grammar
+* Fixed "it" in spec bodies when using the grammar [#142]
+* Changed; HTML entities in descriptions are now escaped for DOM formatter [#141]
+* Added enno84@gmx.net as a contributor (thanks for the bug reports)
+
 === 2.7.1 / 2009-07-17
 
 * Changed; hash() now accepts null

data/README.rdoc

@@ -634,6 +634,7 @@ JSpec more enjoyable, and bug free ;)
 
 * mpd@jesters-court.ne
 * kevin.gisi@gmail.com
+* enno84@gmx.net
 
 == License 
 

data/bin/jspec

@@ -11,7 +11,7 @@ require 'fileutils'
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '2.7.1'
+program :version, '2.7.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.7.1"
+  s.version = "2.7.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-17}
+  s.date = %q{2009-07-24}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}
@@ -17,7 +17,7 @@ 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.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{JavaScript BDD Testing Framework}
 
   if s.respond_to? :specification_version then

data/lib/jspec.js

@@ -5,7 +5,7 @@
 
   JSpec = {
 
-    version   : '2.7.1',
+    version   : '2.7.2',
     cache     : {},
     suites    : [],
     modules   : [],
@@ -118,15 +118,15 @@
         renderSuite = function(suite) {
           var displaySuite = failuresOnly ? suite.ran && !suite.passed() : suite.ran
           if (displaySuite && suite.hasSpecs()) {
-            markup += '<tr class="description"><td colspan="2">' + suite.description + '</td></tr>'
+            markup += '<tr class="description"><td colspan="2">' + escape(suite.description) + '</td></tr>'
             each(suite.specs, function(i, spec){
               markup += '<tr class="' + (i % 2 ? 'odd' : 'even') + '">'
               if (spec.requiresImplementation())
-                markup += '<td class="requires-implementation" colspan="2">' + spec.description + '</td>'
+                markup += '<td class="requires-implementation" colspan="2">' + escape(spec.description) + '</td>'
               else if (spec.passed() && !failuresOnly)
-                markup += '<td class="pass">' + spec.description+ '</td><td>' + spec.assertionsGraph() + '</td>'
+                markup += '<td class="pass">' + escape(spec.description)+ '</td><td>' + spec.assertionsGraph() + '</td>'
               else if(!spec.passed())
-                markup += '<td class="fail">' + spec.description + ' <em>' + spec.failure().message + '</em>' + '</td><td>' + spec.assertionsGraph() + '</td>'
+                markup += '<td class="fail">' + escape(spec.description) + ' <em>' + spec.failure().message + '</em>' + '</td><td>' + spec.assertionsGraph() + '</td>'
               markup += '<tr class="body"><td colspan="2"><pre>' + bodyContents(spec.body) + '</pre></td></tr>'
             })
             markup += '</tr>'
@@ -1259,9 +1259,9 @@
       return input.
         replace(/([\w\.]+)\.(stub|destub)\((.*?)\)$/gm, '$2($1, $3)').
         replace(/describe\s+(.*?)$/gm, 'describe($1, function(){').
-        replace(/\sit\s+(.*?)$/gm, ' it($1, function(){').
+        replace(/^\s+it\s+(.*?)$/gm, ' it($1, function(){').
         replace(/^(?: *)(before_each|after_each|before|after)(?= |\n|$)/gm, 'JSpec.currentSuite.addHook("$1", function(){').
-        replace(/\bend(?=\s|$)/gm, '});').
+        replace(/^\s*end(?=\s|$)/gm, '});').
         replace(/-\{/g, 'function(){').
         replace(/(\d+)\.\.(\d+)/g, function(_, a, b){ return range(a, b) }).
         replace(/\.should([_\.]not)?[_\.](\w+)(?: |;|$)(.*)$/gm, '.should$1_$2($3)').

data/spec/spec.grammar.js

@@ -11,6 +11,30 @@ describe 'Grammar'
     n.should.eql 10
   end
   
+  it 'should escape <html> in <p>descriptions</p> and body'
+    '<p></p>'.should.eql '<p></p>'
+  end
+  
+  it 'should parse correctly when "it" is within the body'
+    text = 'Get it at Github'
+    text.should.include 'it'
+  end
+  
+  it 'should parse correctly when "describe" is within the body'
+    text = 'It should work with describe'
+    text.should.include 'describe'
+  end
+  
+  it 'should parse correctly when "end" is within the body'
+    text = 'This should not end the parsing :)'
+    text.should.include 'not'
+  end
+  
+  it 'should parse correctly with "before" and "after" within the body'
+    text = 'This comes before that, which is after the rest'
+    text.should.include 'before'
+  end
+  
   it 'should allow parens to be optional when no args are passed'
     true.should.be_true
     true.should.be_true()
@@ -20,6 +44,10 @@ describe 'Grammar'
     -{ element.append().end() }.should.throw_error
   end
   
+  it 'should not mess up "end" in strings'
+    'foo end bar'.should.not.eql 'foo }); bar'
+  end
+  
   it 'should allow semicolons'
     true.should.be_true;
     true.should.be_true();

metadata

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