visionmedia-jspec 1.1.4 → 1.1.5

data/History.rdoc

@@ -1,4 +1,9 @@
 
+=== 1.1.5 / 2009-04-17
+
+* Strengthened specs for cascading hooks
+* Fixed cascading hooks
+
 === 1.1.4 / 2009-04-17
 
 * Added rhino and server template files

data/README.rdoc

@@ -15,6 +15,7 @@ and much more.
 * Ruby JavaScript testing server
 * Nested describes
 * Does not pollute core object prototypes
+* Cascading before/after/before_each/after_each hooks
 * Extremely simple and intuitive matcher declaration
 * Over 45 core matchers
 * Allows parens to be optional when using matchers to increase readability

data/bin/jspec

@@ -10,7 +10,7 @@ require 'fileutils'
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '1.1.4'
+program :version, '1.1.5'
 program :description, 'JavaScript BDD Testing Framework'
 default_command :bind
 

data/jspec.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]

data/lib/jspec.js

@@ -5,7 +5,7 @@
 
   JSpec = {
 
-    version  : '1.1.4',
+    version  : '1.1.5',
     file     : '',
     suites   : [],
     matchers : {},
@@ -249,6 +249,7 @@
         // Invoke a hook in context to this suite
 
         hook : function(hook) {
+          if (this.suite) this.suite.hook(hook)
           each(this.hooks[hook], function(body) {
             JSpec.evalBody(body, "Error in hook '" + hook + "', suite '" + this.description + "': ")
           })
@@ -787,12 +788,12 @@
         this.runSpec(spec)
         suite.hook('after_each')
       })
-      suite.hook('after')
       if (suite.hasSuites()) {
         each(suite.suites, function(suite) {
           this.runSuite(suite)
         })
       }
+      suite.hook('after')
       return this
     },
          

data/spec/spec.grammar.js

@@ -76,55 +76,85 @@ describe 'Grammar'
   end
   
   describe 'before / after blocks'
-    var n, o
+    var n, o, hits = []
     
     before
       n = 1
+      hits.push('before')
     end
     
     after 
       n = 0
+      hits.push('after')
     end
     
     it 'should work'
       n.should.eql 1
+      hits.should.eql ['before']
       n++
     end
     
     it 'should persist'
       n.should.eql 2
+      hits.should.eql ['before']
     end
     
     describe 'with nested describe'
       it 'should be accessable'
-        n.should.eql 0
+        n.should.eql 1
+        hits.should.eql ['before', 'before']
       end
     end
   end
   
   describe 'before_each / after_each blocks'
+    hits = []
+    
     before_each
       n = 1
+      hits.push('before_each')
     end
     
     after_each
       o = 2
+      hits.push('after_each')
     end
     
     it 'should work'
       n.should.eql 1
+      hits.should.eql ['before_each']
       n = 2
     end
     
     it 'should not persist'
       n.should.eql 1
       o.should.eql 2
+      hits.should.eql ['before_each', 'after_each', 'before_each']
     end
     
     describe 'with nested describe'
       it 'should be accessable'
         n.should.eql 1
         o.should.eql 2
+        hits.should.eql ['before_each', 'after_each', 'before_each', 'after_each', 'before_each']
+      end
+      
+      it 'should continue hits'
+        hits.should.eql ['before_each', 'after_each', 'before_each', 'after_each', 'before_each', 'after_each', 'before_each']
+      end
+      
+      describe 'with more hooks'
+        before_each 
+          hits.push('before_each')
+        end
+        
+        after_each
+          hits.push('after_each')
+        end
+        
+        it 'should continue hits, while cascading properly'
+          hits.should.eql ['before_each', 'after_each', 'before_each', 'after_each', 'before_each', 'after_each', 'before_each', 'after_each', 'before_each', 'before_each']
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-jspec
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - TJ Holowaychuk