jasmine 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7ad2fbff53956500c93901508a21b675e40e75c
-  data.tar.gz: 64d908f89bb6a06594818ee127bd3300ea086753
+  metadata.gz: 9f595bb93e25f76eafd50f76f967dff613f67b09
+  data.tar.gz: 742260eed0ee7f65a30d0b22a1275bc68b9ab58a
 SHA512:
-  metadata.gz: af846c0089929a96cc615687ce90858ed7bd7780694c2a526e5194d11f73ba179c42ba103e47332072e82abe74dcab85b901a0bd8c4b8314e5a4f42beb370866
-  data.tar.gz: 4010ae21deaba06f30b9d36f70f21533adb5f6527d3bf96cf2d6053e45bd2df29dbcf0fa14eea10f9497d256bb5764a90a5fe83b8f1f4928f702a751ee7607a2
+  metadata.gz: 2cb8f13ca4b6e58053517a2c4d92d63e6b5ddf4336fec4e24a182f8ea13ea658a043fe1273302342f75a3484a293886fe67fa1b4e8f6300a8357cf4e7463d4a6
+  data.tar.gz: fdcc12240c1bfd77916fc47a1c2ab3add77d5743686b6fc6775a8a42f64881ba845e1006cebc4436daee60aca34823ddaee7965844730f13b117e21461361041

data/.travis.yml

@@ -1,4 +1,4 @@
-script: "if [ $PERFORMANCE_SPECS ];then bundle exec rake performance_specs --trace; else bundle exec rake --trace; fi"
+language: ruby
 
 rvm:
   - "1.9.3"
@@ -12,6 +12,13 @@ env:
  - "RAILS_VERSION=rails4"
  - "RAILS_VERSION=pojs"
 
+sudo: false
+
+script: "if [ $PERFORMANCE_SPECS ];then bundle exec rake performance_specs --trace; else bundle exec rake --trace; fi"
+
+install:
+  - bundle install --retry=3
+
 matrix:
   include:
     - rvm: "2.0.0"

data/README.markdown

@@ -1,6 +1,6 @@
-# The Jasmine Gem [![Build Status](https://travis-ci.org/pivotal/jasmine-gem.png?branch=master)](https://travis-ci.org/pivotal/jasmine-gem)
+# The Jasmine Gem [![Build Status](https://travis-ci.org/jasmine/jasmine-gem.png?branch=master)](https://travis-ci.org/jasmine/jasmine-gem)
 
-The [Jasmine](http://github.com/pivotal/jasmine) Ruby Gem is a package of helper code for developing Jasmine projects for Ruby-based web projects (Rails, Sinatra, etc.) or for JavaScript projects where Ruby is a welcome partner. It serves up a project's Jasmine suite in a browser so you can focus on your code instead of manually editing script tags in the Jasmine runner HTML file.
+The [Jasmine](http://github.com/jasmine/jasmine) Ruby Gem is a package of helper code for developing Jasmine projects for Ruby-based web projects (Rails, Sinatra, etc.) or for JavaScript projects where Ruby is a welcome partner. It serves up a project's Jasmine suite in a browser so you can focus on your code instead of manually editing script tags in the Jasmine runner HTML file.
 
 ## Contents
 This gem contains:
@@ -19,7 +19,7 @@ end
 
 ## Init A Project
 
-To initialize a project for Jasmine
+To initialize a rails project for Jasmine
 
     rails g jasmine:install
 

data/jasmine.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '>= 2.5.0'
   s.add_development_dependency 'nokogiri'
 
-  s.add_dependency 'jasmine-core', '~> 2.1.0'
+  s.add_dependency 'jasmine-core', '~> 2.2'
   s.add_dependency 'rack', '>= 1.2.1'
   s.add_dependency 'rake'
   s.add_dependency 'phantomjs'

data/lib/jasmine/config.rb

@@ -79,7 +79,8 @@ module Jasmine
                                       jasmine_server_url,
                                       @config.prevent_phantom_js_auto_install,
                                       @config.show_console_log,
-                                      @config.phantom_config_script)
+                                      @config.phantom_config_script,
+                                      @config.show_full_stack_trace)
     end
   end
 

data/lib/jasmine/configuration.rb

@@ -12,6 +12,7 @@ module Jasmine
     attr_accessor :prevent_phantom_js_auto_install
     attr_accessor :show_console_log
     attr_accessor :phantom_config_script
+    attr_accessor :show_full_stack_trace
     attr_reader :rack_apps
 
     def initialize()

data/lib/jasmine/dependencies.rb

@@ -3,11 +3,11 @@ module Jasmine
 
     class << self
       def rails3?
-        safe_gem_check("rails", "~> 3") && running_rails3?
+        safe_gem_check("railties", "~> 3") && running_rails3?
       end
 
       def rails4?
-        safe_gem_check("rails", "~> 4") && running_rails4?
+        safe_gem_check("railties", "~> 4") && running_rails4?
       end
 
       def rails?
@@ -15,7 +15,7 @@ module Jasmine
       end
 
       def rails_available?
-        safe_gem_check("rails", '>= 3')
+        safe_gem_check("railties", '>= 3')
       end
 
       def legacy_rack?

data/lib/jasmine/formatters/console.rb

@@ -13,9 +13,20 @@ module Jasmine
 
       def done
         outputter.puts
-        outputter.puts(failures(@results))
+
         failure_count = results.count(&:failed?)
+        if failure_count > 0
+          outputter.puts('Failures:')
+          outputter.puts(failures(@results))
+          outputter.puts
+        end
+
         pending_count = results.count(&:pending?)
+        if pending_count > 0
+          outputter.puts('Pending:')
+          outputter.puts(pending(@results))
+          outputter.puts
+        end
         summary = "#{pluralize(results.size, 'spec')}, " +
           "#{pluralize(failure_count, 'failure')}"
 
@@ -31,6 +42,10 @@ module Jasmine
         results.select(&:failed?).map { |f| failure_message(f) }.join("\n\n")
       end
 
+      def pending(results)
+        results.select(&:pending?).map { |spec| pending_message(spec) }.join("\n\n")
+      end
+
       def chars(results)
         results.map do |result|
           if result.succeeded?
@@ -48,6 +63,13 @@ module Jasmine
         "#{count} #{word}"
       end
 
+      def pending_message(spec)
+        reason = 'No reason given'
+        reason = spec.pending_reason if spec.pending_reason && spec.pending_reason != ''
+
+        "\t#{spec.full_name}\n\t  \e[33m#{reason}\e[0m"
+      end
+
       def failure_message(failure)
         template = <<-FM
           #{failure.full_name}\n

data/lib/jasmine/result.rb

@@ -6,11 +6,13 @@ module Jasmine
     end
 
     def initialize(attrs)
+      @show_full_stack_trace = attrs["show_full_stack_trace"]
       @status = attrs["status"]
       @full_name = attrs["fullName"]
       @description = attrs["description"]
       @failed_expectations = map_failures(attrs["failedExpectations"])
       @suite_name = full_name.slice(0, full_name.size - description.size - 1)
+      @pending_reason = attrs["pendingReason"]
     end
 
     def succeeded?
@@ -25,19 +27,24 @@ module Jasmine
       status == 'pending'
     end
 
-    attr_reader :full_name, :description, :failed_expectations, :suite_name
+    attr_reader :full_name, :description, :failed_expectations, :suite_name, :pending_reason
 
     private
-    attr_reader :status
+    attr_reader :status, :show_full_stack_trace
 
     def map_failures(failures)
       failures.map do |e|
-        short_stack = if e["stack"]
-                        e["stack"].split("\n").slice(0, 7).join("\n")
-                      else
-                        "No stack trace present."
-                      end
-        Failure.new(e["message"], short_stack)
+        if e["stack"]
+          if show_full_stack_trace
+            stack = e["stack"]
+          else
+            stack = e["stack"].split("\n").slice(0, 7).join("\n")
+          end
+        else
+          stack = "No stack trace present."
+        end
+
+        Failure.new(e["message"], stack)
       end
     end
 

data/lib/jasmine/runners/phantom_js.rb

@@ -3,12 +3,13 @@ require 'phantomjs'
 module Jasmine
   module Runners
     class PhantomJs
-      def initialize(formatter, jasmine_server_url, prevent_phantom_js_auto_install, show_console_log, phantom_config_script)
+      def initialize(formatter, jasmine_server_url, prevent_phantom_js_auto_install, show_console_log, phantom_config_script, show_full_stack_trace)
         @formatter = formatter
         @jasmine_server_url = jasmine_server_url
         @prevent_phantom_js_auto_install = prevent_phantom_js_auto_install
         @show_console_log = show_console_log
         @phantom_config_script = phantom_config_script
+        @show_full_stack_trace = show_full_stack_trace
       end
 
       def run
@@ -19,12 +20,12 @@ module Jasmine
             if line =~ /^jasmine_spec_result/
               line = line.sub(/^jasmine_spec_result/, '')
               raw_results = JSON.parse(line, :max_nesting => false)
-              results = raw_results.map { |r| Result.new(r) }
+              results = raw_results.map { |r| Result.new(r.merge!("show_full_stack_trace" => @show_full_stack_trace)) }
               formatter.format(results)
             elsif line =~ /^jasmine_suite_result/
               line = line.sub(/^jasmine_suite_result/, '')
               raw_results = JSON.parse(line, :max_nesting => false)
-              results = raw_results.map { |r| Result.new(r) }
+              results = raw_results.map { |r| Result.new(r.merge!("show_full_stack_trace" => @show_full_stack_trace)) }
               failures = results.select(&:failed?)
               if failures.any?
                 formatter.format(failures)
@@ -33,7 +34,8 @@ module Jasmine
               config_failure = Result.new('fullName' => line,
                                           'failedExpectations' => [],
                                           'description' => '',
-                                          'status' => 'failed')
+                                          'status' => 'failed',
+                                          'show_full_stack_trace' => @show_full_stack_trace)
               formatter.format([config_failure])
               @show_console_log = true
               puts line

data/lib/jasmine/version.rb

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/release_notes/v2.2.0.md

@@ -0,0 +1,31 @@
+# Jasmine Gem 2.2.0 Release Notes
+
+## Summary
+
+This release updates the jasmine-core dependency to 2.2.0. See the
+[jasmine-core release notes](https://github.com/pivotal/jasmine/blob/master/release_notes/2.2.0.md)
+for more information.
+
+## Changes
+
+* Allow minor and patch versions of jasmine-core dependency to change
+* Show pending reason for specs
+* Show section header for failing specs
+
+## Pull Requests & Issues
+
+* Add a configuration option to show a full stack trace
+    - Merges [#236](https://github.com/jasmine/jasmine/issues/236) from @rrosenblum
+
+* Check the railties dependencies instead of rails dependencies
+    - Merges [#235](https://github.com/jasmine/jasmine/issues/235) from @shingara
+
+* Use the new build env on Travis
+    - Merges [#233](https://github.com/jasmine/jasmine/issues/233) from @joshk
+
+* More precise readme regarding initialization [ci-skip]
+    - Merges [#232](https://github.com/jasmine/jasmine/issues/232) from @Intrepidd
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

data/spec/configuration_spec.rb

@@ -149,6 +149,14 @@ describe Jasmine::Configuration do
     end
   end
 
+  describe 'show full stack trace' do
+    it 'returns value if set' do
+      config = Jasmine::Configuration.new()
+      config.show_full_stack_trace = true
+      config.show_full_stack_trace.should == true
+    end
+  end
+
   describe 'jasmine ports' do
     it 'returns new CI port and caches return value' do
       config = Jasmine::Configuration.new()

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

@@ -63,6 +63,15 @@ describe Jasmine::Formatters::Console do
         outputter_output.should match(/2 specs/)
         outputter_output.should match(/2 failures/)
       end
+
+      it 'shows the failure message' do
+        results = [failing_result]
+        console = Jasmine::Formatters::Console.new(outputter)
+        console.format(results)
+        console.done
+
+        outputter_output.should match(/a failure message/)
+      end
     end
 
     describe 'when there are pending specs' do
@@ -83,6 +92,24 @@ describe Jasmine::Formatters::Console do
 
         outputter_output.should match(/2 pending specs/)
       end
+
+      it 'shows the pending reason' do
+        results = [pending_result]
+        console = Jasmine::Formatters::Console.new(outputter)
+        console.format(results)
+        console.done
+
+        outputter_output.should match(/I pend because/)
+      end
+
+      it 'shows the default pending reason' do
+        results = [Jasmine::Result.new(pending_raw_result.merge('pendingReason' => ''))]
+        console = Jasmine::Formatters::Console.new(outputter)
+        console.format(results)
+        console.done
+
+        outputter_output.should match(/No reason given/)
+      end
     end
 
     describe 'when there are no pending specs' do

data/spec/result_spec.rb

@@ -21,6 +21,16 @@ describe Jasmine::Result do
       expectation.should_not match(/9/)
     end
 
+    it "exposes the full stack trace when configured" do
+      stack_trace = "1\n2\n3\n4\n5\n6\n7\n8\n9"
+      raw_result = failing_raw_result
+      raw_result["failedExpectations"][0]["stack"] = stack_trace
+
+      result = Jasmine::Result.new(raw_result.merge!("show_full_stack_trace" => true))
+      expectation = result.failed_expectations[0].stack
+      expectation.should == stack_trace
+    end
+
     it "handles failed specs with no stack trace" do
       raw_result = failing_result_no_stack_trace
 

data/spec/spec_helper.rb

@@ -58,7 +58,7 @@ def passing_raw_result
 end
 
 def pending_raw_result
-  {'id' => 123, 'status' => 'pending', 'fullName' => 'Passing test', 'description' => 'Pending', 'failedExpectations' => []}
+  {'id' => 123, 'status' => 'pending', 'fullName' => 'Passing test', 'description' => 'Pending', 'failedExpectations' => [], 'pendingReason' => 'I pend because'}
 end
 
 def failing_raw_result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -10,132 +10,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !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: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jasmine-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: phantomjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Test your JavaScript without any framework dependencies, in any environment,
@@ -146,9 +146,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - HOW_TO_TEST.markdown
 - MIT.LICENSE
@@ -206,6 +206,7 @@ files:
 - release_notes/v2.0.2.md
 - release_notes/v2.0.3.md
 - release_notes/v2.1.0.md
+- release_notes/v2.2.0.md
 - spec/application_integration_spec.rb
 - spec/application_spec.rb
 - spec/base_spec.rb
@@ -242,22 +243,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: JavaScript BDD framework