visionmedia-jspec 1.1.5 → 1.1.6

data/History.rdoc

@@ -1,4 +1,9 @@
 
+=== 1.1.6 / 2009-04-22
+
+* Fixed typo in requires()
+* Added expect()
+
 === 1.1.5 / 2009-04-17
 
 * Strengthened specs for cascading hooks

data/bin/jspec

@@ -10,7 +10,7 @@ require 'fileutils'
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '1.1.5'
+program :version, '1.1.6'
 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 = "1.1.5"
+  s.version = "1.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-04-17}
+  s.date = %q{2009-04-22}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}

data/lib/jspec.js

@@ -3,9 +3,9 @@
 
 (function(){
 
-  JSpec = {
+  var JSpec = {
 
-    version  : '1.1.5',
+    version  : '1.1.6',
     file     : '',
     suites   : [],
     matchers : {},
@@ -524,23 +524,40 @@
      },
 
     /**
-     * Invoke a matcher.
+     * Perform an assertion.
      *
-     * this.match('test', 'should', 'be_a', [String])
+     *   expect(true).to('be', true)
+     *   expect('foo').not_to('include', 'bar')
+     *   expect([1, [2]]).to('include', 1, [2])
      *
-     * @param  {object} actual
-     * @param  {bool, string} negate
-     * @param  {string} name
-     * @param  {array} expected
-     * @return {bool}
-     * @api private
+     * @param  {mixed} actual
+     * @return {hash}
+     * @api public
      */
 
-    match : function(actual, negate, name, expected) {
-      if (typeof negate == 'string') negate = negate == 'should' ? false : true
-      assertion = new JSpec.Assertion(this.matchers[name], actual, expected, negate)
-      this.currentSpec.assertions.push(assertion.exec())
-      return assertion.passed
+    expect : function(actual) {
+      assert = function(name, args, negate) {
+        expected = []
+        for (i = 1; i < args.length; i++) expected.push(args[i])        
+        assertion = new JSpec.Assertion(JSpec.matchers[name], actual, expected, negate)
+        JSpec.currentSpec.assertions.push(assertion.exec())
+        return assertion.passed
+      }
+      
+      to = function(name) {
+        return assert(name, arguments, false)
+      }
+      
+      not_to = function(name) {
+        return assert(name, arguments, true)
+      }
+      
+      return {
+        to : to,
+        should : to,
+        not_to: not_to,
+        should_not : not_to,
+      }
     },
 
     /**
@@ -723,7 +740,9 @@
         replace(/(\d+)\.\.(\d+)/g, function(_, a, b){ return range(a, b) }).
         replace(/([\s\(]+)\./gm, '$1this.').
         replace(/\.should([_\.]not)?[_\.](\w+)(?: |$)(.*)$/gm, '.should$1_$2($3)').
-        replace(/([\/ ]*)(.+?)\.(should(?:[_\.]not)?)[_\.](\w+)\((.*)\)$/gm, '$1 JSpec.match($2, "$3", "$4", [$5]);')
+        replace(/([\/ ]*)(.+?)\.(should(?:[_\.]not)?)[_\.](\w+)\((.*)\)$/gm, '$1 expect($2).$3("$4", $5)').
+        replace(/, \)/gm, ')').
+        replace(/should\.not/gm, 'should_not')
     },
 
     /**
@@ -836,7 +855,7 @@
 
     requires : function(dependency, message) {
       try { eval(dependency) }
-      catch (e) { error('JSpec depends on ' + dependency + ' ' + message, '') }
+      catch (e) { error('JSpec depends on ' + dependency + ' ' + message) }
     },
 
     /**
@@ -959,25 +978,26 @@
 
   // --- Utility functions
 
-  main   = this
-  puts   = print
-  map    = JSpec.map
-  any    = JSpec.any
-  last   = JSpec.last
-  fail   = JSpec.fail
-  range  = JSpec.range
-  each   = JSpec.each
-  option = JSpec.option
-  inject = JSpec.inject
-  error  = JSpec.error
-  escape = JSpec.escape
-  extend = JSpec.extend
-  print  = JSpec.print
-  hash   = JSpec.hash
-  query  = JSpec.query
-  strip  = JSpec.strip
-  color  = JSpec.color
-  addMatchers = JSpec.addMatchers
+  var main   = this
+  var puts   = print
+  var map    = JSpec.map
+  var any    = JSpec.any
+  var last   = JSpec.last
+  var fail   = JSpec.fail
+  var range  = JSpec.range
+  var each   = JSpec.each
+  var option = JSpec.option
+  var inject = JSpec.inject
+  var error  = JSpec.error
+  var escape = JSpec.escape
+  var extend = JSpec.extend
+  var print  = JSpec.print
+  var hash   = JSpec.hash
+  var query  = JSpec.query
+  var strip  = JSpec.strip
+  var color  = JSpec.color
+  var expect = JSpec.expect
+  var addMatchers = JSpec.addMatchers
 
   // --- Matchers
 
@@ -1081,4 +1101,4 @@
   
   this.JSpec = JSpec
 
-})();
+})();

data/spec/spec.grammar.js

@@ -28,6 +28,12 @@ describe 'Grammar'
     -{ throw 'test' }.should.throw_error
   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)
+  end
+  
   it 'should allow commenting out of conversions'
     // -{ throw 'foo' }.should.throw_error
     // foo.should.not.eql 'bar'

metadata

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