jasmine 1.2.0 → 1.2.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70293536626080 !ruby/object:Gem::Requirement
+  requirement: &70248187660320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70293536626080
+  version_requirements: *70248187660320
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70293536625100 !ruby/object:Gem::Requirement
+  requirement: &70248187649880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70293536625100
+  version_requirements: *70248187649880
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70293536623760 !ruby/object:Gem::Requirement
+  requirement: &70248187648920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *70293536623760
+  version_requirements: *70248187648920
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70293536622940 !ruby/object:Gem::Requirement
+  requirement: &70248187648060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293536622940
+  version_requirements: *70248187648060
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70293536622400 !ruby/object:Gem::Requirement
+  requirement: &70248187645900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293536622400
+  version_requirements: *70248187645900
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70293536621940 !ruby/object:Gem::Requirement
+  requirement: &70248187644700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293536621940
+  version_requirements: *70248187644700
 - !ruby/object:Gem::Dependency
   name: jasmine-core
-  requirement: &70293536621380 !ruby/object:Gem::Requirement
+  requirement: &70248187643700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70293536621380
+  version_requirements: *70248187643700
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70293536620680 !ruby/object:Gem::Requirement
+  requirement: &70248187625440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70293536620680
+  version_requirements: *70248187625440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70293536619920 !ruby/object:Gem::Requirement
+  requirement: &70248187624740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70293536619920
+  version_requirements: *70248187624740
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70293536619160 !ruby/object:Gem::Requirement
+  requirement: &70248187624080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70293536619160
+  version_requirements: *70248187624080
 description: Test your JavaScript without any framework dependencies, in any environment,
   and with a nice descriptive syntax.
 email: jasmine-js@googlegroups.com
@@ -132,12 +132,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - HOW_TO_TEST.markdown
 - MIT.LICENSE
 - README.markdown
 - RELEASE.markdown
+- RELEASE_NOTES.markdown
 - Rakefile
 - bin/jasmine
 - generators/jasmine/jasmine_generator.rb
@@ -162,6 +164,8 @@ files:
 - lib/generators/jasmine/install/templates/spec/javascripts/helpers/.gitkeep
 - lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine.yml
 - lib/jasmine.rb
+- lib/jasmine/application.rb
+- lib/jasmine/asset_pipeline_mapper.rb
 - lib/jasmine/base.rb
 - lib/jasmine/command_line_tool.rb
 - lib/jasmine/config.rb
@@ -172,11 +176,15 @@ files:
 - lib/jasmine/firebug/firebug.rb
 - lib/jasmine/page.rb
 - lib/jasmine/railtie.rb
+- lib/jasmine/results.rb
+- lib/jasmine/results_processor.rb
+- lib/jasmine/rspec_formatter.rb
 - lib/jasmine/run.html.erb
-- lib/jasmine/runner.rb
+- lib/jasmine/run_specs.rb
+- lib/jasmine/runner_config.rb
+- lib/jasmine/runners/http.rb
 - lib/jasmine/selenium_driver.rb
 - lib/jasmine/server.rb
-- lib/jasmine/spec_builder.rb
 - lib/jasmine/tasks/jasmine.rake
 - lib/jasmine/tasks/jasmine_rails3.rake
 - lib/jasmine/version.rb
@@ -184,6 +192,8 @@ files:
 - lib/rack/jasmine/focused_suite.rb
 - lib/rack/jasmine/redirect.rb
 - lib/rack/jasmine/runner.rb
+- spec/application_spec.rb
+- spec/asset_pipeline_mapper_spec.rb
 - spec/config_spec.rb
 - spec/dependencies_spec.rb
 - spec/fixture/Rakefile
@@ -199,6 +209,10 @@ files:
 - spec/jasmine_self_test_spec.rb
 - spec/page_spec.rb
 - spec/rack/jasmine/runner_spec.rb
+- spec/results_processor_spec.rb
+- spec/results_spec.rb
+- spec/rspec_formatter_spec.rb
+- spec/runner_config_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
 homepage: http://pivotal.github.com/jasmine
@@ -227,6 +241,8 @@ signing_key:
 specification_version: 3
 summary: JavaScript BDD framework
 test_files:
+- spec/application_spec.rb
+- spec/asset_pipeline_mapper_spec.rb
 - spec/config_spec.rb
 - spec/dependencies_spec.rb
 - spec/fixture/Rakefile
@@ -242,5 +258,9 @@ test_files:
 - spec/jasmine_self_test_spec.rb
 - spec/page_spec.rb
 - spec/rack/jasmine/runner_spec.rb
+- spec/results_processor_spec.rb
+- spec/results_spec.rb
+- spec/rspec_formatter_spec.rb
+- spec/runner_config_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb

data/lib/jasmine/runner.rb

@@ -1,32 +0,0 @@
-$:.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_config = Jasmine::Config.new
-spec_builder = Jasmine::SpecBuilder.new(jasmine_config)
-
-should_stop = false
-
-if Jasmine::Dependencies.rspec2?
-  RSpec.configuration.after(:suite) do
-    spec_builder.stop if should_stop
-  end
-else
-  Spec::Runner.configure do |config|
-    config.after(:suite) do
-      spec_builder.stop if should_stop
-    end
-  end
-end
-
-spec_builder.start
-should_stop = true
-spec_builder.declare_suites

data/lib/jasmine/spec_builder.rb

@@ -1,162 +0,0 @@
-require 'enumerator'
-
-module Jasmine
-  class SpecBuilder
-    attr_accessor :suites
-
-    def initialize(config)
-      @config = config
-      @spec_files = config.spec_files
-      @runner = config
-      @spec_ids = []
-    end
-
-    def start
-      guess_example_locations
-
-      @runner.start
-      load_suite_info
-      wait_for_suites_to_finish_running
-    end
-
-    def stop
-      @runner.stop
-    end
-
-    def script_path
-      File.expand_path(__FILE__)
-    end
-
-    def guess_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
-    end
-
-    def load_suite_info
-      started = Time.now
-      while !eval_js('return jsApiReporter && jsApiReporter.started') do
-        raise "couldn't connect to Jasmine after 60 seconds" if (started + 60 < Time.now)
-        sleep 0.1
-      end
-
-      @suites = eval_js("var result = jsApiReporter.suites(); if (window.Prototype && Object.toJSON) { return Object.toJSON(result) } else { return JSON.stringify(result) }")
-    end
-
-    def results_for(spec_id)
-      @spec_results ||= load_results
-      @spec_results[spec_id.to_s]
-    end
-
-    def load_results
-      @spec_results = {}
-      @spec_ids.each_slice(50) do |slice|
-        @spec_results.merge!(eval_js("var result = jsApiReporter.resultsForSpecs(#{json_generate(slice)}); if (window.Prototype && Object.toJSON) { return Object.toJSON(result) } else { return JSON.stringify(result) }"))
-      end
-      @spec_results
-    end
-
-    def wait_for_suites_to_finish_running
-      puts "Waiting for suite to finish in browser ..."
-      while !eval_js('return jsApiReporter.finished') do
-        sleep 0.1
-      end
-    end
-
-    def declare_suites
-      me = self
-      suites.each do |suite|
-        declare_suite(self, suite)
-      end
-    end
-
-    def declare_suite(parent, suite)
-      me = self
-      parent.describe suite["name"] do
-        suite["children"].each do |suite_or_spec|
-          type = suite_or_spec["type"]
-          if type == "suite"
-            me.declare_suite(self, suite_or_spec)
-          elsif type == "spec"
-            me.declare_spec(self, suite_or_spec)
-          else
-            raise "unknown type #{type} for #{suite_or_spec.inspect}"
-          end
-        end
-      end
-    end
-
-    def declare_spec(parent, spec)
-      me = self
-      example_name = spec["name"]
-      @spec_ids << spec["id"]
-      backtrace = @example_locations[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 eval_js(js)
-      @runner.eval_js(js)
-    end
-
-    def json_generate(obj)
-      @runner.json_generate(obj)
-    end
-  end
-end