visionmedia-jspec 2.1.0 → 2.2.0

data/History.rdoc

@@ -1,4 +1,13 @@
 
+=== 2.2.0 / 2009-06-18
+
+* Added link to JSpec in JSMag June 2009
+* Added Github gem source location to docs
+* Changed throw_error matcher; now accepts two arguments
+* Changed --server; serves from current working directory. 
+  This allows files in ../lib/* to be served rather than ./spec/* only.
+* Refactored argumentsToArray()
+
 === 2.1.0 / 2009-06-12
 
 * Changed `jspec init` to utilize a single template

data/Manifest

@@ -18,14 +18,14 @@ server/server.rb
 spec/async
 spec/env.js
 spec/jquery-1.3.1.js
-spec/server.html
+spec/spec.dom.html
 spec/spec.grammar-less.js
 spec/spec.grammar.js
-spec/spec.html
 spec/spec.jquery.js
 spec/spec.js
 spec/spec.matchers.js
 spec/spec.rhino.js
+spec/spec.server.html
 spec/spec.shared-behaviors.js
 spec/spec.utils.js
 templates/default/History.rdoc

data/README.rdoc

@@ -29,7 +29,7 @@ and much more.
 * Shared behaviors
 * Profiling
 * Rails Integration (http://github.com/bhauman/jspec-rails)
-* Tiny (15 kb compressed, 1600-ish LOC)
+* Tiny (15 kb compressed, 1300-ish LOC)
 
 == Installation
 
@@ -38,6 +38,7 @@ Head over to the downloads section on Github, clone this public repo, or
 add JSpec as a git submodule with in your project. Alternatively JSpec is
 also available as a Ruby Gem (though this is not required), which also 
 provides the `jspec` executable. To install execute:
+  $ gem sources -a http://gems.github.com    (if you have not previously done so)
   $ sudo gem install visionmedia-jspec 
 
 At which point you may:
@@ -139,7 +140,7 @@ JSpec.options.failuresOnly = true, and ?failuresOnly=1 will both work.
   - be_type            be type of x
   - be_greater_than    >
   - be_less_than       <
-  - throw_error        should throw an error, optionally supply the error string for comparison
+  - throw_error        should throw an error, optionally supply the error string or regexp for message comparison
   - have               object should have n of property (person.should.have(2, 'pets'))
   - have_at_least      object should have at least n of property
   - have_at_most       object should have a maximum n of property
@@ -463,6 +464,7 @@ Run with:
 
 == More Information
 
+* Featured article in JSMag: http://www.jsmag.com/main.issues.description/id=21/
 * Syntax comparison with other frameworks http://gist.github.com/92283
 * Get the TextMate bundle at https://github.com/visionmedia/jspec.tmbundle/tree
 * For more information consult the JSpec source code documentation or visit http://visionmedia.github.com/jspec

data/bin/jspec

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

data/jspec.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-06-12}
+  s.date = %q{2009-06-18}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}
   s.executables = ["jspec"]
   s.extra_rdoc_files = ["bin/jspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "README.rdoc"]
-  s.files = ["bin/jspec", "History.rdoc", "jspec.gemspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "Manifest", "Rakefile", "README.rdoc", "server/browsers.rb", "server/server.rb", "spec/async", "spec/env.js", "spec/jquery-1.3.1.js", "spec/server.html", "spec/spec.grammar-less.js", "spec/spec.grammar.js", "spec/spec.html", "spec/spec.jquery.js", "spec/spec.js", "spec/spec.matchers.js", "spec/spec.rhino.js", "spec/spec.shared-behaviors.js", "spec/spec.utils.js", "templates/default/History.rdoc", "templates/default/lib/yourlib.core.js", "templates/default/README.rdoc", "templates/default/spec/spec.core.js", "templates/default/spec/spec.dom.html", "templates/default/spec/spec.rhino.js", "templates/default/spec/spec.server.html"]
+  s.files = ["bin/jspec", "History.rdoc", "jspec.gemspec", "lib/images/bg.png", "lib/images/hr.png", "lib/images/loading.gif", "lib/images/sprites.bg.png", "lib/images/sprites.png", "lib/images/vr.png", "lib/jspec.css", "lib/jspec.jquery.js", "lib/jspec.js", "Manifest", "Rakefile", "README.rdoc", "server/browsers.rb", "server/server.rb", "spec/async", "spec/env.js", "spec/jquery-1.3.1.js", "spec/spec.dom.html", "spec/spec.grammar-less.js", "spec/spec.grammar.js", "spec/spec.jquery.js", "spec/spec.js", "spec/spec.matchers.js", "spec/spec.rhino.js", "spec/spec.server.html", "spec/spec.shared-behaviors.js", "spec/spec.utils.js", "templates/default/History.rdoc", "templates/default/lib/yourlib.core.js", "templates/default/README.rdoc", "templates/default/spec/spec.core.js", "templates/default/spec/spec.dom.html", "templates/default/spec/spec.rhino.js", "templates/default/spec/spec.server.html"]
   s.homepage = %q{http://visionmedia.github.com/jspec}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Jspec", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/jspec.js

@@ -5,7 +5,7 @@
 
   JSpec = {
 
-    version   : '2.1.0',
+    version   : '2.2.0',
     suites    : [],
     allSuites : [],
     matchers  : {},
@@ -582,9 +582,7 @@
      */
     
     argumentsToArray : function(arguments, offset) {
-      var args = []
-      for (i = 0; i < arguments.length; i++) args.push(arguments[i])
-      return args.slice(offset || 0)
+      return Array.prototype.slice.call(arguments, offset || 0)
     },
     
     /**
@@ -1408,28 +1406,37 @@
       return true
     },
 
-    throw_error : { match : function(actual, expected) {
+    throw_error : { match : function(actual, expected, message) {
       try { actual() }
       catch (e) {
         this.e = e
-        if (expected == undefined) return true
-        switch (expected.constructor) {
-          case RegExp   : return expected.test(e)
-          case Function : return e instanceof expected
-          case String   : return expected == e.toString()
+        var assert = function(arg) {
+          console.log(e.constructor);
+          switch (arg.constructor) {
+            case RegExp   : return arg.test(e)
+            case Function : return e.constructor == arg
+            case String   : return arg == (e.message || e.toString())
+          }
         }
+        return message ? assert(expected) && assert(message) :
+                 expected ? assert(expected) :
+                   true
       }
     }, message : function(actual, expected, negate) {
-      // TODO: fix when expected is ONLY expected values
-      expected = (function(){
-        if (expected[1] == undefined) return 'exception'
-        switch (expected[1].constructor) {
-          case RegExp   : return 'exception matching ' + puts(expected[1])
-          case Function : return 'instance of ' + expected[1].name
-          case String   : return 'exception of ' + puts(expected[1])
+      // TODO: refactor when actual is not in expected [0]
+      var message_for = function(i) {
+        if (expected[i] == undefined) return 'exception'
+        switch (expected[i].constructor) {
+          case RegExp   : return 'exception matching ' + puts(expected[i])
+          case Function : return expected[i].name
+          case String   : return 'exception of ' + puts(expected[i])
         }
-      })()
-      return 'expected ' + (negate ? 'no ' : 'an ' ) + expected + 
+      }
+      if (expected[1] == Error && expected[2] == 'oh no!') {
+        console.log(expected);
+      }
+      exception = message_for(1) + (expected[2] ? ' and ' + message_for(2) : '')
+      return 'expected ' + exception + (negate ? ' not ' : '' ) +
                ' to be thrown, but ' + (this.e ? 'got ' + puts(this.e) : 'nothing was')
     }},
     

data/server/server.rb

@@ -25,7 +25,7 @@ module JSpec
         'close'
       when /jspec/
         type = 'application/javascript'
-        File.read File.join(JSPEC_ROOT, 'lib', request.path_info)
+        File.read File.join(JSPEC_ROOT, 'lib', File.basename(request.path_info))
       when /\.js/
         type = 'application/javascript'
         File.read File.join(root, request.path_info)  
@@ -74,7 +74,7 @@ module JSpec
     
     def self.start options, spec
       app = Rack::Builder.new do
-        server = JSpec::Server.new :browsers => options.browsers, :root => File.dirname(spec)
+        server = JSpec::Server.new :browsers => options.browsers, :root => '.'
         server.when_finished { exit }
         run server
       end
@@ -92,7 +92,7 @@ module JSpec
     
     def self.run_browsers browsers, spec
       browsers.each do |name|
-        browser(name).open "http://localhost:4444/#{File.basename(spec)}"
+        browser(name).open "http://localhost:4444/#{spec}"
       end
     end
     

data/spec/spec.js

@@ -57,6 +57,14 @@ describe 'Negative specs'
     -{ throw 'foo' }.should.not.throw_error(/foo/)
   end
   
+  it 'should fail saying constructors'
+    -{ throw new TypeError('oh no') }.should.throw_error(Error)
+  end
+  
+  it 'should should fail saying multiple arg messages'
+    -{ throw new TypeError('oh no') }.should.throw_error(TypeError, /foo/)
+  end
+  
   it 'should fail with constructor name'
     function Foo(){}
     function Bar(){}

data/spec/spec.matchers.js

@@ -182,8 +182,8 @@ describe 'Matchers'
 
   describe 'throw_error'
     it 'should check if an error is thrown'
-      -{ throw 'error' }.should_throw_error
-      -{ return 'test' }.should_not_throw_error
+      -{ throw 'error' }.should.throw_error
+      -{ return 'test' }.should.not.throw_error
     end
     
     it 'should check if an error with a specific message is thrown'
@@ -198,6 +198,15 @@ describe 'Matchers'
       -{ throw new TypeError('foo') }.should.throw_error(TypeError)
       -{ throw 'foo' }.should.not.throw_error(Error)
     end
+    
+    it 'should check if an error with a specific constructor and message is thrown'
+      -{ throw new TypeError('oh no!') }.should.throw_error(TypeError, 'oh no!')
+      -{ throw new TypeError('oh no!') }.should.not.throw_error(TypeError, 'foo bar')
+      -{ throw new TypeError('oh no!') }.should.throw_error(TypeError, /oh no/)
+      -{ throw new TypeError('oh no!') }.should.not.throw_error(TypeError, /foo bar/)
+      -{ throw new TypeError('oh no!') }.should.not.throw_error(Error, 'oh no!')
+      -{ throw new TypeError('oh no!') }.should.not.throw_error(Error, 'foo bar')
+    end
   end
   
   describe 'be_an_instance_of'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-jspec
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-12 00:00:00 -07:00
+date: 2009-06-18 00:00:00 -07:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,14 +61,14 @@ files:
 - spec/async
 - spec/env.js
 - spec/jquery-1.3.1.js
-- spec/server.html
+- spec/spec.dom.html
 - spec/spec.grammar-less.js
 - spec/spec.grammar.js
-- spec/spec.html
 - spec/spec.jquery.js
 - spec/spec.js
 - spec/spec.matchers.js
 - spec/spec.rhino.js
+- spec/spec.server.html
 - spec/spec.shared-behaviors.js
 - spec/spec.utils.js
 - templates/default/History.rdoc