jspec 3.3.3 → 4.0.0

data/History.md

@@ -1,4 +1,26 @@
 
+4.0.0 / 2010-03-22
+==================
+
+  * Added json_fixture(). Closes #157
+  
+  * Added swalke16 to contrib list (shared behavior fixes)
+  
+  * Added shared_behaviors_for() for shared behavior support.
+    This is essentially a Suite instance, however the shared
+    behavior itself is no longer executed, only suites which use
+    should_behave_like().
+    
+  * Added before_nested / after_nested for legacy support.
+    These hooks function just as before / after did < 4.0.0,
+    where they will execute once per nested suite as well.
+    
+  * Changed; before / after are now executed ONLY once, not
+    when a nested suite is running. Use before_nested / after_nested 
+    if you wish to re-gain this functionality.
+    
+  * Removed JSpec.error()
+
 3.3.3 / 2010-03-15
 ==================
 

data/README.md

@@ -48,6 +48,7 @@ To add or request removal from this list please email tj@vision-media.ca
   * [Google - YouTube](http://youtube.com)
   * [Palm](http://palm.com)
   * [Carfax](http://carfax.com)
+  * [Apache CouchDB](http://couchdb.apache.org)
   * [Vision Media](http://vision-media.ca)
 
 ## Installation
@@ -364,34 +365,81 @@ on any object when using the JSpec grammar:
 ## Shared Behaviors
 
 JSpec's support for shared behaviors allows multiple suites or describe blocks to share
-common functionality. For example an Admin, would inherit all specs of User:
+common functionality, including specs and hooks. Shared functionality is run in the order in
+which it is included in the hosting suite. For example a canine would inherit all 
+behavior of an animal, and particular breeds of dog would inherit all behavior from the canine.
+Note that as in the poodle example, shared behaviors can be nested inside suites or describe
+blocks and will be visible only to other describe blocks _at or below_ the same nesting level.
+
+	shared_behaviors_for 'animal'	
+		before
+			animal = { eats: function(){return true }}
+		end
+	
+		it 'should eat'
+			animal.eats().should.eql true 
+		end
+	end
+
+	shared_behaviors_for 'canine'
+		should_behave_like('animal')
+
+		before
+			animal.hasFourLegs = function(){ return true }
+			animal.barks = function(){ return true }
+		end
+
+		it 'should have 4 legs'
+			animal.hasFourLegs().should.eql true
+		end
+	
+		it 'should bark'
+			animal.barks().should.eql true
+		end
+	end
 
-    describe 'User'
-      before
-        User = function(name) { this.name = name }
-        user = new User('joe')
-      end
-      
-      it 'should have a name'
-        user.should.have_property 'name'
-      end
-      
-      describe 'Administrator'
-        should_behave_like('User')
-    
-        before
-          Admin = function(name) { this.name = name }
-          Admin.prototype.may = function(perm){ return true }
-          user = new Admin('tj')
-        end
-    
-        it 'should have access to all permissions'
-          user.may('edit pages').should.be_true
-        end
-      end
-    end
+	describe 'mastif'
+		should_behave_like('canine')
+
+		before
+			animal.weight = 200
+		end
 
-**NOTE**: both User and Administrator's before hooks implement the 'user' variable
+		it 'should weigh > 100 lbs'
+			animal.weight.should.be_greater_than 100
+		end	
+	end
+
+	describe 'poodle breeds'
+		should_behave_like('canine')
+	
+		shared_behaviors_for 'poodle'
+			before
+				animal.isMean = true
+			end
+
+			it 'should be mean'
+				animal.isMean.should.eql true
+			end
+		end
+	
+		describe 'fancy poodle'
+			should_behave_like('poodle')
+		
+			before
+				animal.looksRidiculous = true
+			end
+		
+			it 'should look ridiculous'
+				animal.looksRidiculous.should.eql true
+			end
+		end
+	end
+
+NOTE: When the should_behave_like() call is searching for behaviors to include, it works inside out.
+      Therefore any nested shared behaviors by the same name as a shared behavior at a higher
+      nesting level will override the one at the higher level.
+ 
 
 ## Mock Ajax Requests
 
@@ -430,6 +478,10 @@ scope, they will both run, but this can help keep your specs readable.
   - run before each specification
 - after_each
   - run after each specification
+- before_nested
+  - run once before the suite and once before any nested suites
+- after_nested
+  - run once after the suite and once after any nested suites
 
 ## Custom Contexts
 
@@ -540,6 +592,12 @@ manor:
 In order for the `fixture()` utility to function you must pass the **fixturePath** option
 to _JSpec.run()_ which provides JSpec with the fixture directory.
 
+The `json_fixture()` utility works much the same as `fixture()` however `fixture('data')` 
+will be parsed as JSON, and resolved as shown below:
+
+  - <fixturePath>/data
+  - <fixturePath>/data.json
+
 ## Testing DOM Elements
 
 When using jQuery testing DOM elements is very easy. Many may think they require specific
@@ -940,6 +998,7 @@ missed you on this list please let me know
 - [kevin.gisi@gmail.com](kevin.gisi@gmail.com)
 - [tony_t_tubbs@yahoo.com](tony_t_tubbs@yahoo.com)
 - [enno84@gmx.net](enno84@gmx.net)
+- swalke16
 - fnando
 - Tobias Svensson
 

data/bin/jspec

@@ -12,7 +12,7 @@ require 'src/installables'
 require 'src/server'
 
 program :name, 'JSpec'
-program :version, '3.3.3'
+program :version, '4.0.0'
 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 = "3.3.3"
+  s.version = "4.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-03-22}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}

data/lib/jspec.js

@@ -4,12 +4,13 @@
 ;(function(){
 
   JSpec = {
-    version   : '3.3.3',
+    version   : '4.0.0',
     assert    : true,
     cache     : {},
     suites    : [],
     modules   : [],
     allSuites : [],
+		sharedBehaviors: [],
     matchers  : {},
     stubbed   : [],
     options   : {},
@@ -68,6 +69,31 @@
         return JSpec.cache[path] = 
           JSpec.tryLoading(JSpec.options.fixturePath + '/' + path) ||
           JSpec.tryLoading(JSpec.options.fixturePath + '/' + path + '.html')
+      },
+      
+      /**
+       * Load json fixture at _path_.
+       *
+       * JSON fixtures are resolved as:
+       *
+       *  - <path>
+       *  - <path>.json
+       *
+       * @param  {string} path
+       * @return {object}
+       * @api public
+       */
+      
+      json_fixture: function(path) {
+        if (!JSpec.cache['json:' + path])
+          JSpec.cache['json:' + path] =
+            JSpec.tryLoading(JSpec.options.fixturePath + '/' + path) ||
+            JSpec.tryLoading(JSpec.options.fixturePath + '/' + path + '.json')
+        try {
+          return eval('(' + JSpec.cache['json:' + path] + ')')
+        } catch (e) {
+          throw 'json_fixture("' + path + '"): ' + e
+        }
       }
     },
 
@@ -92,7 +118,7 @@
           stats: JSpec.stats,
           options: options,
           results: map(results.allSuites, function(suite) {
-            if (suite.hasSpecs())
+            if (suite.isExecutable())
               return {
                 description: suite.description,
                 specs: map(suite.specs, function(spec) {
@@ -145,7 +171,7 @@
         <span class="passes">Duration: <em>' + results.duration + '</em> ms</span>          \
         </div><table class="suites">' + map(results.allSuites, function(suite) {
           var displaySuite = failuresOnly ? suite.ran && !suite.passed() : suite.ran
-          if (displaySuite && suite.hasSpecs())
+          if (displaySuite && suite.isExecutable())
             return '<tr class="description"><td colspan="2">' + escape(suite.description) + '</td></tr>' +
               map(suite.specs, function(i, spec) {
                 return '<tr class="' + (i % 2 ? 'odd' : 'even') + '">' +
@@ -181,7 +207,7 @@
          
          each(results.allSuites, function(suite) {
            var displaySuite = failuresOnly ? suite.ran && !suite.passed() : suite.ran
-            if (displaySuite && suite.hasSpecs()) {
+            if (displaySuite && suite.isExecutable()) {
               print(color(' ' + suite.description, 'bold'))
               each(suite.specs, function(spec){
                 var assertionsGraph = inject(spec.assertions, '', function(graph, assertion){
@@ -392,17 +418,21 @@
      * @api private
      */
 
-    Suite : function(description, body) {
+    Suite : function(description, body, isShared) {
       var self = this
       extend(this, {
         body: body,
         description: description,
         suites: [],
+				sharedBehaviors: [],
         specs: [],
         ran: false,
-        hooks: { 'before' : [], 'after' : [], 'before_each' : [], 'after_each' : [] },
+				shared: isShared, 
+				hooks: { 	'before' : [], 'after' : [], 
+									'before_each' : [], 'after_each' : [],
+									'before_nested' : [], 'after_nested' : []},
         
-        // Add a spec to the suite
+				// Add a spec to the suite
 
         addSpec : function(description, body) {
           var spec = new JSpec.Spec(description, body)
@@ -411,16 +441,30 @@
           spec.suite = this
         },
 
-        // Add a hook to the suite
+        // Add a before hook to the suite
+
+        addBefore : function(options, body) {
+					body.options = options || {}
+          this.befores.push(body)
+        },
 
+        // Add an after hook to the suite
+
+        addAfter : function(options, body) {
+					body.options = options || {}
+          this.afters.unshift(body)
+        },
+
+        // Add a hook to the suite
+ 
         addHook : function(hook, body) {
           this.hooks[hook].push(body)
         },
 
         // Add a nested suite
 
-        addSuite : function(description, body) {
-          var suite = new JSpec.Suite(description, body)
+        addSuite : function(description, body, isShared) {
+          var suite = new JSpec.Suite(description, body, isShared)
           JSpec.allSuites.push(suite)
           suite.name = suite.description
           suite.description = this.description + ' ' + suite.description
@@ -428,15 +472,17 @@
           suite.suite = this
         },
 
-        // Invoke a hook in context to this suite
+				// Invoke a hook in context to this suite
 
         hook : function(hook) {
-          if (this.suite) this.suite.hook(hook)
+					if (hook != 'before' && hook != 'after')	
+          	if (this.suite) this.suite.hook(hook)
+
           each(this.hooks[hook], function(body) {
             JSpec.evalBody(body, "Error in hook '" + hook + "', suite '" + self.description + "': ")
           })
         },
-
+				
         // Check if nested suites are present
 
         hasSuites : function() {
@@ -455,7 +501,15 @@
           return !any(this.specs, function(spec){
             return !spec.passed() 
           })
-        }
+        },
+
+				isShared : function(){
+					return this.shared
+				},
+
+				isExecutable : function() {
+					return !this.isShared() && this.hasSpecs()
+				}
       })
     },
     
@@ -603,7 +657,7 @@
         },
 
         describe : function(description, body) {
-          return JSpec.currentSuite.addSuite(description, body)
+          return JSpec.currentSuite.addSuite(description, body, false)
         },
 
         it : function(description, body) {
@@ -613,19 +667,31 @@
         before : function(body) {
           return JSpec.currentSuite.addHook('before', body)
         },
-
+ 
         after : function(body) {
           return JSpec.currentSuite.addHook('after', body)
         },
-
+ 
         before_each : function(body) {
           return JSpec.currentSuite.addHook('before_each', body)
         },
-
+ 
         after_each : function(body) {
           return JSpec.currentSuite.addHook('after_each', body)
         },
+
+				before_nested : function(body) {
+					return JSpec.currentSuite.addHook('before_nested', body)
+				},
+				
+				after_nested : function(body){
+					return JSpec.currentSuite.addhook('after_nested', body)
+				},
         
+				shared_behaviors_for : function(description, body){
+				  return JSpec.currentSuite.addSuite(description, body, true)
+				},
+
         should_behave_like : function(description) {
           return JSpec.shareBehaviorsOf(description)
         }
@@ -702,8 +768,7 @@
     
     evalHook : function(module, name, args) {
       hook('evaluatingHookBody', module, name)
-      try { return module[name].apply(module, args) }
-      catch(e) { error('Error in hook ' + module.name + '.' + name + ': ', e) }
+      return module[name].apply(module, args)
     },
     
     /**
@@ -726,19 +791,69 @@
     },
     
     /**
-     * Find a suite by its description or name.
+     * Find a shared example suite by its description or name.
+     * First searches parent tree of suites for shared behavior
+     * before falling back to global scoped nested behaviors.
      *
      * @param  {string} description
      * @return {Suite}
      * @api private
      */
     
-    findSuite : function(description) {
-      return find(this.allSuites, function(suite){
-        return suite.name == description || suite.description == description
-      })
+    findSharedBehavior : function(description) {
+      var behavior
+      return (behavior = JSpec.findLocalSharedBehavior(description))
+        ? behavior
+        : JSpec.findGlobalSharedBehavior(description)
     },
+
+    /**
+     * Find a shared example suite within the current suite's
+     * parent tree by its description or name.
+     *
+     * @param  {string} description
+     * @return {Suite}
+     * @api private
+     */
+     
+		findLocalSharedBehavior : function(description) {
+			var behavior,
+			    currentSuite = JSpec.currentSuite.suite
+			while (currentSuite)
+				if (behavior = find(currentSuite.suites, JSpec.suiteDescriptionPredicate(description)))
+				  return behavior
+				else
+				  currentSuite = currentSuite.suite
+		},
+		
+    /**
+     * Find a shared example suite within the global
+     * scope by its description or name.
+     *
+     * @param  {string} description
+     * @return {Suite}
+     * @api private
+     */
+     
+		findGlobalSharedBehavior : function(description) {
+	   return find(JSpec.suites, JSpec.suiteDescriptionPredicate(description))
+		},
     
+    /**
+     * Build a predicate that will match a suite based on name or description
+     *
+     * @param  {string} description
+     * @return {function}
+     * @api private
+     */
+     
+		suiteDescriptionPredicate : function(description) {
+			return function(suite){
+			  return suite.name === description ||
+			         suite.description === description
+			}
+		},
+
     /**
      * Share behaviors (specs) of the given suite with
      * the current suite.
@@ -748,26 +863,13 @@
      */
     
     shareBehaviorsOf : function(description) {
-      if (suite = this.findSuite(description)) this.copySpecs(suite, this.currentSuite)
-      else throw 'failed to share behaviors. ' + puts(description) + ' is not a valid Suite name'
+      var suite = JSpec.findSharedBehavior(description)
+      if (suite)
+        JSpec.evalBody(suite.body)
+      else
+        throw new Error("failed to find shared behaviors named `" + description + "'")
     },
     
-    /**
-     * Copy specs from one suite to another. 
-     *
-     * @param  {Suite} fromSuite
-     * @param  {Suite} toSuite
-     * @api public
-     */
-    
-    copySpecs : function(fromSuite, toSuite) {
-      each(fromSuite.specs, function(spec){
-        var newSpec = new Object();
-        extend(newSpec, spec);
-        newSpec.assertions = [];
-        toSuite.specs.push(newSpec);
-      })
-    },
     
     /**
      * Convert arguments to an array.
@@ -1277,12 +1379,27 @@
      */
     
     describe : function(description, body) {
-      var suite = new JSpec.Suite(description, body)
+      var suite = new JSpec.Suite(description, body, false)
       hook('addingSuite', suite)
       this.allSuites.push(suite)
       this.suites.push(suite)
     },
     
+    /**
+     * Add a shared example suite to JSpec.
+     *
+     * @param  {string} description
+     * @param  {body} function
+     * @api public
+     */
+    
+    shared_behaviors_for : function(description, body) {
+      var suite = new JSpec.Suite(description, body, true)
+      hook('addingSuite', suite)
+      this.allSuites.push(suite)
+      this.suites.push(suite)
+    },
+
     /**
      * Return the contents of a function body.
      *
@@ -1309,9 +1426,8 @@
       var matchers = this.matchers
       var context = this.context || this.defaultContext
       var contents = this.contentsOf(body)
-      hook('evaluatingBody', dsl, matchers, context, contents)
-      try { with (dsl){ with (context) { with (matchers) { eval(contents) }}} }
-      catch(e) { error(errorMessage, e) }
+			hook('evaluatingBody', dsl, matchers, context, contents)
+      with (dsl){ with (context) { with (matchers) { eval(contents) }}}
     },
 
     /**
@@ -1331,8 +1447,9 @@
         split('__END__')[0].
         replace(/([\w\.]+)\.(stub|destub)\((.*?)\)$/gm, '$2($1, $3)').
         replace(/describe\s+(.*?)$/gm, 'describe($1, function(){').
+        replace(/shared_behaviors_for\s+(.*?)$/gm, 'shared_behaviors_for($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(/^ *(before_nested|after_nested|before_each|after_each|before|after)(?= |\n|$)/gm, 'JSpec.currentSuite.addHook("$1", function(){').
         replace(/^\s*end(?=\s|$)/gm, '});').
         replace(/-\{/g, 'function(){').
         replace(/(\d+)\.\.(\d+)/g, function(_, a, b){ return range(a, b) }).
@@ -1395,25 +1512,28 @@
      */
 
     runSuite : function(suite) {
-      this.currentSuite = suite
-      this.evalBody(suite.body)
-      suite.ran = true
-      hook('beforeSuite', suite), suite.hook('before')
-      each(suite.specs, function(spec) {
-        hook('beforeSpec', spec)
-        suite.hook('before_each')
-        JSpec.runSpec(spec)
-        hook('afterSpec', spec)
-        suite.hook('after_each')
-      })
-      if (suite.hasSuites()) {
-        each(suite.suites, function(suite) {
-          JSpec.runSuite(suite)
-        })
-      }
-      hook('afterSuite', suite), suite.hook('after')
-      this.stats.suitesFinished++
-    },
+			if (!suite.isShared())
+			{
+	      this.currentSuite = suite
+	      this.evalBody(suite.body)
+	      suite.ran = true
+	      hook('beforeSuite', suite), suite.hook('before'), suite.hook('before_nested')
+	      each(suite.specs, function(spec) {
+	        hook('beforeSpec', spec)
+	        suite.hook('before_each')
+	        JSpec.runSpec(spec)
+	        hook('afterSpec', spec)
+	        suite.hook('after_each')
+	      })
+	      if (suite.hasSuites()) {
+	        each(suite.suites, function(suite) {
+	          JSpec.runSuite(suite)
+	        })
+	      }
+	      hook('afterSuite', suite), suite.hook('after_nested'), suite.hook('after')
+	      this.stats.suitesFinished++
+			}	
+		},
          
     /**
      * Report a failure for the current spec.
@@ -1596,7 +1716,7 @@
           return request.responseText
       }
       else
-        error("failed to load `" + file + "'")
+        throw new Error("failed to load `" + file + "'")
     },
 
     /**

data/spec/node.js

@@ -12,6 +12,6 @@ JSpec
 .exec('spec/unit/spec.shared-behaviors.js')
 .exec('spec/unit/spec.grammar.js')
 .exec('spec/unit/spec.grammar-less.js')
-//.exec('spec/unit/spec.fixtures.js') TODO: when exceptions bubble properly uncomment
+.exec('spec/unit/spec.fixtures.js')
 .run({ reporter: JSpec.reporters.Terminal, failuresOnly: true, fixturePath: 'spec/fixtures' })
 .report()

data/spec/unit/spec.fixtures.js

@@ -14,4 +14,11 @@ describe 'Utility'
       delete JSpec.cache['test']
     end
   end
+  
+  describe 'json_fixture()'
+    it 'should evaluate json fixtures'
+      json_fixture('test').should.eql { users : { tj : { email : 'tj@vision-media.ca' }}}
+      json_fixture('test.json').should.eql { users : { tj : { email : 'tj@vision-media.ca' }}}
+    end
+  end
 end

data/spec/unit/spec.grammar.js

@@ -1,7 +1,5 @@
-
 describe 'Grammar'
-  
-  it  'should allow "it" spec literal'
+  it 'should allow "it" spec literal'
     true.should.be_true
   end
   
@@ -10,7 +8,7 @@ describe 'Grammar'
   it 'should allow literal javascript outside of blocks'
     n.should.eql 10
   end
-  
+
   it 'should escape <html> in <p>descriptions</p> and body'
     '<p></p>'.should.eql '<p></p>'
   end
@@ -75,9 +73,9 @@ describe 'Grammar'
   
   it 'should allow multi-line expect() assertions'
     expect(' \
-      foo    \
-      bar    \
-    ').to(include, 'foo', 'bar')
+foo \
+bar \
+').to(include, 'foo', 'bar')
   end
   
   it 'should allow commenting out of conversions'
@@ -106,21 +104,21 @@ describe 'Grammar'
     'bar'.should.not.equal 'foo'
   end
   
-	describe 'with tabs'
-		before_each
-			foo = 'bar'
-		end
-		
-		it 'should work'
-		  foo.should.eql 'bar'
-		end
-		
-	  it 'should work'
-		  true.should.be	true
-		  true.should.be(true)
-		  true.should.be(true);
-		end
-	end
+describe 'with tabs'
+before_each
+foo = 'bar'
+end
+ 
+it 'should work'
+foo.should.eql 'bar'
+end
+ 
+it 'should work'
+true.should.be true
+true.should.be(true)
+true.should.be(true);
+end
+end
   
   describe 'with nested describe'
     it 'should work'
@@ -141,7 +139,7 @@ describe 'Grammar'
       hits.push('before')
     end
     
-    after 
+    after
       n = 0
       hits.push('after')
     end
@@ -158,15 +156,51 @@ describe 'Grammar'
     end
     
     describe 'with nested describe'
-      it 'should be accessable'
-        n.should.eql 1
-        hits.should.eql ['before']
+      it 'variables should be accessable'
+        n.should.eql 2
       end
+
+			it 'should only run for outer describe'
+        hits.should.eql ['before']
+			end
     end
   end
   
+  describe 'before_nested / after_nested blocks'
+    before
+			x = 0
+			y = 0
+		end
+
+		before_nested
+      x++
+    end
+    
+    after_nested
+      y++
+    end
+    
+    it 'should execute before_nested before suite'
+      x.should.eql 1
+    end
+       
+    describe 'with nested describe'
+      it 'should execute before_nested before nested suite'
+        x.should.eql 2
+      end
+		end
+		
+		describe 'after_nested'
+			it 'should execute after_nested after nested suite'
+				y.should.eql 1
+			end
+		end
+  end
+
   describe 'before_each / after_each blocks'
-    hits = []
+    before
+			hits = []
+		end
     
     before_each
       n = 1
@@ -202,7 +236,7 @@ describe 'Grammar'
       end
       
       describe 'with more hooks'
-        before_each 
+        before_each
           hits.push('before_each')
         end
         
@@ -232,10 +266,10 @@ describe 'Grammar'
   end
   
 end
-
+ 
 __END__
-
+ 
 this should not matter because it is
 considered a comment by the JSpec grammar :)
-and is sometimes useful for temp reference info 
+and is sometimes useful for temp reference info
 when writting specs.

data/spec/unit/spec.shared-behaviors.js

@@ -1,80 +1,279 @@
+shared_behaviors_for 'animal'	
+	before
+		animal = { eats: function(){ return true } }
+	end
+	
+	it 'should eat'
+		animal.eats().should.eql true 
+	end
+end
+
+shared_behaviors_for 'canine'
+	should_behave_like('animal')
+
+	before
+		animal.hasFourLegs = function(){ return true }
+		animal.barks = function(){ return true }
+	end
+
+	it 'should have 4 legs'
+		animal.hasFourLegs().should.eql true
+	end
+	
+	it 'should bark'
+		animal.barks().should.eql true
+	end
+end
+
+describe 'mastif'
+	should_behave_like('canine')
+
+	before
+		animal.weight = 200
+	end
+
+	it 'should weigh > 100 lbs'
+		animal.weight.should.be_greater_than 100
+	end	
+end
+
+describe 'poodle breeds'
+	should_behave_like('canine')
+	
+	shared_behaviors_for 'poodle'
+		before
+			animal.isMean = true
+		end
+
+		it 'should be mean'
+			animal.isMean.should.eql true
+		end
+	end
+	
+	describe 'fancy poodle'
+		should_behave_like('poodle')
+		
+		before
+			animal.looksRidiculous = true
+		end
+		
+		it 'should look ridiculous'
+			animal.looksRidiculous.should.eql true
+		end
+	end
+end
+
+describe 'shared behaviors'
+	before
+		before_sequence = []
+		before_each_sequence = []
+		after_sequence = []
+		after_each_sequence = []
+	end
+	
+	shared_behaviors_for 'A'
+		before
+			before_sequence.push('A')
+		end
+			
+		after
+			after_sequence.push('A')
+		end
+
+		before_each
+			before_each_sequence.push('A')
+		end
+			
+		after_each
+			after_each_sequence.push('A')
+		end		
+	end
+	
+	shared_behaviors_for 'B'
+		before
+			before_sequence.push('B')
+		end
+			
+		after
+			after_sequence.push('B')
+		end		
+		
+		before_each
+			before_each_sequence.push('B')
+		end
+			
+		after_each
+			after_each_sequence.push('B')
+		end		
+	end
+
+	describe 'before ordering'
+		should_behave_like('B')
+
+		before
+			before_sequence.push('C')
+		end
+
+		should_behave_like('A')
+						
+		after 
+			after_sequence.push('C')
+		end
+	
+		before_each
+			before_each_sequence.push('C')
+		end
+			
+		after_each
+			after_each_sequence.push('C')
+		end
+				
+		it "should sequence befores in include order"
+			before_sequence.should.eql ['B', 'C', 'A']
+		end
+
+		it "should sequence before_eachs in include order"
+			before_each_sequence.should.eql ['B', 'A', 'C', 'B', 'A', 'C']
+		end		
+	end
+	
+	describe 'after ordering'
+		it "should sequence afters in include order"
+			after_sequence.should.eql ['B', 'A', 'C']
+		end
+	
+		it "should sequence after_eachs in include order"
+			after_each_sequence.should.eql ['B', 'A', 'C', 'B', 'A', 'C']		
+		end	
+	end
+end
+
+shared_behaviors_for 'person'
+  it 'should have a name'
+    person.should.have_property 'name'
+  end
+end
+
+shared_behaviors_for 'administrator'
+	should_behave_like('person')
+	
+	it 'should have access to all permissions'
+		person.may('edit pages').should.be_true
+		person.may('delete users').should.be_true
+  end
+end
 
 describe 'Shared Behaviors'
   describe 'User'
     before
       User = function(name) { this.name = name }
-      user = new User('joe')
+      person = new User('joe')
     end
     
-    it 'should have a name'
-      user.should.have_property 'name'
+		should_behave_like('person')  		
+  end
+
+  describe 'Administrator' 
+    before
+      Admin = function(name) { this.name = name }
+      Admin.prototype.may = function(perm){ return true }
+      person = new Admin('tj')
     end
-    
-    describe 'Administrator'
-      should_behave_like('User')
-
-      before
-        Admin = function(name) { this.name = name }
-        Admin.prototype.may = function(perm){ return true }
-        user = new Admin('tj')
-      end
-
-      it 'should have access to all permissions'
-        user.may('edit pages').should.be_true
-        user.may('delete users').should.be_true
-      end
-
-      describe 'Super Administrator'
-        should_behave_like('Administrator')
-
-        before
-          SuperAdmin = function(name) { this.name = name }
-          SuperAdmin.prototype.may = function(perm){ return true }
-          user = new SuperAdmin('tj')
-        end
-      end
+
+		should_behave_like('administrator')
+  end
+
+  describe 'Super Administrator'
+    before
+      SuperAdmin = function(name) { this.name = name }
+      SuperAdmin.prototype.may = function(perm){ return true }
+	  	SuperAdmin.prototype.canCreateUsers = function(){ return true }
+      person = new SuperAdmin('tj')
     end
+
+    should_behave_like('administrator')
+
+		it "should be allowed to create users"
+		  person.canCreateUsers().should.be_true
+		end
   end
   
-  describe 'User with toString()'
+  shared_behaviors_for 'User with toString()'
     before
-      user = { toString : function() { return '<User tj>' }}
+      person = { toString : function() { return '<User tj>' }}
     end
     
     it 'should return &lt;User NAME&gt;'
-      user.toString().should.match(/\<User/)
+      person.toString().should.match(/\<User/)
     end
   end
   
   describe 'Manager'
-    should_behave_like('User')
+    should_behave_like('person')
     should_behave_like('User with toString()')
     
     before
       Manager = function(name) { this.name = name }
       Manager.prototype.may = function(perm){ return perm == 'hire' || perm == 'fire' }
       Manager.prototype.toString = function(){ return '<User ' + this.name + '>' }
-      user = new Manager('tj')
+      person = new Manager('tj')
     end
     
     it 'should have access to hire or fire employees'
-      user.may('hire').should.be_true
-      user.may('fire').should.be_true
-      user.may('do anything else').should.be_false
+      person.may('hire').should.be_true
+      person.may('fire').should.be_true
+      person.may('do anything else').should.be_false
     end
   end
   
-  describe 'findSuite'
-    it 'should find a suite by full description'
-      JSpec.findSuite('Shared Behaviors User Administrator').should.be_a JSpec.Suite
-    end
-    
-    it 'should find a suite by name'
-      JSpec.findSuite('User').should.be_a JSpec.Suite
-    end
-    
+	describe 'findLocalSharedBehavior'
+		it 'should find shared behavior by name'
+			JSpec.findLocalSharedBehavior('User with toString()').should.be_a JSpec.Suite
+		end
+		
+    it 'should return null when not found'
+      JSpec.findGlobalSharedBehavior('Rawr').should.be_null
+    end		
+
+		describe 'nested'
+			it 'should find shared behavior by name when nested'
+				JSpec.findLocalSharedBehavior('User with toString()').should.be_a JSpec.Suite			
+			end
+		end
+	end
+
+	describe 'findGlobalSharedBehavior'
+		it 'should find shared behavior by name'
+			JSpec.findGlobalSharedBehavior('person').should.be_a JSpec.Suite
+		end
+		
     it 'should return null when not found'
-      JSpec.findSuite('Rawr').should.be_null
+      JSpec.findGlobalSharedBehavior('Rawr').should.be_null
+    end		
+	end
+	
+	describe 'findSharedBehavior'
+		shared_behaviors_for 'person'
+			it 'should not have name'
+				person.should.not.have_property 'name'
+			end
+		end
+		
+		describe 'override behavior'
+			it 'should find local shared behavior before global'
+				JSpec.findSharedBehavior('person').body.toString().should.match(/should not have name/)
+			end
+		end
+		
+		it 'should find shared global behavior by name'
+			JSpec.findGlobalSharedBehavior('animal').should.be_a JSpec.Suite
+		end
+	
+    it 'should return null when not found at either level'
+      JSpec.findGlobalSharedBehavior('Rawr').should.be_null
     end
-  end
-end
+	end
+end
+
+
+

metadata

@@ -3,10 +3,10 @@ name: jspec
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 3
-  - 3
-  - 3
-  version: 3.3.3
+  - 4
+  - 0
+  - 0
+  version: 4.0.0
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -07:00
+date: 2010-03-22 00:00:00 -07:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency