jasmine 2.0.0.rc2 → 2.0.0.rc3

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

@@ -1,92 +1,107 @@
 require 'spec_helper'
 
 describe Jasmine::Formatters::Console do
+
+  let(:outputter_output) { '' }
+  let(:outputter) { lambda { |str| outputter_output << str } }
   describe '#failures' do
     it 'shows the failure messages' do
-      results = OpenStruct.new(:size => 2, :failures => [failing_result, failing_result], :pending_specs => [])
-      subject = Jasmine::Formatters::Console.new(results)
+      results = [failing_result, failing_result]
+      Jasmine::Formatters::Console.new(outputter).format(results)
 
-      subject.failures.should match(/a suite with a failing spec/)
-      subject.failures.should match(/a failure message/)
-      subject.failures.should match(/a stack trace/)
+      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 = OpenStruct.new(:size => 1, :failures => [], :pending_specs => [])
-        subject = Jasmine::Formatters::Console.new(results)
+        results = [passing_result]
+        console = Jasmine::Formatters::Console.new(outputter)
+        console.format(results)
+        console.done
 
-        subject.summary.should match(/1 spec/)
-        subject.summary.should match(/0 failures/)
+        outputter_output.should match(/1 spec/)
+        outputter_output.should match(/0 failures/)
       end
 
       it 'shows the spec counts (pluralized)' do
-        results = OpenStruct.new(:size => 2, :failures => [], :pending_specs=> [])
-        subject = Jasmine::Formatters::Console.new(results)
+        results = [passing_result, passing_result]
+        console = Jasmine::Formatters::Console.new(outputter)
+        console.format(results)
+        console.done
 
-        subject.summary.should match(/2 specs/)
-        subject.summary.should match(/0 failures/)
+        outputter_output.should match(/2 specs/)
+        outputter_output.should match(/0 failures/)
       end
     end
 
     describe 'when there are failures' do
       it 'shows the spec counts' do
-        results = OpenStruct.new(:size => 2, :failures => [failing_result], :pending_specs=> [])
-        subject = Jasmine::Formatters::Console.new(results)
+        results = [passing_result, failing_result]
+        console = Jasmine::Formatters::Console.new(outputter)
+        console.format(results)
+        console.done
 
-        subject.summary.should match(/2 specs/)
-        subject.summary.should match(/1 failure/)
+        outputter_output.should match(/2 specs/)
+        outputter_output.should match(/1 failure/)
       end
 
       it 'shows the spec counts (pluralized)' do
-        results = OpenStruct.new(:size => 2, :failures => [failing_result, failing_result], :pending_specs=> [])
-        subject = Jasmine::Formatters::Console.new(results)
+        results = [failing_result, failing_result]
+        console = Jasmine::Formatters::Console.new(outputter)
+        console.format(results)
+        console.done
 
-        subject.summary.should match(/2 specs/)
-        subject.summary.should match(/2 failures/)
+        outputter_output.should match(/2 specs/)
+        outputter_output.should match(/2 failures/)
       end
     end
 
     describe 'when there are pending specs' do
       it 'shows the spec counts' do
-        results = OpenStruct.new(:size => 2, :failures => [failing_result], :pending_specs => [pending_result])
-        subject = Jasmine::Formatters::Console.new(results)
+        results = [passing_result, pending_result]
+        console = Jasmine::Formatters::Console.new(outputter)
+        console.format(results)
+        console.done
 
-        subject.summary.should match(/1 pending spec/)
+        outputter_output.should match(/1 pending spec/)
       end
 
       it 'shows the spec counts (pluralized)' do
-        results = OpenStruct.new(:size => 2, :failures => [], :pending_specs => [pending_result, pending_result])
-        subject = Jasmine::Formatters::Console.new(results)
+        results = [pending_result, pending_result]
+        console = Jasmine::Formatters::Console.new(outputter)
+        console.format(results)
+        console.done
 
-        subject.summary.should match(/2 pending specs/)
+        outputter_output.should match(/2 pending specs/)
       end
     end
 
     describe 'when there are no pending specs' do
 
       it 'should not mention pending specs' do
-        results = OpenStruct.new(:size => 2, :failures => [], :pending_specs => [])
-        subject = Jasmine::Formatters::Console.new(results)
+        results = [passing_result]
+        console = Jasmine::Formatters::Console.new(outputter)
+        console.format(results)
+        console.done
 
-        subject.summary.should_not match(/pending spec[s]/)
+        outputter_output.should_not match(/pending spec[s]/)
       end
     end
   end
 
   def failing_result
-    OpenStruct.new(:full_name => 'a suite with a failing spec', :failed_expectations => [
-        OpenStruct.new(:message => 'a failure message', :stack => 'a stack trace')
-    ])
+    Jasmine::Result.new(failing_raw_result)
   end
 
   def passing_result
-    OpenStruct.new(passing_raw_result)
+    Jasmine::Result.new(passing_raw_result)
   end
 
   def pending_result
-    OpenStruct.new(pending_raw_result)
+    Jasmine::Result.new(pending_raw_result)
   end
 end

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

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Jasmine::Formatters::Multi do
+  it "should delegate to the passed in formatters" do
+    formatter1 = double(:formatter1)
+    formatter2 = double(:formatter2)
+    multi = Jasmine::Formatters::Multi.new([formatter1, formatter2])
+
+    formatter1.should_receive(:format)
+    formatter2.should_receive(:format)
+    multi.format(nil)
+
+    formatter1.should_receive(:done)
+    formatter2.should_receive(:done)
+    multi.done
+  end
+end

data/spec/performance/phantom_js_runner_performance_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'fileutils'
+
+
+describe "Phantom JS Runner performance/integration suite", :performance => true do
+  before :each do
+    temp_dir_before
+    Dir::chdir @tmp
+  end
+
+  after :each do
+    temp_dir_after
+  end
+
+  it 'handles deeply nested/large test suites' do
+    Jasmine::CommandLineTool.new.process ['init']
+
+    FileUtils.cp(File.join(@root, 'spec', 'fixture', 'large_test_suite_spec.js'), File.join(@tmp, 'spec', 'javascripts'))
+
+    ci_output = `rake --trace jasmine:ci`
+    ci_output.should =~ (/40000 specs, 20000 failures/)
+  end
+end

data/spec/result_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Jasmine::Result do
+  describe "data accessors" do
+    it "exposes failed expectations" do
+      result = Jasmine::Result.new(failing_raw_result)
+      expectation = result.failed_expectations[0]
+      expectation.message.should == "a failure message"
+      expectation.stack.should == "a stack trace"
+    end
+
+    it "exposes only the last 7 lines of the stack trace" do
+      raw_result = failing_raw_result
+      raw_result["failedExpectations"][0]["stack"] = "1\n2\n3\n4\n5\n6\n7\n8\n9"
+
+      result = Jasmine::Result.new(raw_result)
+      expectation = result.failed_expectations[0].stack
+      expectation.should match(/1/)
+      expectation.should match(/7/)
+      expectation.should_not match(/8/)
+      expectation.should_not match(/9/)
+    end
+
+    it "handles failed specs with no stack trace" do
+      raw_result = failing_result_no_stack_trace
+
+      result = Jasmine::Result.new(raw_result)
+      expectation = result.failed_expectations[0].stack
+      expectation.should match(/No stack/)
+    end
+
+  end
+end
+

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ Bundler.setup(*envs)
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../lib')))
 require 'jasmine'
 require 'rspec'
-require 'support/fake_selenium_driver'
 
 def create_rails(name)
   `rails new #{name}`
@@ -34,6 +33,19 @@ def temp_dir_after
   FileUtils.rm_r @tmp
 end
 
+def custom_jasmine_config(prefix, &block)
+  require 'yaml'
+  support_path = File.join('spec', 'javascripts', 'support')
+  jasmine_config = YAML.load_file(File.join(support_path, 'jasmine.yml'))
+  block.call(jasmine_config)
+  custom_path = File.join(support_path, "#{prefix}_jasmine.yml")
+  File.open(custom_path, 'w') do |f|
+    f.write YAML.dump(jasmine_config)
+    f.flush
+  end
+  custom_path
+end
+
 module Kernel
   def capture_stdout
     out = StringIO.new
@@ -46,28 +58,40 @@ module Kernel
 end
 
 def passing_raw_result
-  raw_result('passed', {fullName: 'Passing test', description: 'Passing'})
+  {'id' => 123, 'status' => 'passed', 'fullName' => 'Passing test', 'description' => 'Passing', 'failedExpectations' => []}
 end
 
 def pending_raw_result
-  raw_result('pending', {fullName: 'Passing test', description: 'Passing'})
+  {'id' => 123, 'status' => 'pending', 'fullName' => 'Passing test', 'description' => 'Pending', 'failedExpectations' => []}
 end
 
 def failing_raw_result
-  raw_result('failed', {
-      'id' => 124,
-      'description' => 'a failing spec',
-      'fullName' => 'a suite with a failing spec',
-      'failedExpectations' => [
-          {
-              'message' => 'a failure message',
-              'stack' => 'a stack trace'
-          }
-      ]
-  })
+  {
+    'status' => 'failed',
+    'id' => 124,
+    'description' => 'a failing spec',
+    'fullName' => 'a suite with a failing spec',
+    'failedExpectations' => [
+      {
+        'message' => 'a failure message',
+        'stack' => 'a stack trace'
+      }
+    ]
+  }
 end
 
-def raw_result(status, options = {})
-  {'status' => status}.merge(options)
+def failing_result_no_stack_trace
+  {
+    'status' => 'failed',
+    'id' => 124,
+    'description' => 'a failing spec',
+    'fullName' => 'a suite with a failing spec',
+    'failedExpectations' => [
+      {
+        'message' => 'a failure message, but no stack',
+        'stack' => nil
+      }
+    ]
+  }
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -10,22 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -55,7 +41,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -69,33 +55,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: anchorman
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: jasmine-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha
+        version: 2.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha
+        version: 2.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -111,35 +97,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: phantomjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -170,22 +142,12 @@ files:
 - RELEASE.markdown
 - Rakefile
 - bin/jasmine
-- generators/jasmine/jasmine_generator.rb
-- generators/jasmine/templates/INSTALL
-- generators/jasmine/templates/jasmine-example/spec/PlayerSpec.js
-- generators/jasmine/templates/jasmine-example/spec/SpecHelper.js
-- generators/jasmine/templates/jasmine-example/src/Player.js
-- generators/jasmine/templates/jasmine-example/src/Song.js
-- generators/jasmine/templates/lib/tasks/jasmine.rake
-- generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yml
-- generators/jasmine/templates/spec/javascripts/support/jasmine.yml
-- generators/jasmine/templates/spec/javascripts/support/jasmine_helper.rb
 - jasmine.gemspec
 - lib/generators/jasmine/examples/USAGE
 - lib/generators/jasmine/examples/examples_generator.rb
 - lib/generators/jasmine/examples/templates/app/assets/javascripts/jasmine_examples/Player.js
 - lib/generators/jasmine/examples/templates/app/assets/javascripts/jasmine_examples/Song.js
-- lib/generators/jasmine/examples/templates/spec/javascripts/helpers/SpecHelper.js
+- lib/generators/jasmine/examples/templates/spec/javascripts/helpers/jasmine_examples/SpecHelper.js
 - lib/generators/jasmine/examples/templates/spec/javascripts/jasmine_examples/PlayerSpec.js
 - lib/generators/jasmine/install/USAGE
 - lib/generators/jasmine/install/install_generator.rb
@@ -198,29 +160,23 @@ files:
 - lib/jasmine/asset_expander.rb
 - lib/jasmine/asset_pipeline_mapper.rb
 - lib/jasmine/base.rb
+- lib/jasmine/command_line_install.txt
 - lib/jasmine/command_line_tool.rb
 - lib/jasmine/config.rb
 - lib/jasmine/configuration.rb
 - lib/jasmine/core_configuration.rb
 - lib/jasmine/dependencies.rb
-- lib/jasmine/firebug/firebug-1.6.2.xpi
-- lib/jasmine/firebug/firebug-1.7.0.xpi
-- lib/jasmine/firebug/firebug-license.txt
-- lib/jasmine/firebug/firebug.rb
-- lib/jasmine/formatters/base.rb
 - lib/jasmine/formatters/console.rb
-- lib/jasmine/formatters/junit_xml.rb
+- lib/jasmine/formatters/exit_code.rb
+- lib/jasmine/formatters/multi.rb
 - lib/jasmine/page.rb
 - lib/jasmine/path_expander.rb
 - lib/jasmine/path_mapper.rb
 - lib/jasmine/railtie.rb
-- lib/jasmine/reporters/api_reporter.rb
-- lib/jasmine/results.rb
-- lib/jasmine/results_processor.rb
+- lib/jasmine/result.rb
 - lib/jasmine/run.html.erb
-- lib/jasmine/run_specs.rb
-- lib/jasmine/runners/http.rb
-- lib/jasmine/selenium_driver.rb
+- lib/jasmine/runners/phantom_jasmine_run.js
+- lib/jasmine/runners/phantom_js.rb
 - lib/jasmine/server.rb
 - lib/jasmine/tasks/jasmine.rake
 - lib/jasmine/tasks/jasmine_rails.rake
@@ -234,29 +190,26 @@ files:
 - release_notes/v2.0.0.rc2.md
 - spec/application_integration_spec.rb
 - spec/application_spec.rb
-- spec/asset_expander_spec.rb
-- spec/asset_pipeline_mapper_spec.rb
 - spec/base_spec.rb
 - spec/configuration_spec.rb
 - spec/fixture/Rakefile
-- spec/jasmine_command_line_tool_rakeless_spec.rb
+- spec/fixture/coffee_spec.coffee
+- spec/fixture/failing_runner.rb
+- spec/fixture/failing_test.js
+- spec/fixture/large_test_suite_spec.js
 - spec/jasmine_command_line_tool_spec.rb
 - spec/jasmine_pojs_spec.rb
 - spec/jasmine_rails_spec.rb
-- spec/lib/jasmine/formatters/base_spec.rb
 - spec/lib/jasmine/formatters/console_spec.rb
-- spec/lib/jasmine/formatters/junit_xml_spec.rb
-- spec/lib/jasmine/reporters/api_reporter_spec.rb
-- spec/lib/jasmine/runners/http_spec.rb
+- spec/lib/jasmine/formatters/multi_spec.rb
 - spec/page_spec.rb
 - spec/path_expander_spec.rb
 - spec/path_mapper_spec.rb
+- spec/performance/phantom_js_runner_performance_spec.rb
 - spec/rack/jasmine/runner_spec.rb
-- spec/results_processor_spec.rb
-- spec/results_spec.rb
+- spec/result_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
-- spec/support/fake_selenium_driver.rb
 - spec/yaml_config_parser_spec.rb
 homepage: http://pivotal.github.com/jasmine/
 licenses:
@@ -279,34 +232,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: JavaScript BDD framework
 test_files:
 - spec/application_integration_spec.rb
 - spec/application_spec.rb
-- spec/asset_expander_spec.rb
-- spec/asset_pipeline_mapper_spec.rb
 - spec/base_spec.rb
 - spec/configuration_spec.rb
 - spec/fixture/Rakefile
-- spec/jasmine_command_line_tool_rakeless_spec.rb
+- spec/fixture/coffee_spec.coffee
+- spec/fixture/failing_runner.rb
+- spec/fixture/failing_test.js
+- spec/fixture/large_test_suite_spec.js
 - spec/jasmine_command_line_tool_spec.rb
 - spec/jasmine_pojs_spec.rb
 - spec/jasmine_rails_spec.rb
-- spec/lib/jasmine/formatters/base_spec.rb
 - spec/lib/jasmine/formatters/console_spec.rb
-- spec/lib/jasmine/formatters/junit_xml_spec.rb
-- spec/lib/jasmine/reporters/api_reporter_spec.rb
-- spec/lib/jasmine/runners/http_spec.rb
+- spec/lib/jasmine/formatters/multi_spec.rb
 - spec/page_spec.rb
 - spec/path_expander_spec.rb
 - spec/path_mapper_spec.rb
+- spec/performance/phantom_js_runner_performance_spec.rb
 - spec/rack/jasmine/runner_spec.rb
-- spec/results_processor_spec.rb
-- spec/results_spec.rb
+- spec/result_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
-- spec/support/fake_selenium_driver.rb
 - spec/yaml_config_parser_spec.rb