visionmedia-jspec 2.8.4 → 2.9.0

data/History.rdoc

@@ -1,4 +1,25 @@
 
+=== 2.9.0 / 2009-08-21
+
+* Server output matching Rhino when using verbose or failuresOnly options
+* Added mock_request() and unmock_request() as aliases for mockRequest() and unmockRequest()
+* Added JSpec.JSON.encode()
+* Added default Sinatra routes /slow/NUMBER and /status/NUMBER for simulating
+  slow reponses and HTTP status codes.
+* Added server support for loading spec/jspec.rb (or jspec/jspec.rb for rails)
+  Allowing additional browser support to be plugged in, as well as Sinatra routes.
+* Added dependency for Sinatra (new server)
+* Added a new Ruby server
+* Added support for --bind and --server on various platforms
+* Added Google Chrome support
+* Added Internet Explorer support
+* Change; --server without --browsers defaults to all supported browsers
+* Removed JSpec.reportToServer()
+  Now utilizes JSpec.formatters.Server to handle this 
+  functionality.
+* Fixed Server output escaping (removed html escaping from puts()) [#13]
+* Fixed JSpec.load(); returns responseText when 2xx or 0 (for file://)
+
 === 2.8.4 / 2009-08-02
 
 * Fixed error thrown when a module has no utilities

data/Manifest

@@ -15,6 +15,8 @@ Manifest
 Rakefile
 README.rdoc
 server/browsers.rb
+server/helpers.rb
+server/routes.rb
 server/server.rb
 spec/async
 spec/env.js
@@ -22,6 +24,7 @@ spec/fixtures/test.html
 spec/fixtures/test.json
 spec/fixtures/test.xml
 spec/modules.js
+spec/server.rb
 spec/spec.dom.html
 spec/spec.fixtures.js
 spec/spec.grammar-less.js
@@ -40,10 +43,12 @@ spec/spec.xhr.js
 templates/default/History.rdoc
 templates/default/lib/yourlib.core.js
 templates/default/README.rdoc
+templates/default/spec/server.rb
 templates/default/spec/spec.core.js
 templates/default/spec/spec.dom.html
 templates/default/spec/spec.rhino.js
 templates/default/spec/spec.server.html
+templates/rails/server.rb
 templates/rails/spec.application.js
 templates/rails/spec.dom.html
 templates/rails/spec.rhino.js

data/README.rdoc

@@ -125,9 +125,10 @@ JSpec.options hash, by passing string-based option values via the
 query string, or passing a hash to run(). For example 
 JSpec.options.failuresOnly = true, and ?failuresOnly=1 will both work.
 
-* profile {bool} when enabled, uses console.time() in order to display performance information in your console log as specs are completed. (DOM, Console)
-* failuresOnly {bool} displays only failing specs, making them quick to discover and fix (DOM, Terminal)
-* reportToId {string} an element id to report to when using the DOM formatter (DOM)
+* profile       {bool} when enabled, uses console.time() in order to display performance information in your console log as specs are completed. (DOM, Console)
+* failuresOnly {bool} displays only failing specs, making them quick to discover and fix (DOM, Terminal, Server)
+* reportToId   {string} an element id to report to when using the DOM formatter (DOM)
+* verbose      {bool} verbose server output, defaults to false (Server)
   
 == Matchers
 
@@ -242,9 +243,9 @@ on any object when using the JSpec grammar:
 
   * Core
 
-  - an_instance_of   used in conjunction with the 'receive' matcher
-  - mockRequest      mock a request (requires jspec.xhr.js)
-  - unmockRequest    unmock requests (requests jspec.xhr.js)
+  - an_instance_of                 used in conjunction with the 'receive' matcher
+  - mockRequest, mock_request      mock a request (requires jspec.xhr.js)
+  - unmockRequest, unmock_request  unmock requests (requests jspec.xhr.js)
                 
   * jQuery      
                 
@@ -545,7 +546,6 @@ anything that has been done by a Module.
   - loading(file)                    : loading a file                                   : returning 'stop' will prevent loading
   - executing(file)                  : executing a file                                 : returning 'stop' will prevent execution 
   - posting(data, url)               : posting data to a url                            : returning 'stop' will prevent request
-  - reportingToServer(url)           : reporting to server url                          : returning 'stop' will prevent reporting to server
   - preprocessing(input)             : before input string is preprocessed              : return input string for next hook to preprocess
   - stubbing(object, method, result) : called when stubbing an object's method, and return value (result). : (no return value)
   - requiring(dependency, message)   : requiring a dependency                           : (no return value) 
@@ -631,13 +631,35 @@ back to the terminal. It is essentially the same as using the DOM formatter
 and auto-testing each browser, however results are centralized to the terminal,
 removing the need to manually view each browser's output.
 
-Initialize project with:
-  $ jspec init myproject 
+When utilizing the server if a file named spec/jspec.rb (or jspec/jspec.rb for rails)
+is present, then it will be loaded before the server is started. This allows you to
+add Sinatra routes, support additional Browsers, etc.
 
-Run with:
+Run with all supported browsers:
   $ jspec run --server
   
+Run with specific browsers:
+  $ jspec run --browsers Safari,Firefox,Chrome,Explorer
+  
+Run with alternative browser names:
+  $ jspec run --browsers safari,ff,chrome,ie
+  
+Browsers supported in core:
+  Browser::Safari
+  Browser::Chrome
+  Browser::Opera
+  Browser::Firefox
+  Browser::IE
   
+Supplied routes:
+  /slow/NUMBER
+  /status/NUMBER
+  
+For example $.get('/slow/4', function(){}) will take 4 seconds
+to reply, where as $.get('/status/404', function(){}) will respond
+with an 404 status code. Add additional Sinatra routes to the jspec.rb
+file to add your own functionality.
+
 == Ruby on Rails
 
 No additional gems are required for JSpec to work with rails, although 
@@ -677,6 +699,10 @@ Or run via the terminal using Rhino:
     return 'html'
   })
   
+== Additional JSpec Modules
+
+* JSocka stubbing http://github.com/gisikw/jsocka/tree/master
+  
 == More Information
 
 * Featured article in JSMag: http://www.jsmag.com/main.issues.description/id=21/

data/Rakefile

@@ -12,6 +12,8 @@ Echoe.new "jspec", version do |p|
   p.email = "tj@vision-media.ca"
   p.summary = "JavaScript BDD Testing Framework"
   p.url = "http://visionmedia.github.com/jspec"
+  p.runtime_dependencies << "sinatra"
+  p.runtime_dependencies << "json"
   p.runtime_dependencies << "visionmedia-commander >=3.2.9"
   p.runtime_dependencies << "visionmedia-bind >=0.2.6"
 end

data/bin/jspec

@@ -2,16 +2,17 @@
 
 JSPEC_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 $:.unshift JSPEC_ROOT
- 
+
 require 'rubygems'
 require 'commander'
 require 'bind'
 require 'fileutils'
+require 'server/server'
 
 RHINO = 'java org.mozilla.javascript.tools.shell.Main'
 
 program :name, 'JSpec'
-program :version, '2.8.4'
+program :version, '2.9.0'
 program :description, 'JavaScript BDD Testing Framework'
 default_command :bind
 
@@ -26,9 +27,9 @@ command :init do |c|
   c.when_called do |args, options|
     dest = args.shift || '.'
     if options.rails
-      initialize_rails_to dest
+      initialize_rails_at dest
     else
-      initialize_to dest
+      initialize_at dest
     end
     say "Template initialized at '#{dest}'"
   end
@@ -71,38 +72,44 @@ command :run do |c|
     the [path] to spec/server.html'
   c.example 'Run once in Safari', 'jspec run'
   c.example 'Run once in Safari and Firefox', 'jspec run --browsers Safari,Firefox'
+  c.example 'Run once in Opera, Firefox, and Chrome', 'jspec run --browsers opera,ff,chrome'
   c.example 'Run custom spec file', 'jspec run foo.html'
   c.example 'Auto-run browsers when a file is altered', 'jspec run --bind --browsers Safari,Firefox'
   c.example 'Shortcut for the previous example', 'jspec --browsers Safari,Firefox'
   c.example 'Auto-run rhino when a file is altered', 'jspec --rhino'
+  c.example 'Run Rhino specs at spec/rhino.js', 'jspec run --rhino'
   c.example 'Run Rhino specs once', 'jspec run specs/something.js --rhino'
-  c.option '-b', '--browsers BROWSERS', Array, 'Specify browsers to test, defaults to Safari'
+  c.option '-b', '--browsers BROWSERS', Array, 'Specify browsers to test'
   c.option '-p', '--paths PATHS', Array, 'Specify paths when binding, defaults to javascript within ./lib and ./spec'
   c.option '-B', '--bind', 'Auto-run specs when source files or specs are altered'
   c.option '-R', '--rhino', 'Run specs using Rhino'
   c.option '-S', '--server', 'Run specs using the JSpec server'
-  c.option '-s', '--server-only', 'Start JSpec server without running browsers'
+  c.option '-P', '--port NUMBER', Integer, 'Start JSpec server using the given port number'
   c.when_called do |args, options|
     
     # Rails
     if rails?
-      options.default :browsers => %w( Safari ), :paths => ['public/javascripts/**/*.js', 'jspec/**/*.js']
-    else
-      options.default :browsers => %w( Safari ), :paths => ['lib/**/*.js', 'spec/**/*.js']
+      options.default :paths => ['public/javascripts/**/*.js', 'jspec/**/*.js'], :port => 4444
+    else              
+      options.default :paths => ['lib/**/*.js', 'spec/**/*.js'], :port => 4444
     end
     
     # Actions
     if options.rhino
-      spec = args.shift || path_to('spec.rhino.js')
-      action = lambda { rhino spec }
-    elsif options.server_only
-      start_server options, nil
+      suite = args.shift || path_to('spec.rhino.js')
+      action = lambda { rhino suite }
     elsif options.server
-      spec = args.shift || path_to('spec.server.html')
-      action = lambda { start_server options, spec }
+      raise 'Cannot use --server with --bind' if options.bind
+      suite = args.shift || path_to('spec.server.html')
+      action = lambda { start_server suite, options }
     else
-      spec = args.shift || path_to('spec.dom.html')
-      action = Bind::Actions::RefreshBrowsers.new spec, *options.browsers
+      suite = args.shift || path_to('spec.dom.html')
+      browsers = browsers_for options.browsers || ['safari']
+      action = lambda do
+        browsers.each do |browser|
+          browser.visit File.expand_path(suite)
+        end
+      end
     end
     
     # Binding
@@ -110,13 +117,16 @@ command :run do |c|
       listener = Bind::Listener.new :paths => options.paths, :interval => 1, :actions => [action], :debug => $stdout
       listener.run!
     else
-      action.call File.new(spec)
+      action.call File.new(suite)
     end
   end
 end
 alias_command :bind, :run, '--bind'
 
-def initialize_to dest
+##
+# Initialize template at _dest_. 
+
+def initialize_at dest
   unless Dir[dest + '/*'].empty?
     abort unless agree "'#{dest}' is not empty; continue? "
   end
@@ -124,7 +134,10 @@ def initialize_to dest
   replace_root_in dest, 'spec/spec.dom.html', 'spec/spec.rhino.js'
 end
 
-def initialize_rails_to dest
+##
+# Initialize rails template at _dest_.
+
+def initialize_rails_at dest
   unless looks_like_rails_root?(dest)
     abort unless agree "'#{dest}' does not look like root of a rails project; continue? "
   end
@@ -132,33 +145,74 @@ def initialize_rails_to dest
   replace_root_in "#{dest}/jspec", 'spec.dom.html', 'spec.rhino.js'
 end
 
+##
+# Copy template _name_ to _dest_.
+
 def copy_template_to name, dest
   FileUtils.mkdir_p dest
   FileUtils.cp_r path_to_template(name), dest
 end
 
+##
+# Return path to template _name_.
+
 def path_to_template name
   File.join JSPEC_ROOT, 'templates', name, '.'
 end
 
+##
+# Resolve path to _file_. Supports rails and unbound projects.
+
 def path_to file
   rails? ? "jspec/#{file}" : "spec/#{file}"
 end
 
+##
+# Execute _file_ with Rhino.
+
 def rhino file
-  abort "#{file} not found" unless File.exists? file
+  raise "#{file} not found" unless File.exists? file
   system "#{RHINO} #{file}"
 end
 
-def start_server options, spec
-  require 'server/server'
-  JSpec::Server.start options, spec
+##
+# Start server with _suite_ html and _options_.
+
+def start_server suite, options
+  set :port, options.port
+  set :server, 'Mongrel'
+  enable :sessions
+  disable :logging
+  hook = File.expand_path path_to('server.rb')
+  load hook if File.exists? hook
+  JSpec::Server.new(suite, options.port).start(options.browsers ? browsers_for(options.browsers) : nil)
 end
 
+##
+# Return array of browser instances for the given _names_.
+
+def browsers_for names
+  names.map do |name|
+    begin
+      Browser.subclasses.find do |browser|
+        browser.matches_name? name
+      end.new
+    rescue
+      raise "Unsupported browser `#{name}'"
+    end
+  end
+end
+
+##
+# Check if the current directory looks like a rails app.
+
 def rails?
   File.directory? 'jspec'  
 end
 
+##
+# Replace JSPEC_ROOT placeholder in _paths_ relative to _dest_.
+
 def replace_root_in dest, *paths
   paths.each do |path|
     path = File.join dest, path
@@ -167,6 +221,9 @@ def replace_root_in dest, *paths
   end
 end
 
+##
+# Update JSpec version in _paths_. Matches visionmedia-jspec-TRIPLE
+
 def update_version_in *paths
   paths.each do |path|
     next unless File.exists? path
@@ -177,6 +234,9 @@ def update_version_in *paths
   say "Finished updating JSpec"
 end
 
+##
+# Check if _path_ looks like a rails root directory.
+
 def looks_like_rails_root? path = '.'
   File.directory? "#{path}/vendor"
 end

data/jspec.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jspec}
-  s.version = "2.8.4"
+  s.version = "2.9.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-08-02}
+  s.date = %q{2009-08-21}
   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", "lib/jspec.xhr.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", "lib/jspec.xhr.js", "Manifest", "Rakefile", "README.rdoc", "server/browsers.rb", "server/server.rb", "spec/async", "spec/env.js", "spec/fixtures/test.html", "spec/fixtures/test.json", "spec/fixtures/test.xml", "spec/modules.js", "spec/spec.dom.html", "spec/spec.fixtures.js", "spec/spec.grammar-less.js", "spec/spec.grammar.js", "spec/spec.jquery.js", "spec/spec.jquery.xhr.js", "spec/spec.js", "spec/spec.matchers.js", "spec/spec.modules.js", "spec/spec.node.js", "spec/spec.rhino.js", "spec/spec.server.html", "spec/spec.shared-behaviors.js", "spec/spec.utils.js", "spec/spec.xhr.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", "templates/rails/spec.application.js", "templates/rails/spec.dom.html", "templates/rails/spec.rhino.js", "templates/rails/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", "lib/jspec.xhr.js", "Manifest", "Rakefile", "README.rdoc", "server/browsers.rb", "server/helpers.rb", "server/routes.rb", "server/server.rb", "spec/async", "spec/env.js", "spec/fixtures/test.html", "spec/fixtures/test.json", "spec/fixtures/test.xml", "spec/modules.js", "spec/server.rb", "spec/spec.dom.html", "spec/spec.fixtures.js", "spec/spec.grammar-less.js", "spec/spec.grammar.js", "spec/spec.jquery.js", "spec/spec.jquery.xhr.js", "spec/spec.js", "spec/spec.matchers.js", "spec/spec.modules.js", "spec/spec.node.js", "spec/spec.rhino.js", "spec/spec.server.html", "spec/spec.shared-behaviors.js", "spec/spec.utils.js", "spec/spec.xhr.js", "templates/default/History.rdoc", "templates/default/lib/yourlib.core.js", "templates/default/README.rdoc", "templates/default/spec/server.rb", "templates/default/spec/spec.core.js", "templates/default/spec/spec.dom.html", "templates/default/spec/spec.rhino.js", "templates/default/spec/spec.server.html", "templates/rails/server.rb", "templates/rails/spec.application.js", "templates/rails/spec.dom.html", "templates/rails/spec.rhino.js", "templates/rails/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"]
@@ -25,13 +25,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<visionmedia-commander>, [">= 3.2.9"])
       s.add_runtime_dependency(%q<visionmedia-bind>, [">= 0.2.6"])
     else
+      s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<visionmedia-commander>, [">= 3.2.9"])
       s.add_dependency(%q<visionmedia-bind>, [">= 0.2.6"])
     end
   else
+    s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<visionmedia-commander>, [">= 3.2.9"])
     s.add_dependency(%q<visionmedia-bind>, [">= 0.2.6"])
   end

data/lib/jspec.jquery.js

@@ -8,14 +8,14 @@ JSpec
   // --- Initialize
   
   init : function() {
-    jQuery.ajaxSetup({ async : false })
+    jQuery.ajaxSetup({ async: false })
   },
   
   // --- Utilities
   
   utilities : {
-    element : jQuery,
-    elements : jQuery,
+    element:  jQuery,
+    elements: jQuery,
     sandbox : function() {
       return jQuery('<div class="sandbox"></div>')
     }