jasmine 1.2.0 → 1.2.1

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -55,3 +55,4 @@ matrix:
       env: RAILS_VERSION=pojs-rspec2
   allow_failures:
     - rvm: rbx
+    - rvm: jruby

data/Gemfile

@@ -3,13 +3,6 @@ gemspec
 
 unless ENV["TRAVIS"]
   group :debug do
-    # curl -OL http://rubyforge.org/frs/download.php/75414/linecache19-0.5.13.gem
-    # curl -OL http://rubyforge.org/frs/download.php/75415/ruby-debug-base19-0.11.26.gem
-    # # Replace with your ruby path if necessary
-    # gem install linecache19-0.5.13.gem ruby-debug-base19-0.11.26.gem -- --with-ruby-include=$rvm_path/src/ruby-1.9.3-p125/
-    # rm linecache19-0.5.13.gem ruby-debug-base19-0.11.26.gem
-    gem 'linecache19', '0.5.13'
-    gem 'ruby-debug-base19', '0.11.26'
-    gem 'ruby-debug19', :require => 'ruby-debug'
+    gem 'debugger'
   end
 end

data/RELEASE_NOTES.markdown

@@ -0,0 +1,6 @@
+#1.2.1
+
+* asset manifests following the Rails defaults are included as individual src files
+* Fix regression that required Jasmine restart to find new src/spec files
+* Fixes compatibility with rspec > 2.1.0
+* Internal refactorings/cleanup

data/lib/jasmine.rb

@@ -1,11 +1,17 @@
 jasmine_files = ['base',
                  'dependencies',
+                 'runner_config',
                  'config',
+                 'application',
                  'server',
                  'selenium_driver',
-                 'spec_builder',
+                 'rspec_formatter',
                  'command_line_tool',
-                 'page']
+                 'page',
+                 'asset_pipeline_mapper',
+                 'results_processor',
+                 'results',
+                 File.join('runners', 'http')]
 
 jasmine_files.each do |file|
   require File.join('jasmine', file)

data/lib/jasmine/application.rb

@@ -0,0 +1,40 @@
+require 'rack'
+require 'rack/utils'
+require 'jasmine-core'
+require 'rack/jasmine/runner'
+require 'rack/jasmine/focused_suite'
+require 'rack/jasmine/redirect'
+require 'rack/jasmine/cache_control'
+require 'ostruct'
+
+module Jasmine
+  class Application
+    def self.app(config = Jasmine::RunnerConfig.new)
+      page = Jasmine::Page.new(config)
+      Rack::Builder.app do
+        use Rack::Head
+        use Rack::Jasmine::CacheControl
+        if Jasmine::Dependencies.rails_3_asset_pipeline?
+          map('/assets') do
+            run Rails.application.assets
+          end
+        end
+
+        map('/run.html')         { run Rack::Jasmine::Redirect.new('/') }
+        map('/__suite__')        { run Rack::Jasmine::FocusedSuite.new(config) }
+
+        #TODO: These path mappings should come from the config.
+        map('/__JASMINE_ROOT__') { run Rack::File.new(Jasmine::Core.path) }
+        map(config.spec_path)    { run Rack::File.new(config.spec_dir) }
+        map(config.root_path)    { run Rack::File.new(config.project_root) }
+
+        map('/') do
+          run Rack::Cascade.new([
+            Rack::URLMap.new('/' => Rack::File.new(config.src_dir)),
+            Rack::Jasmine::Runner.new(page)
+          ])
+        end
+      end
+    end
+  end
+end

data/lib/jasmine/asset_pipeline_mapper.rb

@@ -0,0 +1,20 @@
+class Jasmine::AssetPipelineMapper
+
+  def self.context
+    context = ::Rails.application.assets.context_class
+    context.extend(::Sprockets::Helpers::IsolatedHelper)
+    context.extend(::Sprockets::Helpers::RailsHelper)
+  end
+
+  def initialize(src_files, context = Jasmine::AssetPipelineMapper.context)
+    @src_files = src_files
+    @context = context
+  end
+
+  def files
+    @src_files.map do |src_file|
+    filename = src_file.gsub(/^assets\//, '').gsub(/\.js$/, '')
+    @context.asset_paths.asset_for(filename, 'js').to_a.map { |p| @context.asset_path(p).gsub(/^\//, '') + "?body=true" }
+    end.flatten.uniq
+  end
+end

data/lib/jasmine/base.rb

@@ -40,7 +40,7 @@ module Jasmine
   end
 
   def self.runner_filepath
-    File.expand_path(File.join(File.dirname(__FILE__), "runner.rb"))
+    File.expand_path(File.join(File.dirname(__FILE__), "run_specs.rb"))
   end
 
   def self.runner_template

data/lib/jasmine/config.rb

@@ -3,77 +3,6 @@ module Jasmine
     require 'yaml'
     require 'erb'
 
-    def browser
-      ENV["JASMINE_BROWSER"] || 'firefox'
-    end
-
-    def jasmine_host
-      ENV["JASMINE_HOST"] || 'http://localhost'
-    end
-
-    def jasmine_port
-      ENV["JASMINE_PORT"] || Jasmine::find_unused_port
-    end
-
-    def start_server(port = 8888)
-      if defined? Rack::Server # Rack ~>1.0 compatibility
-        server = Rack::Server.new(:Port => port, :AccessLog => [])
-        server.instance_variable_set(:@app, Jasmine.app(self)) # workaround for Rack bug, when Rack > 1.2.1 is released Rack::Server.start(:app => Jasmine.app(self)) will work
-        server.start
-      else
-        handler = Rack::Handler.get('webrick')
-        handler.run(Jasmine.app(self), :Port => port, :AccessLog => [])
-      end
-    end
-
-    def start
-      start_jasmine_server
-      @client = Jasmine::SeleniumDriver.new(browser, "#{jasmine_host}:#{@jasmine_server_port}/")
-      @client.connect
-    end
-
-    def stop
-      @client.disconnect
-    end
-
-    def start_jasmine_server
-      require 'json'
-      @jasmine_server_port = jasmine_port
-      t = Thread.new do
-        begin
-          start_server(@jasmine_server_port)
-        rescue ChildProcess::TimeoutError; end
-        #ignore bad exits
-      end
-      t.abort_on_exception = true
-      Jasmine::wait_for_listener(@jasmine_server_port, "jasmine server")
-      puts "jasmine server started."
-    end
-
-    def windows?
-      require 'rbconfig'
-      ::RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
-    end
-
-    def run
-      begin
-        start
-        puts "servers are listening on their ports -- running the test script..."
-        tests_passed = @client.run
-      ensure
-        stop
-      end
-      return tests_passed
-    end
-
-    def eval_js(script)
-      @client.eval_js(script)
-    end
-
-    def json_generate(obj)
-      @client.json_generate(obj)
-    end
-
     def match_files(dir, patterns)
       dir = File.expand_path(dir)
       negative, positive = patterns.partition {|pattern| /^!/ =~ pattern}
@@ -105,7 +34,7 @@ module Jasmine
       src_files.collect {|f| "/" + f } + helpers.collect {|f| File.join(spec_path, f) } + spec_files_to_include.collect {|f| File.join(spec_path, f) }
     end
 
-    def css_files
+    def user_stylesheets
       stylesheets.collect {|f| "/" + f }
     end
 
@@ -146,7 +75,9 @@ module Jasmine
     end
 
     def src_files
-      if simple_config['src_files']
+      if simple_config['src_files'] && Jasmine::Dependencies.rails_3_asset_pipeline?
+        Jasmine::AssetPipelineMapper.new(simple_config['src_files']).files
+      elsif simple_config['src_files']
         match_files(src_dir, simple_config['src_files'])
       else
         []
@@ -168,5 +99,13 @@ module Jasmine
         []
       end
     end
+
+    def jasmine_stylesheets
+      ::Jasmine::Core.css_files.map {|f| "/__JASMINE_ROOT__/#{f}"}
+    end
+
+    def jasmine_javascripts
+      ::Jasmine::Core.js_files.map {|f| "/__JASMINE_ROOT__/#{f}" }
+    end
   end
 end

data/lib/jasmine/dependencies.rb

@@ -18,6 +18,10 @@ module Jasmine
         safe_gem_check("rails", ">= 3.0")
       end
 
+      def legacy_rack?
+        !Rack.constants.include?(:Server)
+      end
+
       def rails_3_asset_pipeline?
         rails3? && Rails.respond_to?(:application) && Rails.application.respond_to?(:assets) && Rails.application.assets
       end

data/lib/jasmine/page.rb

@@ -5,7 +5,7 @@ module Jasmine
     end
 
     def render
-      ERB.new(::Jasmine.runner_template).result(@context)
+      ERB.new(::Jasmine.runner_template).result(@context.instance_eval { binding })
     end
   end
 end

data/lib/jasmine/results.rb

@@ -0,0 +1,19 @@
+module Jasmine
+  class Results
+
+    attr_reader :suites
+    def initialize(result_hash, suite_hash, example_locations)
+      @suites = suite_hash
+      @results = result_hash
+      @example_locations = example_locations
+    end
+
+    def for_spec_id(id)
+      @results[id]
+    end
+
+    def example_location_for(spec_description)
+      @example_locations[spec_description]
+    end
+  end
+end

data/lib/jasmine/results_processor.rb

@@ -0,0 +1,37 @@
+module Jasmine
+  class ResultsProcessor
+
+    def initialize(config)
+      @config = config
+    end
+
+    def process(results_hash, suites_hash)
+      return Jasmine::Results.new(results_hash, suites_hash, example_locations)
+    end
+
+    def example_locations
+      example_locations = {}
+      example_name_parts = []
+      previous_indent_level = 0
+      @config.spec_files_full_paths.each do |filename|
+        line_number = 1
+        File.open(filename, "r") do |file|
+          file.readlines.each do |line|
+            match = /^(\s*)(describe|it)\s*\(\s*["'](.*)["']\s*,\s*function/.match(line)
+             if (match)
+               indent_level = match[1].length / 2
+               example_name = match[3]
+               example_name_parts[indent_level] = example_name
+
+               full_example_name = example_name_parts.slice(0, indent_level + 1).join(" ")
+               example_locations[full_example_name] = "#{filename}:#{line_number}: in `it'"
+             end
+             line_number += 1
+          end
+        end
+      end
+      example_locations
+    end
+
+  end
+end

data/lib/jasmine/rspec_formatter.rb

@@ -0,0 +1,92 @@
+require 'enumerator'
+
+module Jasmine
+  class RspecFormatter
+
+    def format_results(results)
+      @results = results
+      declare_suites(@results.suites)
+    end
+
+    def declare_suites(suites)
+      suites.each do |suite|
+        #empty block for rspec 1
+        group = example_group(suite["name"]) {}
+        process_children(group, suite["children"])
+      end
+    end
+
+    def process_children(parent, children)
+      children.each do |suite_or_spec|
+        type = suite_or_spec["type"]
+        if type == "suite"
+          process_children(parent.describe(suite_or_spec["name"]), suite_or_spec["children"])
+        elsif type == "spec"
+          declare_spec(parent, suite_or_spec)
+        else
+          raise "unknown type #{type} for #{suite_or_spec.inspect}"
+        end
+      end
+    end
+
+    def declare_spec(parent, spec)
+      me = self
+      example_name = spec["name"]
+      backtrace = @results.example_location_for(parent.description + " " + example_name)
+      if Jasmine::Dependencies.rspec2?
+        parent.it example_name, {} do
+          me.report_spec(spec["id"])
+        end
+      else
+        parent.it example_name, {}, backtrace do
+          me.report_spec(spec["id"])
+        end
+      end
+    end
+
+    def report_spec(spec_id)
+      spec_results = results_for(spec_id)
+      out = ""
+      messages = spec_results['messages'].each do |message|
+        case
+        when message["type"] == "log"
+          puts message["text"]
+          puts "\n"
+        else
+          unless message["message"] =~ /^Passed.$/
+            STDERR << message["message"]
+            STDERR << "\n"
+
+            out << message["message"]
+            out << "\n"
+          end
+
+          if !message["passed"] && message["trace"]["stack"]
+            stack_trace = message["trace"]["stack"].gsub(/<br \/>/, "\n").gsub(/<\/?b>/, " ")
+            STDERR << stack_trace.gsub(/\(.*\)@http:\/\/localhost:[0-9]+\/specs\//, "/spec/")
+            STDERR << "\n"
+          end
+        end
+
+      end
+      fail out unless spec_results['result'] == 'passed'
+      puts out unless out.empty?
+    end
+
+    private
+
+    def example_group(*args, &block)
+      if Jasmine::Dependencies.rspec2?
+        RSpec::Core::ExampleGroup.describe(*args, &block).register
+      else
+        Spec::Example::ExampleGroupFactory.create_example_group(*args, &block)
+      end
+    end
+
+    def results_for(spec_id)
+      @results.for_spec_id(spec_id.to_s)
+    end
+
+
+  end
+end

data/lib/jasmine/run.html.erb

@@ -13,6 +13,7 @@
   <% end %>
 
   <script type="text/javascript">
+    //TODO: make this a js file that gets passed in, then iterate over only js_files
     var jsApiReporter;
     (function() {
       var jasmineEnv = jasmine.getEnv();

data/lib/jasmine/run_specs.rb

@@ -0,0 +1,33 @@
+$:.unshift(ENV['JASMINE_GEM_PATH']) if ENV['JASMINE_GEM_PATH'] # for gem testing purposes
+
+require 'rubygems'
+require 'jasmine'
+jasmine_config_overrides = File.expand_path(File.join(Dir.pwd, 'spec', 'javascripts', 'support', 'jasmine_config.rb'))
+require jasmine_config_overrides if File.exist?(jasmine_config_overrides)
+if Jasmine::Dependencies.rspec2?
+  require 'rspec'
+else
+  require 'spec'
+end
+
+jasmine_runner_config = Jasmine::RunnerConfig.new
+server = Jasmine::Server.new(jasmine_runner_config.port, Jasmine::Application.app(jasmine_runner_config))
+client = Jasmine::SeleniumDriver.new(jasmine_runner_config.browser,
+                                     "#{jasmine_runner_config.jasmine_host}:#{jasmine_runner_config.port}/")
+
+t = Thread.new do
+  begin
+    server.start
+  rescue ChildProcess::TimeoutError
+  end
+  # # ignore bad exits
+end
+t.abort_on_exception = true
+Jasmine::wait_for_listener(jasmine_runner_config.port, "jasmine server")
+puts "jasmine server started."
+
+results_processor = Jasmine::ResultsProcessor.new(jasmine_runner_config)
+results = Jasmine::Runners::HTTP.new(client, results_processor).run
+formatter = Jasmine::RspecFormatter.new
+formatter.format_results(results)
+