jasmine 2.0.0 → 2.0.1

data/.travis.yml

@@ -20,3 +20,6 @@ matrix:
       env: "RAILS_VERSION=pojs"
     - rvm: "jruby"
       env: "RAILS_VERSION=pojs"
+
+before_install:
+  - gem install bundler -v "= 1.5.1"

data/lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine.yml

@@ -25,7 +25,7 @@ src_files:
 #   - stylesheets/*.css
 #
 stylesheets:
-  - stylesheets/**/*.css
+  - assets/application.css
 
 # helpers
 #
@@ -110,3 +110,15 @@ boot_dir:
 #
 boot_files:
 
+# rack_options
+#
+# Extra options to be passed to the rack server
+# by default, Port and AccessLog are passed.
+#
+# This is an advanced options, and left empty by default
+#
+# EXAMPLE
+#
+# rack_options:
+#   server: 'thin'
+

data/lib/jasmine/application.rb

@@ -9,8 +9,8 @@ require 'ostruct'
 module Jasmine
   class Application
     def self.app(config, builder = Rack::Builder.new)
-      config.rack_apps.each do |(app, config_block)|
-        builder.use(app, &config_block)
+      config.rack_apps.each do |app_config|
+        builder.use(app_config[:app], *app_config[:args], &app_config[:block])
       end
       config.rack_path_map.each do |path, handler|
         builder.map(path) { run handler.call }

data/lib/jasmine/base.rb

@@ -23,7 +23,7 @@ module Jasmine
     require 'socket'
     begin
       socket = TCPSocket.open(hostname, port)
-    rescue Errno::ECONNREFUSED
+    rescue Errno::ECONNREFUSED, Errno::ENETUNREACH
       return false
     end
     socket.close

data/lib/jasmine/command_line_tool.rb

@@ -5,7 +5,7 @@ module Jasmine
     def process(argv)
       @argv = argv
 
-      if respond_to?(@argv[0])
+      if @argv.size > 0 && respond_to?(@argv[0])
         public_send(@argv[0])
       else
         print_help
@@ -50,7 +50,7 @@ module Jasmine
     end
 
     def print_help
-      puts "unknown command #{@argv.join(' ')}"
+      puts "unknown command #{@argv.join(' ')}" unless @argv.empty?
       puts "Usage: jasmine init"
       puts "               examples"
       puts "               copy_boot_js"
@@ -76,7 +76,7 @@ module Jasmine
           FileUtils.mkdir_p(File.dirname(dest_path))
           FileUtils.copy(source_path, dest_path)
           if File.basename(dest_path) == 'jasmine.yml'
-            replaced = File.read(dest_path).gsub("assets/application.js", "public/javascripts/**/*.js")
+            replaced = File.read(dest_path).gsub("assets/application.js", "public/javascripts/**/*.js").gsub("assets/application.css", "stylesheets/**/*.css")
             File.open(dest_path, 'w') do |file|
               file.write(replaced)
             end
@@ -94,7 +94,7 @@ module Jasmine
         puts <<-EOF
 
 You're attempting to run jasmine init in a Rails project. You probably want to use the Rails generator like so:
-    rails g jasmine:init
+    rails g jasmine:install
 
 If you're not actually in a Rails application, just run this command again with --force
     jasmine init --force

data/lib/jasmine/config.rb

@@ -17,6 +17,7 @@ module Jasmine
     @config.src_path = src_path = '/'
     @config.spec_path = spec_path = '/__spec__'
     @config.boot_path = boot_path = '/__boot__'
+    @config.runner_boot_path = runner_boot_path = '/__runner_boot__'
     @config.image_path = image_path = '/__images__'
 
     @config.jasmine_dir = core_config.path
@@ -26,6 +27,7 @@ module Jasmine
     @config.jasmine_css_files = lambda { core_config.css_files }
     @config.add_rack_path(jasmine_path, lambda { Rack::File.new(config.jasmine_dir) })
     @config.add_rack_path(boot_path, lambda { Rack::File.new(config.boot_dir) })
+    @config.add_rack_path(runner_boot_path, lambda { Rack::File.new(config.runner_boot_dir) })
     if Jasmine::Dependencies.use_asset_pipeline?
       @config.add_rack_path(spec_path, lambda {
         sprockets_spec_env = Sprockets::Environment.new
@@ -96,6 +98,8 @@ module Jasmine
 
         config.spec_dir = yaml_config.spec_dir
         config.spec_files = lambda { yaml_config.helpers + yaml_config.spec_files }
+
+        config.rack_options = yaml_config.rack_options
       end
       require yaml_config.spec_helper if File.exist?(yaml_config.spec_helper)
     else

data/lib/jasmine/configuration.rb

@@ -1,13 +1,14 @@
 module Jasmine
   class Configuration
     attr_writer :jasmine_css_files, :css_files
-    attr_writer :jasmine_files, :boot_files, :src_files, :spec_files
-    attr_accessor :jasmine_path, :spec_path, :boot_path, :src_path, :image_path
-    attr_accessor :jasmine_dir, :spec_dir, :boot_dir, :src_dir, :images_dir
+    attr_writer :jasmine_files, :boot_files, :src_files, :spec_files, :runner_boot_files
+    attr_accessor :jasmine_path, :spec_path, :boot_path, :src_path, :image_path, :runner_boot_path
+    attr_accessor :jasmine_dir, :spec_dir, :boot_dir, :src_dir, :images_dir, :runner_boot_dir
     attr_accessor :formatters
     attr_accessor :host
     attr_accessor :spec_format
     attr_accessor :runner
+    attr_accessor :rack_options
 
     def initialize()
       @rack_paths = {}
@@ -17,9 +18,11 @@ module Jasmine
       @css_files = lambda { [] }
       @jasmine_files = lambda { [] }
       @boot_files = lambda { [] }
+      @runner_boot_files = lambda { [] }
       @src_files = lambda { [] }
       @spec_files = lambda { [] }
       @runner = lambda { |config| }
+      @rack_options = {}
 
       @formatters = [Jasmine::Formatters::Console]
 
@@ -34,6 +37,7 @@ module Jasmine
     def js_files
       map(@jasmine_files, :jasmine) +
         map(@boot_files, :boot) +
+        map(@runner_boot_files, :runner_boot) +
         map(@src_files, :src) +
         map(@spec_files, :spec)
     end
@@ -50,8 +54,12 @@ module Jasmine
       [] + @apps
     end
 
-    def add_rack_app(app, &block)
-      @apps << [app, block]
+    def add_rack_app(app, *args, &block)
+      @apps << {
+          :app => app,
+          :args => args,
+          :block => block
+      }
     end
 
     def add_path_mapper(mapper)

data/lib/jasmine/dependencies.rb

@@ -7,7 +7,7 @@ module Jasmine
       end
 
       def rails4?
-        safe_gem_check("rails", "~> 4.0.0.rc1") && running_rails4?
+        safe_gem_check("rails", "~> 4") && running_rails4?
       end
 
       def rails?

data/lib/jasmine/formatters/console.rb

@@ -1,17 +1,19 @@
 module Jasmine
   module Formatters
     class Console
-      def initialize(outputter = Kernel.method(:puts))
+      def initialize(outputter = Kernel)
         @results = []
         @outputter = outputter
       end
 
       def format(results_batch)
-        outputter.call(failures(results_batch))
+        outputter.print(chars(results_batch))
         @results += results_batch
       end
 
       def done
+        outputter.puts
+        outputter.puts(failures(@results))
         failure_count = results.count(&:failed?)
         pending_count = results.count(&:pending?)
         summary = "#{pluralize(results.size, 'spec')}, " +
@@ -19,7 +21,7 @@ module Jasmine
 
         summary += ", #{pluralize(pending_count, 'pending spec')}" if pending_count > 0
 
-        outputter.call(summary)
+        outputter.puts(summary)
       end
 
       private
@@ -29,6 +31,18 @@ module Jasmine
         results.select(&:failed?).map { |f| failure_message(f) }.join("\n\n")
       end
 
+      def chars(results)
+        results.map do |result|
+          if result.succeeded?
+            "\e[32m.\e[0m"
+          elsif result.pending?
+            "\e[33m*\e[0m"
+          else
+            "\e[31mF\e[0m"
+          end
+        end.join('')
+      end
+
       def pluralize(count, str)
         word = (count == 1) ? str : str + 's'
         "#{count} #{word}"

data/lib/jasmine/path_expander.rb

@@ -7,7 +7,11 @@ module Jasmine
         patterns.map do |path|
           files = globber.call(File.join(base_directory, path.gsub(/^!/, '')))
           if files.empty? && !(path =~ /\*|^\!/)
-            files = [File.join(base_directory, path)]
+            if path[0..3] == 'http'
+              files << path
+            else
+              files = [File.join(base_directory, path)]
+            end
           end
           files.sort
         end.flatten.uniq

data/lib/jasmine/path_mapper.rb

@@ -16,14 +16,23 @@ module Jasmine
       map(paths, @config.boot_dir, @config.boot_path)
     end
 
+    def map_runner_boot_paths(paths)
+      map(paths, @config.runner_boot_dir, @config.runner_boot_path)
+    end
+
     def map_jasmine_paths(paths)
       map(paths, @config.jasmine_dir, @config.jasmine_path)
     end
 
     private
     def map(paths, remove_path, add_path)
-      paths.map { |path| File.join(add_path, (path.gsub(remove_path, ''))) }
+      paths.map do |path|
+        if path[0..3] == 'http'
+          path
+        else
+          File.join(add_path, (path.gsub(remove_path, '')))
+        end
+      end
     end
-
   end
 end

data/lib/jasmine/railtie.rb

@@ -3,7 +3,7 @@ require 'rails/railtie'
 module Jasmine
   class Railtie < Rails::Railtie
 
-    config.before_configuration do
+    initializer "jasmine.initializer", :before => :load_environment_hook do
       old_jasmine_rakefile = ::Rails.root.join('lib', 'tasks', 'jasmine.rake')
       if old_jasmine_rakefile.exist? && !ENV['USE_JASMINE_RAKE']
         puts '

data/lib/jasmine/runners/phantom_boot.js

@@ -0,0 +1,11 @@
+function PhantomReporter() {
+  this.jasmineDone = function() {
+    window.callPhantom({ state: 'jasmineDone'  });
+  };
+
+  this.specDone = function(results) {
+    window.callPhantom({ state: 'specDone', results: results});
+  };
+}
+
+jasmine.getEnv().addReporter(new PhantomReporter());

data/lib/jasmine/runners/phantom_jasmine_run.js

@@ -1,54 +1,18 @@
 (function() {
-  /**
-   * Wait until the test condition is true or a timeout occurs. Useful for waiting
-   * on a server response or for a ui change (fadeIn, etc.) to occur.
-   *
-   * @param testFx javascript condition that evaluates to a boolean,
-   * it can be passed in as a string (e.g.: "1 == 1" or "$('#bar').is(':visible')" or
-   * as a callback function.
-   * @param onReady what to do when testFx condition is fulfilled,
-   * it can be passed in as a string (e.g.: "1 == 1" or "$('#bar').is(':visible')" or
-   * as a callback function.
-   */
-  function waitFor(testFx, onReady) {
-    var condition = false,
-    interval = setInterval(function() {
-      if (!condition) {
-        condition = (typeof(testFx) === 'string' ? eval(testFx) : testFx());
-      } else {
-        if (typeof(onReady) === 'string') {
-          eval(onReady);
-        } else {
-          onReady();
-        }
-        clearInterval(interval);
-      }
-    }, 100);
-  }
-
   var url = phantom.args[0];
-  var batchSize = parseInt(phantom.args[1], 10);
   var page = require('webpage').create();
 
+  page.onCallback = function(data) {
+    if(data.state === 'specDone') {
+      console.log('jasmine_result' + JSON.stringify([].concat(data.results)));
+    } else {
+      phantom.exit(0);
+    }
+  };
+
   page.open(url, function(status) {
     if (status !== "success") {
       phantom.exit(1);
-    } else {
-      waitFor(function() {
-        return page.evaluate(function() {
-          return jsApiReporter && jsApiReporter.finished
-        });
-      }, function() {
-        var index = 0, results;
-        do {
-          results = page.evaluate(function(index, batchSize) {
-            return jsApiReporter.specResults(index, batchSize)
-          }, index, batchSize);
-          console.log(JSON.stringify(results));
-          index += batchSize;
-        } while (results && results.length == batchSize)
-        phantom.exit(0);
-      });
     }
   });
 }).call(this);

data/lib/jasmine/runners/phantom_js.rb

@@ -13,14 +13,21 @@ module Jasmine
         command = "#{Phantomjs.path} '#{File.join(File.dirname(__FILE__), 'phantom_jasmine_run.js')}' #{jasmine_server_url} #{result_batch_size}"
         IO.popen(command) do |output|
           output.each do |line|
-            raw_results = JSON.parse(line, :max_nesting => false)
-            results = raw_results.map { |r| Result.new(r) }
-            formatter.format(results)
+            if line =~ /^jasmine_result/
+              line = line.sub(/^jasmine_result/, '')
+              raw_results = JSON.parse(line, :max_nesting => false)
+              results = raw_results.map { |r| Result.new(r) }
+              formatter.format(results)
+            end
           end
         end
         formatter.done
       end
 
+      def boot_js
+        File.expand_path('phantom_boot.js', File.dirname(__FILE__))
+      end
+
       private
       attr_reader :formatter, :jasmine_server_url, :result_batch_size
     end

data/lib/jasmine/server.rb

@@ -1,8 +1,9 @@
 module Jasmine
   class Server
-    def initialize(port = 8888, application = nil)
+    def initialize(port = 8888, application = nil, rack_options = nil)
       @port = port
       @application = application
+      @rack_options = rack_options || {}
     end
 
     def start
@@ -10,7 +11,7 @@ module Jasmine
         handler = Rack::Handler.get('webrick')
         handler.run(@application, :Port => @port, :AccessLog => [])
       else
-        server = Rack::Server.new(:Port => @port, :AccessLog => [])
+        server = Rack::Server.new(@rack_options.merge(:Port => @port, :AccessLog => []))
         # workaround for Rack bug, when Rack > 1.2.1 is released Rack::Server.start(:app => Jasmine.app(self)) will work
         server.instance_variable_set(:@app, @application)
         server.start

data/lib/jasmine/tasks/jasmine.rake

@@ -23,22 +23,12 @@ namespace :jasmine do
     end
   end
 
+  task :configure_plugins
+
   desc 'Run continuous integration tests'
-  task :ci => %w(jasmine:require_json jasmine:require jasmine:configure) do
+  task :ci => %w(jasmine:require_json jasmine:require jasmine:configure jasmine:configure_plugins) do
     config = Jasmine.config
 
-    server = Jasmine::Server.new(config.port(:ci), Jasmine::Application.app(config))
-    t = Thread.new do
-      begin
-        server.start
-      rescue ChildProcess::TimeoutError
-      end
-      # # ignore bad exits
-    end
-    t.abort_on_exception = true
-    Jasmine::wait_for_listener(config.port(:ci), 'jasmine server')
-    puts 'jasmine server started.'
-
     formatters = config.formatters.map { |formatter_class| formatter_class.new }
 
     exit_code_formatter = Jasmine::Formatters::ExitCode.new
@@ -46,15 +36,28 @@ namespace :jasmine do
 
     url = "#{config.host}:#{config.port(:ci)}/"
     runner = config.runner.call(Jasmine::Formatters::Multi.new(formatters), url)
+    if runner.respond_to?(:boot_js)
+      config.runner_boot_dir = File.dirname(runner.boot_js)
+      config.runner_boot_files = lambda { [runner.boot_js] }
+    end
+
+    server = Jasmine::Server.new(config.port(:ci), Jasmine::Application.app(config), config.rack_options)
+    t = Thread.new do
+      server.start
+    end
+    t.abort_on_exception = true
+    Jasmine::wait_for_listener(config.port(:ci), 'jasmine server')
+    puts 'jasmine server started.'
+
     runner.run
 
     break unless exit_code_formatter.succeeded?
   end
 
-  task :server => %w(jasmine:require jasmine:configure) do
+  task :server => %w(jasmine:require jasmine:configure jasmine:configure_plugins) do
     config = Jasmine.config
     port = config.port(:server)
-    server = Jasmine::Server.new(port, Jasmine::Application.app(Jasmine.config))
+    server = Jasmine::Server.new(port, Jasmine::Application.app(Jasmine.config), config.rack_options)
     puts "your server is running here: http://localhost:#{port}/"
     puts "your tests are here:         #{config.spec_dir}"
     puts "your source files are here:  #{config.src_dir}"

data/lib/jasmine/version.rb

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/jasmine/yaml_config_parser.rb

@@ -59,6 +59,13 @@ module Jasmine
       File.join(@pwd, loaded_yaml['spec_helper'] || File.join('spec', 'javascripts', 'support', 'jasmine_helper.rb'))
     end
 
+    def rack_options
+      loaded_yaml.fetch('rack_options', {}).inject({}) do |memo, (key, value)|
+        memo[key.to_sym] = value
+        memo
+      end
+    end
+
     private
     def loaded_yaml
       @yaml_loader.call(@path)

data/spec/application_spec.rb

@@ -26,14 +26,24 @@ describe 'Jasmine::Application' do
 
     Jasmine::Application.app(config, builder).should == builder
   end
+
   it 'should run rack apps provided by the config' do
     app1 = double(:app1)
     app2 = double(:app2)
+    app3 = double(:app3)
+    app4 = double(:app4)
     block = lambda { 'foo' }
-    config = double(:config, :rack_path_map => [], :rack_apps => [[app1, nil], [app2, block]])
+    config = double(:config, :rack_path_map => [], :rack_apps => [
+        { :app => app1 },
+        { :app => app2, :block => block },
+        { :app => app3, :args => [:foo], :block => block },
+        { :app => app4, :args => [:bar] }
+    ])
     builder = double('Rack::Builder.new')
     builder.should_receive(:use).with(app1)
     builder.should_receive(:use).with(app2, &block)
+    builder.should_receive(:use).with(app3, :foo, &block)
+    builder.should_receive(:use).with(app4, :bar)
     Jasmine::Application.app(config, builder).should == builder
   end
 end

data/spec/configuration_spec.rb

@@ -94,14 +94,30 @@ describe Jasmine::Configuration do
       config = Jasmine::Configuration.new()
       app = double
       config.add_rack_app(app)
-      config.rack_apps.should == [[app, nil]]
+      config.rack_apps.should == [{ :app => app, :args => [], :block => nil }]
     end
-    it 'permits the addition of arbitary rack apps with arbitrary config' do
+
+    it 'permits the addition of arbitary rack apps with a config block' do
       config = Jasmine::Configuration.new()
       app = double
       block = lambda { 'foo' }
       config.add_rack_app(app, &block)
-      config.rack_apps.should == [[app, block]]
+      config.rack_apps.should == [{ :app => app, :args => [], :block => block }]
+    end
+
+    it 'permits the addition of arbitary rack apps with arbitrary config' do
+      config = Jasmine::Configuration.new()
+      app = double
+      config.add_rack_app(app, { :foo => 'bar' })
+      config.rack_apps.should == [{ :app => app, :args => [{ :foo => 'bar' }], :block => nil }]
+    end
+
+    it 'permits the addition of arbitary rack apps with arbitrary config and a config block' do
+      config = Jasmine::Configuration.new()
+      app = double
+      block = lambda { 'foo' }
+      config.add_rack_app(app, { :foo => 'bar' }, &block)
+      config.rack_apps.should == [{ :app => app, :args => [{ :foo => 'bar' }], :block => block }]
     end
   end
 

data/spec/fixture/exception_test.js

@@ -0,0 +1 @@
+desibe('oops', function() {});

data/spec/jasmine_command_line_tool_spec.rb

@@ -23,6 +23,15 @@ describe 'Jasmine command line tool' do
         ci_output.should =~ (/0 specs, 0 failures/)
       end
 
+      it 'should not have rails-like paths' do
+        output = capture_stdout { Jasmine::CommandLineTool.new.process ['init'] }
+        output.should =~ /Jasmine has been installed\./
+
+        config = YAML.load_file(File.join(@tmp, 'spec/javascripts/support/jasmine.yml'))
+        config['src_files'].should == ['public/javascripts/**/*.js']
+        config['stylesheets'].should == ['stylesheets/**/*.css']
+      end
+
       it 'should create a new Rakefile if it does not exist' do
         output = capture_stdout { Jasmine::CommandLineTool.new.process ["init"] }
         output.should =~ /Jasmine has been installed\./
@@ -120,4 +129,14 @@ describe 'Jasmine command line tool' do
 
     output.should =~ /already exists/
   end
+
+  it 'should show help' do
+    no_arg_output = capture_stdout { Jasmine::CommandLineTool.new.process [] }
+    no_arg_output.should_not =~ /unknown command/
+    no_arg_output.should =~ /Usage:/
+
+    unknown_arg_output = capture_stdout { Jasmine::CommandLineTool.new.process ['blurgh', 'blargh'] }
+    unknown_arg_output.should =~ /unknown command blurgh blargh/
+    unknown_arg_output.should =~ /Usage:/
+  end
 end

data/spec/jasmine_rails_spec.rb

@@ -26,11 +26,17 @@ if Jasmine::Dependencies.rails_available?
 
       base = File.absolute_path(File.join(__FILE__, '../..'))
 
-      open('Gemfile', 'a') { |f|
+      # sqlite3 v 1.3.9 is broken on rbx, so restrict to 1.3.8 for now until they fix it.
+      # see: https://github.com/sparklemotion/sqlite3-ruby/issues/122
+      file_contents = File.read('Gemfile')
+
+      open('Gemfile', 'w') { |f|
+        f.puts file_contents.sub("gem 'sqlite3'", "gem 'sqlite3', '1.3.8'")
         f.puts "gem 'jasmine', :path => '#{base}'"
         f.puts "gem 'jasmine-core', :github => 'pivotal/jasmine'"
         f.puts "gem 'rubysl', :platform => :rbx"
         f.puts "gem 'racc', :platform => :rbx"
+        f.puts "gem 'thin'" unless RUBY_PLATFORM == 'java'
         f.flush
       }
 
@@ -81,6 +87,18 @@ if Jasmine::Dependencies.rails_available?
       end
     end
 
+    it "rake jasmine:ci runs specs when an error occurs in the javascript" do
+      Bundler.with_clean_env do
+        FileUtils.cp(File.join(@root, 'spec', 'fixture', 'exception_test.js'), File.join('spec', 'javascripts'))
+        exception_yaml = custom_jasmine_config('exception') do |jasmine_config|
+          jasmine_config['spec_files'] << 'exception_test.js'
+        end
+        output = `bundle exec rake jasmine:ci JASMINE_CONFIG_PATH=#{exception_yaml}`
+        $?.should be_success
+        output.should include('5 specs, 0 failures')
+      end
+    end
+
     it "runs specs written in coffeescript" do
       coffee_yaml = custom_jasmine_config('coffee') do |jasmine_config|
         jasmine_config['spec_files'] << 'coffee_spec.coffee'
@@ -100,7 +118,7 @@ if Jasmine::Dependencies.rails_available?
       }
 
       css_yaml = custom_jasmine_config('css') do |jasmine_config|
-        jasmine_config['src_files'] = ['assets/application.js']
+        jasmine_config['src_files'] = %w[assets/application.js http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js]
         jasmine_config['stylesheets'] = ['assets/application.css']
       end
 
@@ -120,9 +138,10 @@ if Jasmine::Dependencies.rails_available?
           end
 
           output = Net::HTTP.get(URI.parse('http://localhost:8888/'))
-          output.should match(%r{script src.*/assets/jasmine_examples/Player.js})
-          output.should match(%r{script src.*/assets/jasmine_examples/Song.js})
-          output.should match(%r{<link rel=.stylesheet.*?href=./assets/foo.css\?.*?>})
+          output.should match(%r{script src.*/assets/jasmine_examples/Player\.js})
+          output.should match(%r{script src=['"]http://ajax\.googleapis\.com/ajax/libs/jquery/1\.11\.0/jquery\.min\.js})
+          output.should match(%r{script src.*/assets/jasmine_examples/Song\.js})
+          output.should match(%r{<link rel=.stylesheet.*?href=./assets/foo\.css\?.*?>})
         ensure
           Process.kill(:SIGINT, pid)
           begin
@@ -147,5 +166,20 @@ if Jasmine::Dependencies.rails_available?
         output.should include('1 spec, 0 failures')
       end
     end
+
+    it "should pass custom rack options from jasmine.yml" do
+      pending "we're testing this with thin, which doesn't work in jruby" if RUBY_PLATFORM == 'java'
+      rack_yaml = custom_jasmine_config('custom_rack') do |jasmine_config|
+        jasmine_config['rack_options'] = { 'server' => 'webrick' }
+      end
+
+      Bundler.with_clean_env do
+        default_output = `bundle exec rake jasmine:ci`
+        default_output.should include('Thin web server')
+
+        custom_output = `bundle exec rake jasmine:ci JASMINE_CONFIG_PATH=#{rack_yaml} 2>&1`
+        custom_output.should include("WEBrick")
+      end
+    end
   end
 end

data/spec/lib/jasmine/formatters/console_spec.rb

@@ -3,19 +3,24 @@ require 'spec_helper'
 describe Jasmine::Formatters::Console do
 
   let(:outputter_output) { '' }
-  let(:outputter) { lambda { |str| outputter_output << str } }
-  describe '#failures' do
+  let(:outputter) do
+    double(:outputter).tap do |o|
+      o.stub(:print) { |str| outputter_output << str }
+      o.stub(:puts) { |str| outputter_output << "#{str}\n" }
+    end
+  end
+
+  describe '#summary' do
     it 'shows the failure messages' do
       results = [failing_result, failing_result]
-      Jasmine::Formatters::Console.new(outputter).format(results)
-
+      formatter = Jasmine::Formatters::Console.new(outputter)
+      formatter.format(results)
+      formatter.done
       outputter_output.should match(/a suite with a failing spec/)
       outputter_output.should match(/a failure message/)
       outputter_output.should match(/a stack trace/)
     end
-  end
 
-  describe '#summary' do
     describe 'when the full suite passes' do
       it 'shows the spec counts' do
         results = [passing_result]

data/spec/path_expander_spec.rb

@@ -118,4 +118,21 @@ describe Jasmine::PathExpander do
       File.join('some_base', 'src2.js')
     ]
   end
+
+  it "passes through files that are not found by the globber and look like urls" do
+    #this is designed to support cdn files
+    dir_glob = lambda do |pattern|
+      []
+    end
+
+    expanded_files = Jasmine::PathExpander.expand(
+        'some_base',
+        ['http://www.google.com'],
+        dir_glob
+    )
+
+    expanded_files.should == [
+        'http://www.google.com'
+    ]
+  end
 end

data/spec/server_spec.rb

@@ -44,5 +44,12 @@ describe Jasmine::Server do
       Jasmine::Server.new(1234, app).start
       server.instance_variable_get(:@app).should == app
     end
+
+    it "should pass rack options when starting the server" do
+      app = double('application')
+      server = double(:server)
+      Rack::Server.should_receive(:new).with(hash_including(:Port => 1234, :foo => 'bar')).and_return(double(:server).as_null_object)
+      Jasmine::Server.new(1234, app, {:foo => 'bar', :Port => 4321}).start
+    end
   end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -10,81 +11,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jasmine-core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -92,6 +104,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -99,43 +112,49 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: phantomjs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Test your JavaScript without any framework dependencies, in any environment,
@@ -189,6 +208,7 @@ files:
 - lib/jasmine/railtie.rb
 - lib/jasmine/result.rb
 - lib/jasmine/run.html.erb
+- lib/jasmine/runners/phantom_boot.js
 - lib/jasmine/runners/phantom_jasmine_run.js
 - lib/jasmine/runners/phantom_js.rb
 - lib/jasmine/server.rb
@@ -208,6 +228,7 @@ files:
 - spec/configuration_spec.rb
 - spec/fixture/Rakefile
 - spec/fixture/coffee_spec.coffee
+- spec/fixture/exception_test.js
 - spec/fixture/failing_runner.rb
 - spec/fixture/failing_test.js
 - spec/fixture/large_test_suite_spec.js
@@ -230,27 +251,34 @@ files:
 homepage: http://pivotal.github.com/jasmine/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1868816023203409385
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1868816023203409385
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: JavaScript BDD framework
 test_files:
 - spec/application_integration_spec.rb
@@ -259,6 +287,7 @@ test_files:
 - spec/configuration_spec.rb
 - spec/fixture/Rakefile
 - spec/fixture/coffee_spec.coffee
+- spec/fixture/exception_test.js
 - spec/fixture/failing_runner.rb
 - spec/fixture/failing_test.js
 - spec/fixture/large_test_suite_spec.js

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 3a7ce607ec6c8a6bb64af21d08f21d8305dceb95
-  data.tar.gz: c86fcfa19f64ff33754b2fd6251d1d4c8abc9073
-SHA512:
-  metadata.gz: d0013fece64deeb497579113f9004c4765a1040b6cd5b076c8876bde288488f2a08a0505df12f75bb7e1b48cbb4eb6deec0984c2dde5bfb8ef175a0c7d5abf86
-  data.tar.gz: e613e70b7b99fd68da008e3f2ae2bba56cc145df85ae9c8053b4bdb062d7324562e9f6bd1561e85288122345a9cf7cecb66782717af663c54122a254a1aed4ec