jspec 3.2.1 → 3.3.0

data/History.md

@@ -1,4 +1,13 @@
 
+3.3.0 / 2010-02-16
+==================
+
+  * Added support for Chrome on Linux [alex-bepple]
+  * Added node.js support in core, no longer has node-specific code in template
+  * Fixed linux Default browser support, use 'xdg-open' [alex-bepple]
+  * Fixed lastRequest global
+  * Removed Console reporter. Closes #142
+
 3.2.1 / 2010-02-02
 ==================
 

data/README.md

@@ -24,7 +24,7 @@ and **much more**.
   * Extremely simple and intuitive matcher declaration
   * Over 45 core matchers
   * Allows parens to be optional when using matchers to increase readability
-  * Several helpful reporters (DOM, Console, Terminal, ...)
+  * Several helpful reporters (DOM, Terminal, ...)
   * Assertion graphs displaying how many, and which assertions pass or failed
   * Default / customizable evaluation contexts
   * DOM sandbox support
@@ -519,7 +519,7 @@ to paste the issue ticket's comment(s) below this area for reference.
 To change a reporter simply alter the options hash like below, assigning
 a new constructor, or pass it within the hash to `run()`:
 
-    JSpec.options.reporter = JSpec.reporters.Console
+    JSpec.options.reporter = JSpec.reporters.Terminal
 
 OR
 

data/jspec.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "3.2.1"
+  s.version = "3.3.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-02-02}
+  s.date = %q{2010-02-16}
   s.default_executable = %q{jspec}
   s.description = %q{JavaScript BDD Testing Framework}
   s.email = %q{tj@vision-media.ca}

data/lib/jspec.js

@@ -4,7 +4,7 @@
 ;(function(){
 
   JSpec = {
-    version   : '3.2.1',
+    version   : '3.3.0',
     assert    : true,
     cache     : {},
     suites    : [],
@@ -126,10 +126,10 @@
        */
 
       DOM : function(results, options) {
-        var id = option('reportToId') || 'jspec'
-        var report = document.getElementById(id)
-        var failuresOnly = option('failuresOnly')
-        var classes = results.stats.failures ? 'has-failures' : ''
+        var id = option('reportToId') || 'jspec',
+            report = document.getElementById(id),
+            failuresOnly = option('failuresOnly'),
+            classes = results.stats.failures ? 'has-failures' : ''
         if (!report) throw 'JSpec requires the element #' + id + ' to output its reports'
         
         function bodyContents(body) {
@@ -170,7 +170,7 @@
        */
        
        Terminal : function(results, options) {
-         failuresOnly = option('failuresOnly')
+         var failuresOnly = option('failuresOnly')
          print(color("\n Passes: ", 'bold') + color(results.stats.passes, 'green') + 
                color(" Failures: ", 'bold') + color(results.stats.failures, 'red') +
                color(" Duration: ", 'bold') + color(results.duration, 'green') + " ms \n")
@@ -200,33 +200,7 @@
          })
          
          quit(results.stats.failures)
-       },
-
-      /**
-       * Console reporter.
-       *
-       * @api public
-       */
-
-      Console : function(results, options) {
-        console.log('')
-        console.log('Passes: ' + results.stats.passes + ' Failures: ' + results.stats.failures)
-        each(results.allSuites, function(suite) {
-          if (suite.ran) {
-            console.group(suite.description)
-            each(suite.specs, function(spec){
-              var assertionCount = spec.assertions.length + ':'
-              if (spec.requiresImplementation())
-                console.warn(spec.description)
-              else if (spec.passed())
-                console.log(assertionCount + ' ' + spec.description)
-              else 
-                console.error(assertionCount + ' ' + spec.description + ', ' + spec.failure().message)
-            })
-            console.groupEnd()
-          }
-        })
-      }
+       }
     },
     
     Assertion : function(matcher, actual, expected, negate) {
@@ -1637,12 +1611,30 @@
       return this
     }
   }
-
+  
+  // --- Node.js support
+  
+  if (typeof GLOBAL === 'object' && typeof exports === 'object') {
+    var posix = require('posix')
+    quit = process.exit
+    print = require('sys').puts
+
+    readFile = function(path) {
+      var result
+      posix
+        .cat(path, "utf8")
+        .addCallback(function(contents){ result = contents })
+        .addErrback(function(){ throw new Error("failed to read file `" + path + "'") })
+        .wait()
+      return result
+    }
+  }
+  
   // --- Utility functions
 
-  var main = this
-  var find = JSpec.any
-  var utils = 'haveStopped stub hookImmutable hook destub map any last pass fail range each option inject select \
+  var main = this,
+      find = JSpec.any,
+      utils = 'haveStopped stub hookImmutable hook destub map any last pass fail range each option inject select \
                error escape extend puts query strip color does addMatchers callIterator toArray equal'.split(/\s+/)
   while (utils.length) eval('var ' + utils[0] + ' = JSpec.' + utils.shift())
   if (!main.setTimeout) main.setTimeout = function(callback){ callback() }

data/lib/jspec.xhr.js

@@ -3,6 +3,8 @@
 
 (function(){
   
+  var lastRequest
+  
   // --- Original XMLHttpRequest
   
   var OriginalXMLHttpRequest = 'XMLHttpRequest' in this ? 

data/spec/node.js

@@ -1,23 +1,9 @@
 
 require.paths.unshift('./lib', './spec');
-process.mixin(require('sys'))
 
 require("jspec")
 require("unit/helpers")
 
-quit = process.exit
-print = puts
-
-readFile = function(path) {
-  var result
-  require('posix')
-    .cat(path, "utf8")
-    .addCallback(function(contents){ result = contents })
-    .addErrback(function(){ throw new Error("failed to read file `" + path + "'") })
-    .wait()
-  return result
-}
-
 JSpec
 .exec('spec/unit/spec.js')
 .exec('spec/unit/spec.utils.js')

data/spec/rhino.js

@@ -4,7 +4,6 @@ Envjs('spec/fixtures/test.html')
 load('spec/support/jquery.js')
 load('lib/jspec.js')
 load('lib/jspec.xhr.js')
-load('lib/jspec.growl.js')
 load('lib/jspec.jquery.js')
 load('spec/unit/helpers.js')
 load('spec/unit/spec.grammar-less.js')

data/src/browsers.rb

@@ -32,7 +32,7 @@ class Browser
   end
   
   ##
-  # Weither or not the browser is supported.
+  # Whether or not the browser is supported.
   
   def supported?; true end
   
@@ -94,10 +94,7 @@ class Browser
     def visit uri
       system 'open', uri if macos?
       system 'start', uri if windows?
-    end
-    
-    def supported?
-      macos?
+      system 'xdg-open', uri if linux?
     end
     
     def to_s
@@ -177,11 +174,12 @@ class Browser
     end
     
     def supported?
-      macos?
+      macos? or linux?
     end
     
     def visit uri
       system "open -g -a 'Google Chrome' #{uri}" if macos?
+      system "google-chrome #{uri}" if linux?
     end
     
     def to_s

data/templates/default/spec/node.js

@@ -1,23 +1,9 @@
 
-process.mixin(require('sys'))
 require.paths.unshift('spec', 'JSPEC_ROOT/lib', 'lib')
 require('jspec')
 require('unit/spec.helper')
 require('yourlib')
 
-quit = process.exit
-print = puts
-
-readFile = function(path) {
-  var result
-  require('posix')
-    .cat(path, "utf8")
-    .addCallback(function(contents){ result = contents })
-    .addErrback(function(){ throw new Error("failed to read file `" + path + "'") })
-    .wait()
-  return result
-}
-
 JSpec
   .exec('spec/unit/spec.js')
   .run({ reporter: JSpec.reporters.Terminal, fixturePath: 'spec/fixtures' })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jspec
 version: !ruby/object:Gem::Version 
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 -08:00
+date: 2010-02-16 00:00:00 -08:00
 default_executable: jspec
 dependencies: 
 - !ruby/object:Gem::Dependency