jasmine 1.3.2 → 2.0.0.rc2

data/lib/jasmine/asset_expander.rb

@@ -1,18 +1,18 @@
 module Jasmine
   class AssetExpander
-    def initialize(bundled_asset_factory, asset_path_for)
+    def initialize(bundled_asset_factory)
       @bundled_asset_factory = bundled_asset_factory
-      @asset_path_for = asset_path_for
     end
 
     def expand(src_dir, src_path)
       pathname = src_path.gsub(/^\/?assets\//, '').gsub(/\.js$/, '')
-      bundled_asset = @bundled_asset_factory.call(pathname, 'js')
-      return nil unless bundled_asset
-
-      bundled_asset.to_a.map do |asset|
-        "/#{@asset_path_for.call(asset).gsub(/^\//, '')}?body=true"
+      bundled_asset = bundled_asset_factory.new(pathname)
+      bundled_asset.assets.map do |asset|
+        "/#{asset.gsub(/^\//, '')}?body=true"
       end.flatten
     end
+
+    private
+    attr_reader :bundled_asset_factory
   end
 end

data/lib/jasmine/command_line_tool.rb

@@ -26,6 +26,24 @@ module Jasmine
       if argv[0] == 'init'
         require 'fileutils'
 
+        force = false
+
+        if argv.size > 1 && argv[1] == "--force"
+          force = true
+        end
+
+        if File.exist?("Gemfile") && open("Gemfile", 'r').read.include?('rails') && !force
+          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
+
+  If you're not actually in a Rails application, just run this command again with --force
+      jasmine init --force
+          EOF
+          exit 1
+        end
+
         FileUtils.makedirs('public/javascripts')
         FileUtils.makedirs('spec/javascripts')
         FileUtils.makedirs('spec/javascripts/support')

data/lib/jasmine/config.rb

@@ -12,19 +12,21 @@ module Jasmine
 
     @config.add_path_mapper(Jasmine::PathMapper.method(:new))
 
-    @config.jasmine_path = jasmine_path = "/__jasmine__"
-    @config.src_path = src_path = "/"
-    @config.spec_path = spec_path = "/__spec__"
-    @config.boot_path = boot_path = "/__boot__"
+    @config.jasmine_path = jasmine_path = '/__jasmine__'
+    @config.src_path = src_path = '/'
+    @config.spec_path = spec_path = '/__spec__'
+    @config.boot_path = boot_path = '/__boot__'
+    @config.image_path = image_path = '/__images__'
 
     @config.jasmine_dir = core_config.path
-    @config.boot_dir = core_config.boot_path
+    @config.boot_dir = core_config.boot_dir
     @config.boot_files = lambda { core_config.boot_files }
     @config.jasmine_files = lambda { core_config.js_files }
     @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(spec_path, lambda { Rack::File.new(config.spec_dir) })
+    @config.add_rack_path(image_path, lambda { Rack::File.new(core_config.images_dir) })
     @config.add_rack_path(src_path, lambda {
       Rack::Cascade.new([
         Rack::URLMap.new('/' => Rack::File.new(config.src_dir)),
@@ -35,21 +37,23 @@ module Jasmine
     @config.add_rack_app(Rack::Head)
     @config.add_rack_app(Rack::Jasmine::CacheControl)
 
-    if Jasmine::Dependencies.rails_3_asset_pipeline?
+    if Jasmine::Dependencies.use_asset_pipeline?
       @config.add_path_mapper(lambda { |config|
-        asset_expander = Jasmine::AssetExpander.new(
-          Jasmine::AssetPipelineUtility.method(:bundled_asset_factory),
-          Jasmine::AssetPipelineUtility.method(:asset_path_for)
-        )
+        asset_expander = Jasmine::AssetExpander.new(Jasmine::AssetBundle.factory)
         Jasmine::AssetPipelineMapper.new(config, asset_expander.method(:expand))
       })
-      @config.add_rack_path('/assets', lambda {
+      @config.add_rack_path(Rails.application.config.assets.prefix, lambda {
         # In order to have asset helpers like asset_path and image_path, we need to require 'action_view/base'.  This
         # triggers run_load_hooks on action_view which, in turn, causes sprockets/railtie to load the Sprockets asset
         # helpers.  Alternatively, you can include the helpers yourself without loading action_view/base:
         Rails.application.assets.context_class.instance_eval do
-          include ::Sprockets::Helpers::IsolatedHelper
-          include ::Sprockets::Helpers::RailsHelper
+          if Jasmine::Dependencies.rails3?
+            include ::Sprockets::Helpers::IsolatedHelper
+            include ::Sprockets::Helpers::RailsHelper
+          end
+          if Jasmine::Dependencies.rails4?
+            include ::Sprockets::Rails::Helper
+          end
         end
         Rails.application.assets
       })
@@ -73,11 +77,15 @@ module Jasmine
         config.jasmine_dir = yaml_config.jasmine_dir if yaml_config.jasmine_dir
         config.jasmine_files = lambda { yaml_config.jasmine_files } if yaml_config.jasmine_files.any?
         config.jasmine_css_files = lambda { yaml_config.jasmine_css_files } if yaml_config.jasmine_css_files.any?
+        config.boot_dir = yaml_config.boot_dir if yaml_config.boot_dir
+        config.boot_files = lambda { yaml_config.boot_files } if yaml_config.boot_files.any?
+
+        config.src_dir = yaml_config.src_dir
         config.src_files = lambda { yaml_config.src_files }
-        config.spec_files = lambda { yaml_config.helpers + yaml_config.spec_files }
         config.css_files = lambda { yaml_config.css_files }
-        config.src_dir = yaml_config.src_dir
+
         config.spec_dir = yaml_config.spec_dir
+        config.spec_files = lambda { yaml_config.helpers + yaml_config.spec_files }
       end
       require yaml_config.spec_helper if File.exist?(yaml_config.spec_helper)
     end

data/lib/jasmine/configuration.rb

@@ -2,10 +2,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
-    attr_accessor :jasmine_dir, :spec_dir, :boot_dir, :src_dir
+    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_accessor :formatters
     #TODO: these are largely client concerns, move them.
     attr_accessor :port, :browser, :host, :result_batch_size
+    attr_accessor :selenium_server, :selenium_server_port, :webdriver
+    attr_accessor :junit_xml_path
+    attr_accessor :spec_format, :jasmine_port
 
     def initialize()
       @rack_paths = {}
@@ -17,6 +21,12 @@ module Jasmine
       @boot_files = lambda { [] }
       @src_files = lambda { [] }
       @spec_files = lambda { [] }
+
+      @formatters = [Jasmine::Formatters::Console]
+
+      @browser = 'firefox'
+      @junit_xml_path = Dir.getwd
+      @jasmine_port = 8888
     end
 
     def css_files
@@ -26,9 +36,9 @@ module Jasmine
 
     def js_files
       map(@jasmine_files, :jasmine) +
+        map(@boot_files, :boot) +
         map(@src_files, :src) +
-        map(@spec_files, :spec) +
-        map(@boot_files, :boot)
+        map(@spec_files, :spec)
     end
 
     def rack_path_map
@@ -55,10 +65,6 @@ module Jasmine
       @port ||= Jasmine.find_unused_port
     end
 
-    def browser
-      @browser || 'firefox'
-    end
-
     def host
       @host || 'http://localhost'
     end

data/lib/jasmine/core_configuration.rb

@@ -8,13 +8,12 @@ module Jasmine
       @core.path
     end
 
-    #TODO: maybe this doesn't belong in CoreConfig
-    def boot_path
-      Jasmine.root('javascripts')
+    def boot_dir
+      @core.boot_dir
     end
 
     def boot_files
-      Dir.glob(File.join(boot_path, "**"))
+      @core.boot_files
     end
 
     def js_files
@@ -24,5 +23,9 @@ module Jasmine
     def css_files
       @core.css_files
     end
+
+    def images_dir
+      @core.images_dir
+    end
   end
 end

data/lib/jasmine/dependencies.rb

@@ -2,44 +2,40 @@ module Jasmine
   module Dependencies
 
     class << self
-      def rspec2?
-        safe_gem_check("rspec", ">= 2.0")
+      def rails3?
+        safe_gem_check("rails", "~> 3") && running_rails3?
       end
 
-      def rails2?
-        safe_gem_check("rails", "~> 2.3") && running_rails2?
+      def rails4?
+        safe_gem_check("rails", "~> 4.0.0.rc1") && running_rails4?
       end
 
-      def legacy_rails?
-        safe_gem_check("rails", "< 2.3.11") && running_legacy_rails?
+      def rails?
+        rails_available? && running_rails?
       end
 
-      def rails3?
-        safe_gem_check("rails", ">= 3.0") && running_rails3?
+      def rails_available?
+        safe_gem_check("rails", '>= 3')
       end
 
       def legacy_rack?
         !defined?(Rack::Server)
       end
 
-      def rails_3_asset_pipeline?
-        rails3? && Rails.respond_to?(:application) && Rails.application.respond_to?(:assets) && Rails.application.assets
+      def use_asset_pipeline?
+        (rails3? || rails4?) && Rails.respond_to?(:application) && Rails.application.respond_to?(:assets) && Rails.application.assets
       end
 
       private
 
-      def running_legacy_rails?
-        running_rails? && (Gem::Version.new(Rails.version) < Gem::Version.new("2.3.11"))
-      end
-
-      def running_rails2?
-        running_rails? && Rails.version.to_i == 2
-      end
-
       def running_rails3?
         running_rails? && Rails.version.to_i == 3
       end
 
+      def running_rails4?
+        running_rails? && Rails.version.to_i == 4
+      end
+
       def running_rails?
         defined?(Rails) && Rails.respond_to?(:version)
       end

data/lib/jasmine/formatters/base.rb

@@ -0,0 +1,9 @@
+module Jasmine
+  module Formatters
+    class BaseFormatter < Struct.new(:results)
+      def format
+        raise NotImplementedError.new('You must override the summary method on any custom formatters.')
+      end
+    end
+  end
+end

data/lib/jasmine/formatters/console.rb

@@ -0,0 +1,45 @@
+module Jasmine
+  module Formatters
+    class Console < BaseFormatter
+      def format
+        puts failures
+        puts summary
+      end
+
+      def summary
+        summary = "#{pluralize(results.size, 'spec')}, " +
+          "#{pluralize(results.failures.size, 'failure')}"
+
+        summary += ", #{pluralize(results.pending_specs.size, 'pending spec')}" unless results.pending_specs.empty?
+
+        summary
+      end
+
+      def failures
+        results.failures.map { |f| failure_message(f) }.join("\n\n")
+      end
+
+      private
+
+      def pluralize(count, str)
+        word = (count == 1) ? str : str + 's'
+        "#{count} #{word}"
+      end
+
+      def failure_message(failure)
+        template = <<-FM
+          #{failure.full_name}\n
+        FM
+
+        template += failure.failed_expectations.map { |fe| expectation_message(fe) }.join("\n")
+      end
+
+      def expectation_message(expectation)
+        <<-FE
+          #{expectation.message}
+          #{expectation.stack}
+        FE
+      end
+    end
+  end
+end

data/lib/jasmine/formatters/junit_xml.rb

@@ -0,0 +1,47 @@
+require 'nokogiri'
+
+module Jasmine
+  module Formatters
+    class JUnitXml < BaseFormatter
+      def format
+        f = open(File.join(Jasmine.config.junit_xml_location, 'junit_results.xml'), 'w')
+        f.puts summary
+        f.close()
+      end
+
+      def summary
+        doc = Nokogiri::XML '<testsuites></testsuites>', nil, 'UTF-8'
+
+        testsuites = doc.at_css('testsuites')
+
+        results.results.each do |result|
+          suite_name = result.full_name.slice(0, result.full_name.size - result.description.size - 1)
+
+          testsuite = Nokogiri::XML::Node.new 'testsuite', doc
+          testsuite['tests'] = 1
+          testsuite['failures'] = result.status == 'failed' ? 1 : 0
+          testsuite['errors'] = 0
+          testsuite['name'] = suite_name
+          testsuite.parent = testsuites
+
+          testcase = Nokogiri::XML::Node.new 'testcase', doc
+          testcase['name'] = result.description
+
+          if result.status == 'failed'
+            result.failed_expectations.each do |failed_exp|
+              failure = Nokogiri::XML::Node.new 'failure', doc
+              failure['message'] = failed_exp.message
+              failure['type'] = 'Failure'
+              failure.content = failed_exp.stack
+              failure.parent = testcase
+            end
+          end
+
+          testcase.parent = testsuite
+        end
+
+        doc.to_xml(indent: 2)
+      end
+    end
+  end
+end

data/lib/jasmine/path_expander.rb

@@ -9,7 +9,7 @@ module Jasmine
           if files.empty? && !(path =~ /\*|^\!/)
             files = [File.join(base_directory, path)]
           end
-          files
+          files.sort
         end.flatten.uniq
       end
       chosen - negated

data/lib/jasmine/railtie.rb

@@ -1,21 +1,22 @@
-require "rails/railtie"
+require 'rails/railtie'
+
 module Jasmine
   class Railtie < Rails::Railtie
 
     config.before_configuration do
       old_jasmine_rakefile = ::Rails.root.join('lib', 'tasks', 'jasmine.rake')
-      if old_jasmine_rakefile.exist? && !ENV["USE_JASMINE_RAKE"]
-        puts %Q{
+      if old_jasmine_rakefile.exist? && !ENV['USE_JASMINE_RAKE']
+        puts '
             You no longer need to have jasmine.rake in your project, as it is now automatically loaded
             from the Jasmine gem. To silence this warning, set "USE_JASMINE_RAKE=true" in your environment
             or remove jasmine.rake.
-          }
+          '
       end
     end
 
     rake_tasks do
-      load "jasmine/tasks/jasmine.rake"
-      load "jasmine/tasks/jasmine_rails3.rake"
+      load 'jasmine/tasks/jasmine.rake'
+      load 'jasmine/tasks/jasmine_rails.rake'
     end
   end
 end

data/lib/jasmine/reporters/api_reporter.rb

@@ -0,0 +1,38 @@
+module Jasmine
+  module Reporters
+    #TODO: where does this live?
+    class ApiReporter < Struct.new(:driver, :batch_size)
+      STARTED_JS = "return jsApiReporter && jsApiReporter.started"
+      FINISHED_JS = "return jsApiReporter && jsApiReporter.finished"
+
+      def started?
+        driver.eval_js STARTED_JS
+      end
+
+      def finished?
+        driver.eval_js FINISHED_JS
+      end
+
+      def results
+        index = 0
+        spec_results = []
+
+        loop do
+          slice = get_results_slice(index)
+          spec_results << slice
+          index += batch_size
+
+          break if slice.size < batch_size
+        end
+
+        spec_results.flatten
+      end
+
+      private
+
+      def get_results_slice(index)
+        driver.eval_js("return jsApiReporter.specResults(#{index}, #{batch_size})")
+      end
+    end
+  end
+end