visionmedia-jspec 1.1.7 → 2.0.0

data/server/browsers.rb

@@ -9,16 +9,8 @@ module JSpec
       self.class.to_s.split('::').last
     end
     
-    class Firefox < self
-    end
-
-    class Safari < self
-    end
-
-    class Opera < self
-    end
-
-    class MSIE < self
-    end
+    class Firefox < self; end
+    class Safari < self; end
+    class Opera < self; end
   end
 end

data/server/server.rb

@@ -37,16 +37,7 @@ module JSpec
     end
 
     def display_results browser, failures, passes
-      puts '%s - failures %s passes %s' % [bold(browser), red(failures), green(passes)]
-      require 'rubygems'
-      require 'growl'
-      if failures.to_i > 0
-        notify_error "failed #{failures} assertion(s)", :title => browser
-      else
-        notify_ok "passed #{passes} assertion(s)", :title => browser
-      end
-    rescue
-      # Do nothing
+      puts '%-14s - passes: %s failures: %s' % [bold(browser), green(passes), red(failures)]
     end
 
     def browser string
@@ -76,9 +67,7 @@ module JSpec
     
     def when_finished &block
       Thread.new {
-        while responses.length < browsers.length
-          sleep 0.1
-        end
+        sleep 0.1 while responses.length < browsers.length
         yield
       }
     end

data/spec/server.html

@@ -3,12 +3,15 @@
 		<script src="jquery-1.3.1.js"></script>
 		<script src="jspec.js"></script>
 		<script src="jspec.jquery.js"></script>
+		<script src="spec.grammar-less.js"></script>
 		<script>
 			function runSuites() {
 				JSpec
 				.exec('spec.grammar.js')
-				.exec('spec.core.js')
-				.exec('spec.core.dom.js')
+				.exec('spec.js')
+				.exec('spec.matchers.js')
+				.exec('spec.utils.js')
+				.exec('spec.shared-behaviors.js')
 				.exec('spec.jquery.js')
 				.run()
 				.reportToServer()

data/spec/spec.grammar-less.js

@@ -0,0 +1,34 @@
+
+JSpec.describe('Grammar-less', function(){
+  before(function(){
+    n = 1
+  })
+  
+  it('should work', function(){
+    expect(true).to(be, true)
+    expect(n).to(equal, 1)
+  })
+  
+  describe('with nested describes', function(){
+    before(function(){
+      hits = []
+    })
+    
+    before_each(function(){
+      n++
+      hits.push('before_each')
+    })
+    
+    it('should work', function(){
+      expect(true).not_to(be, false)
+      expect(n).to(eql, 2)
+      expect(hits).to(eql, ['before_each'])
+    })
+    
+    it('should work again', function(){
+      expect(n).to(eql, 3)
+      expect(hits).to(eql, ['before_each', 'before_each'])
+    })
+  })
+  
+})

data/spec/spec.grammar.js

@@ -1,6 +1,6 @@
 
 describe 'Grammar'
-
+  
   it 'should allow "it" spec literal'
     true.should.be_true
   end
@@ -29,9 +29,16 @@ describe 'Grammar'
   end
   
   it 'should allow grammar-less assertions'
-    expect(true).to('be', true)
-    expect([1,2,3]).to('include', 1, 2, 3)
-    expect(true).not_to('be', false)
+    expect(true).to(be, true)
+    expect([1,2,3]).to(include, 1, 2, 3)
+    expect(true).not_to(be, false)
+  end
+  
+  it 'should allow multi-line expect() assertions'
+    expect(' \
+      foo    \
+      bar    \
+    ').to(include, 'foo', 'bar')
   end
   
   it 'should allow commenting out of conversions'
@@ -39,11 +46,6 @@ describe 'Grammar'
     // foo.should.not.eql 'bar'
   end
   
-  it 'should allow . this. literal'
-    this.foo = 'bar'
-    .foo.should.eql 'bar'
-  end
-  
   it 'should allow inclusive range literal n..n'
     1..5.should.eql [1,2,3,4,5]
     3..4.should.eql [3,4]
@@ -70,10 +72,6 @@ describe 'Grammar'
       true.should.be_true
     end
     
-    it 'should still allow literal javascript outside of blocks'
-      n.should.eql 10
-    end
-    
     describe 'nested again'
       it 'should still work'
         true.should.be_true
@@ -82,10 +80,9 @@ describe 'Grammar'
   end
   
   describe 'before / after blocks'
-    var n, o, hits = []
-    
     before
       n = 1
+      hits = []
       hits.push('before')
     end
     
@@ -108,7 +105,7 @@ describe 'Grammar'
     describe 'with nested describe'
       it 'should be accessable'
         n.should.eql 1
-        hits.should.eql ['before', 'before']
+        hits.should.eql ['before']
       end
     end
   end
@@ -162,6 +159,20 @@ describe 'Grammar'
           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
+      
+      describe 'with multiple hooks'
+        before_each
+          hits = []
+        end
+        
+        before_each
+          hits.push('before_each')
+        end
+        
+        it 'should work'
+          hits.should.eql ['before_each']
+        end
+      end
     end
   end
   

data/spec/spec.html

@@ -4,12 +4,15 @@
 		<script src="jquery-1.3.1.js"></script>
 		<script src="../lib/jspec.js"></script>
 		<script src="../lib/jspec.jquery.js"></script>
+		<script src="spec.grammar-less.js"></script>
 		<script>
 			function runSuites() {
 				JSpec
 				.exec('spec.grammar.js')
-				.exec('spec.core.js')
-				.exec('spec.core.dom.js')
+				.exec('spec.js')
+				.exec('spec.matchers.js')
+				.exec('spec.utils.js')
+				.exec('spec.shared-behaviors.js')
 				.exec('spec.jquery.js')
 				.run()
 				.report()
@@ -18,7 +21,7 @@
 	</head>
 	<body class="jspec" onLoad="runSuites();">
 		<div id="jspec-top"><h2 id="jspec-title">JSpec <em><script>document.write(JSpec.version)</script></em></h2></div>
-		<div id="jspec"></div>
+		<div id="jspec"><div class="loading"></div></div>
 		<div id="jspec-bottom"></div>
 	</body>
 </html>

data/spec/spec.jquery.js

@@ -1,17 +1,13 @@
 
 describe 'jQuery'
-  describe 'helpers'
+  describe 'sandbox'
     before
-      .dom = this.sandbox()
+      dom = sandbox()
     end
-
-    it 'should add elements to a sandbox'
-      .dom.prepend('<em>test</em>').should.have_text 'test'
-    end
-
-    it 'should retain visibility within a sandbox'
-      .dom.children('em').hide().should.be_hidden
-      .dom.children('em').show().should.be_visible
+    
+    it 'should provide an empty DOM sandbox'
+      dom.prepend('<em>test</em>')
+      dom.should.have_text 'test'
     end
   end
   
@@ -42,71 +38,73 @@ describe 'jQuery'
       <strong>test</strong>                                    \
       <strong>test</strong>                                    \
       </p>'
-      .elem = $(html)
+      elem = $(html)
     end
 
     it 'should fail with pretty print of element'
-      .elem.should.not.have_tag 'label'
+      elem.should.not.have_tag 'label'
     end
     
     describe 'have_tag / have_one'
       it 'should check if a single child is present'
-        .elem.should.have_tag 'label'
-        .elem.should.have_tag 'em'
-        .elem.should.have_one 'label'
-        .elem.should.not.have_tag 'input'
+        elem.should.have_tag 'label'
+        elem.should.have_tag 'em'
+        elem.should.have_one 'label'
+        elem.should.not.have_tag 'input'
       end
     end
 
     describe 'have_tags / have_many'
       it 'should check if more than one child is present'
-        .elem.should.have_tags 'option'
-        .elem.should.have_many 'option'
-        .elem.should.not.have_many 'label'
+        elem.should.have_tags 'option'
+        elem.should.have_many 'option'
+        elem.should.not.have_many 'label'
       end
     end
 
     describe 'have_child'
       it 'should check if a direct child is present'
-        .elem.should.have_child 'label'
-        .elem.should.not.have_child 'em'
+        elem.should.have_child 'label'
+        elem.should.not.have_child 'em'
       end
     end
 
     describe 'have_children'
       it 'should check if more than one direct children are present'
-        .elem.should.have_children 'strong'
-        .elem.should.not.have_children 'select'
+        elem.should.have_children 'strong'
+        elem.should.not.have_children 'select'
       end
     end
     
     describe 'have_text'
       it 'should check for plain text'
-        .elem.children('label').should.have_text 'Save?'
+        elem.children('label').should.have_text 'Save?'
       end
     end
     
     describe 'have_value'
       it 'should check if an element has the given value'
-        .elem.find('option').get(1).should.have_value '1'  
+        elem.find('option').get(1).should.have_value '1'  
       end
     end
 
     describe 'have_class'
       it 'should check if an element has the given class'
-        .elem.children('select').should.have_class 'save'
+        elem.children('select').should.have_class 'save'
       end
     end
     
     describe 'have_classes'
       it 'should check if an element has the classes given'
-        .elem.children('select').should.have_classes 'save', 'form-select'
+        elem.children('select').should.have_classes 'save', 'form-select'
+        elem.children('select').should.not.have_classes 'save', 'foo'
+        elem.children('select').should.not.have_classes 'foo', 'save'
       end
     end
 
     describe 'be_visible'
       it 'should check that an element is not hidden or set to display of none'
-        .element('#jspec-report').should.be_visible
+        element('#jspec-report').should.be_visible
         '#jspec-report'.should.be_visible
         '<input style="visibility: hidden;"/>'.should.not.be_visible
         '<input style="display: none;"/>'.should.not.be_visible
@@ -149,18 +147,18 @@ describe 'jQuery'
 
     describe 'have_attr'
       before_each 
-        .elem = '<input type="button" title="some foo" value="Foo" />' 
+        elem = '<input type="button" title="some foo" value="Foo" />' 
       end
       
       it 'should check that an element has the given attribute'
-        .elem.should.have_attr 'title'
-        .elem.should.not_have_attr 'rawr'
+        elem.should.have_attr 'title'
+        elem.should.not_have_attr 'rawr'
       end
       
       it 'should check that the given attribute has a specific value'
-        .elem.should.have_attr 'title', 'some foo'
-        .elem.should.not.have_attr 'some', 'rawr'
-        .elem.should.not.have_attr 'title', 'bar'
+        elem.should.have_attr 'title', 'some foo'
+        elem.should.not.have_attr 'some', 'rawr'
+        elem.should.not.have_attr 'title', 'bar'
       end
     end
   end

data/spec/spec.js

@@ -0,0 +1,86 @@
+
+describe 'Negative specs'
+
+  it 'should fail'
+    'test'.should.not_eql 'test' 
+  end
+
+  it 'should fail with one faulty assertion'
+    'test'.should.equal 'test' 
+    'test'.should.equal 'foo' 
+  end
+  
+  it 'should fail and print array with square braces'
+    [1,2].should.equal [1,3] 
+  end
+  
+  it 'should fail and print nested array'
+    [1, ['foo']].should.equal [1, ['bar', ['whatever', 1.0, { foo : 'bar', bar : { 1 : 2 } }]]]
+  end
+  
+  it 'should fail and print html elements'
+    elem = document.createElement('a')
+    elem.setAttribute('href', 'http://vision-media.ca')
+    elem.should.not.eql elem
+  end
+  
+  it 'should fail with selector for jQuery objects'
+    elem = { jquery : '1.3.1', selector : '.foobar' } 
+    elem.should.eql 'foo'
+  end
+  
+  it 'should fail with negative message'
+    '1'.should.not.be_true
+  end
+  
+  it 'should fail with positive message'
+    false.should.be_true
+  end
+  
+  it 'should fail with function body'
+    -{ throw 'foo' }.should.not.throw_error
+  end
+  
+  it 'should fail with message of first failure'
+    true.should.be_true
+    'bar'.should.match(/foo/gm)
+    'bar'.should.include 'foo'
+  end
+  
+  it 'should fail with list'
+    ['foo', 'bar'].should.include 'foo', 'car'
+  end
+  
+  it 'should catch exceptions throw within specs'
+    throw new Error('Oh noes!')
+  end
+  
+  it 'should catch improper exceptions'
+    throw 'oh noes'
+  end
+  
+  it 'should catch proper exceptions'
+    iDoNotExist.neitherDoI()
+  end
+  
+end
+
+describe 'Contexts'
+  before 
+    JSpec.context = { iLike : 'cookies' }
+  end
+
+  after
+    JSpec.context = null
+  end
+
+  it 'should be replaceable'
+    iLike.should.equal 'cookies'
+  end
+end
+
+describe 'Misc'
+  it 'requires implementation'
+  end
+end
+

data/spec/{spec.core.js → spec.matchers.js}

@@ -34,6 +34,11 @@ describe 'Matchers'
       foo.should.eql foo2
       foo.should.not.eql bar
     end
+    
+    it 'should work with constructors'
+      Array.should.eql Array
+      Array.should.not.eql Object
+    end
   end
   
   describe 'equal'
@@ -252,119 +257,122 @@ describe 'Matchers'
     end
   end
   
-  describe 'should_receive'
-    it 'should fail when a method is not available'
-      person = {}
+  describe 'receive'
+    before_each
+      person = { toString : function(){ return 'person' }}
+      personWithPets = {
+        toString : function(){ return 'personWithPets'    },
+        getPets  : function()     { return ['izzy']       },
+        addPet   : function(name) { return ['izzy', name] },
+        addPets  : function(a, b) { return ['izzy', a, b] }
+      }
+    end
+    
+    it 'should fail when the method does not exist'
       person.should.receive('getPets')
     end
-  end
-  
-end
-
-describe 'Negative specs'
-
-  it 'should fail'
-    'test'.should.not_eql 'test' 
-  end
-
-  it 'should fail with one faulty assertion'
-    'test'.should.equal 'test' 
-    'test'.should.equal 'foo' 
-  end
-  
-  it 'should fail and print array with square braces'
-    [1,2].should.equal [1,3] 
-  end
-  
-  it 'should fail and print nested array'
-    [1, ['foo']].should.equal [1, ['bar', ['whatever', 1.0, { foo : 'bar', bar : { 1 : 2 } }]]]
-  end
-  
-  it 'should fail and print html elements'
-    elem = document.createElement('a')
-    elem.setAttribute('href', 'http://vision-media.ca')
-    elem.should.not.eql elem
-  end
-  
-  it 'should fail with selector for jQuery objects'
-    elem = { jquery : '1.3.1', selector : '.foobar' } 
-    elem.should.eql 'foo'
-  end
-  
-  it 'should fail with negative message'
-    '1'.should.not.be_true
-  end
-  
-  it 'should fail with positive message'
-    false.should.be_true
-  end
-  
-  it 'should fail with function body'
-    -{ rawr }.should.not.throw_error
-  end
-  
-  it 'should fail with message of first failure'
-    true.should.be_true
-    'bar'.should.match(/foo/gm)
-    'bar'.should.include 'foo'
-  end
-  
-  it 'should fail with list'
-    ['foo', 'bar'].should.include 'foo', 'car'
-  end
-  
-  it 'should catch exceptions throw within specs'
-    throw new Error('Oh noes!')
-  end
-  
-  it 'should catch improper exceptions'
-    throw 'oh noes'
-  end
-  
-  it 'should catch proper exceptions'
-    iDoNotExist
-  end
-  
-end
-
-describe 'Utility'
-  describe 'query'
-    it 'should return a pairs value'
-      JSpec.query('suite', '?suite=Positive%20specs').should.equal 'Positive specs'
+    
+    it 'should fail when the method is never invoked'
+      personWithPets.should.receive('getPets')
     end
     
-    it 'should return null when key is not present'
-      JSpec.query('foo', '?suite=Positive%20specs').should.be_null
+    it 'should pass when the method is invoked'
+      personWithPets.should.receive('getPets')
+      personWithPets.getPets()
     end
-  end
-  
-  describe 'strip'
-    it 'should strip whitespace by default'
-      JSpec.strip(" foo \n\n").should.equal 'foo'
+    
+    it 'should pass and original method should still return its result'
+      personWithPets.should.receive('getPets')
+      personWithPets.getPets().should.eql ['izzy']
     end
     
-    it 'should strip the characters passed'
-      JSpec.strip('[foo]', '\\[\\]').should.equal 'foo'
+    it 'should pass when the proper value is returned'
+      personWithPets.should.receive('getPets').and_return(['izzy'])
+      personWithPets.getPets()
+    end
+    
+    it 'should fail when improper value is returned'
+      personWithPets.should.receive('getPets').and_return(['niko'])
+      personWithPets.getPets()
+    end
+    
+    it 'should fail when not invoked the expected number of times'
+      personWithPets.should.receive('getPets', 'twice').and_return(['izzy'])
+      personWithPets.getPets()
+    end
+    
+    it 'should fail when not invoked many times'
+      personWithPets.should.receive('getPets', 3).and_return(['izzy'])
+      personWithPets.getPets()
+      personWithPets.getPets()
+    end
+    
+    it 'should pass when invoked the expected number of times'
+      personWithPets.should.receive('getPets', 'twice').and_return(['izzy'])
+      personWithPets.getPets()
+      personWithPets.getPets()
+    end
+    
+    it 'should fail when not invoked with specific arguments'
+      personWithPets.should.receive('addPet', 'once').with_args('suki')
+      personWithPets.addPet('niko')
+    end
+    
+    it 'should pass when a method is invoked with specific arguments'
+      personWithPets.should.receive('addPet', 'once').with_args('suki')
+      personWithPets.addPet('suki')
+    end
+    
+    it 'should fail when expecting multiple arguments'
+      personWithPets.should.receive('addPets').with_args('suki', 'max')
+      personWithPets.addPets('suki')
+    end
+    
+    it 'should pass with multiple arguments'
+      personWithPets.should.receive('addPets').with_args('suki', 'max')
+      personWithPets.addPets('suki', 'max')
+    end
+    
+    it 'should pass with arguments and return value'
+      personWithPets.should.receive('addPet').with_args('suki').and_return(['izzy', 'suki'])
+      personWithPets.addPet('suki')
+    end
+    
+    it 'should fail when argument is of the wrong type'
+      personWithPets.should.receive('addPet').with_args(an_instance_of(String))
+      personWithPets.addPet(['suki'])
+    end
+    
+    it 'should pass when argument is the correct type'
+      personWithPets.should.receive('addPet').with_args(an_instance_of(String))
+      personWithPets.addPet('suki')
+    end
+    
+    it 'should fail when return type is incorrect'
+      personWithPets.should.receive('addPet').and_return(an_instance_of(String))
+      personWithPets.addPet('suki')
+    end
+        
+    it 'should pass when return type is correct'
+      personWithPets.should.receive('addPet').and_return(an_instance_of(Array))
+      personWithPets.addPet('suki')
+    end
+    
+    it 'should fail when checking the type of multiple args and return types'
+      personWithPets.should.receive('addPets').with_args(an_instance_of(String), an_instance_of(Array)).and_return(an_instance_of(Array))
+      personWithPets.addPets('suki', 'max')
+    end
+        
+    it 'should pass when checking the type of multiple args and return types'
+      personWithPets.should.receive('addPets').with_args(an_instance_of(String), an_instance_of(String)).and_return(an_instance_of(Array))
+      personWithPets.addPets('suki', 'max')
+    end
+    
+    it 'should pass when checking for method calls to core prototypes'
+      array = ['foo', 'bar']
+      array.should.receive('toString').and_return('foo,bar')
+      'array: ' + array
     end
   end
-end
-
-describe 'Contexts'
-  before 
-    JSpec.context = { iLike : 'cookies' }
-  end
-
-  after
-    JSpec.context = null
-  end
-
-  it 'should be replacable'
-    .iLike.should.equal 'cookies'
-  end
-end
-
-describe 'Misc'
-  it 'requires implementation'
-  end
-end
-
+  
+end