jasmine 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff37a8a0b4e7f15fb350194406360300f16c145d
-  data.tar.gz: 294bf35be0b19f6db43c4dde6197d31a954563db
+  metadata.gz: 992b7f642738d2f5c0e197262e7385c3cdc863c5
+  data.tar.gz: 4ebd0b1ab88fe4d24f6d225e78ed56f8a78b0fe5
 SHA512:
-  metadata.gz: afb5493aeb86c4cc6347bb0b214c67d4a1eedb7ac05b4e5cdef3e0441f121c8b5366e1a83b22310ddcc04c9310778ed87302344b60ddb48ed05811fd4cdd3ebe
-  data.tar.gz: 8406f91af81474b6089da889fd55c9fef374e3d6572443abe405c1e85af8e0743f3c37618e89937901db481b279a23cc2b4cf1a5ae18e116d8f26e4257c2dbe4
+  metadata.gz: c3fa659eacfe55b0b62c315aacc145518d5ef650fe73c129238080110c7a90efd9dc3489c0a2e382b4f84465d8ec4db9077199a76524729fff0bedce47f53c1a
+  data.tar.gz: a47b688b3a447d752216588f6e5db29b5e3afa827dd454fccc148de75c46ce3271eaefeaefc6ed6732d94db0ae36b8f8b82dc7e2eb641c41078bff913190a678

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 gem 'anchorman', :platform => :mri
 # during development, do not release
 if ENV['TRAVIS']
-  gem 'jasmine-core', :git => 'http://github.com/pivotal/jasmine.git'
+  gem 'jasmine-core', :git => 'http://github.com/jasmine/jasmine.git'
 else
   gem 'jasmine-core', :path => '../jasmine'
 end
@@ -16,6 +16,8 @@ else
   gem 'rack', '1.5.2'
 end
 
+gem 'mime-types', '< 3.0', platform: [:mri_19, :jruby]
+
 platform :rbx do
   gem 'json'
   gem 'rubysl'

data/README.markdown

@@ -21,9 +21,9 @@ end
 
 To initialize a rails project for Jasmine
 
-    rails g jasmine:install
+    rails generate jasmine:install
 
-    rails g jasmine:examples
+    rails generate jasmine:examples
 
 For any other project (Sinatra, Merb, or something we don't yet know about) use
 
@@ -45,7 +45,11 @@ For Continuous Integration environments, add this task to the project build step
 
 This uses PhantomJS to load and run the Jasmine suite. 
 
-Please note that PhantomJS will be auto-installed by the [phantomjs-gem][phantomjs-gem] at the first `rake jasmine:ci` run. If you have a matching PhantomJS version somewhere on your path, it won't install. You can disable automatic installation altogether (and use the PhantomJS on your path) via the config helper.
+Please note that PhantomJS will be auto-installed by the [phantomjs-gem][phantomjs-gem] at the first `rake jasmine:ci` run. If you have a matching PhantomJS version somewhere on your path, it won't install. You can disable automatic installation altogether (and use the PhantomJS on your path) via the config helper in your jasmine_helper.rb:
+
+    Jasmine.configure do |config|
+      config.prevent_phantom_js_auto_install = true
+    end
 
 [phantomjs-gem]: https://github.com/colszowka/phantomjs-gem#phantomjs-as-a-rubygem
 
@@ -59,7 +63,7 @@ Alternatively, you may specify the path to your `jasmine.yml` by setting an envi
 `rake jasmine:ci JASMINE_CONFIG_PATH=relative/path/to/your/jasmine.yml`
 
 In addition, the `spec_helper` key in your jasmine.yml specifies the path to a ruby file that can do programmatic configuration.
-After running `jasmine init` or `rails g jasmine:install` it will point to `spec/javascripts/support/jasmine_helper.rb` which you can modify to fit your needs.
+After running `jasmine init` or `rails generate jasmine:install` it will point to `spec/javascripts/support/jasmine_helper.rb` which you can modify to fit your needs.
 
 ### Running Jasmine on a different port
 

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.4'
+  s.add_dependency 'jasmine-core', '~> 2.5'
   s.add_dependency 'rack', '>= 1.2.1'
   s.add_dependency 'rake'
   s.add_dependency 'phantomjs'

data/lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine.yml

@@ -8,7 +8,7 @@
 # src_files:
 #   - lib/source1.js
 #   - lib/source2.js
-#   - dist/**/*.js
+#   - 'dist/**/*.js'
 #
 src_files:
   - assets/application.js
@@ -22,7 +22,7 @@ src_files:
 #
 # stylesheets:
 #   - css/style.css
-#   - stylesheets/*.css
+#   - 'stylesheets/*.css'
 #
 stylesheets:
   - assets/application.css
@@ -35,7 +35,7 @@ stylesheets:
 # EXAMPLE:
 #
 # helpers:
-#   - helpers/**/*.js
+#   - 'helpers/**/*.js'
 #
 helpers:
   - 'helpers/**/*.js'
@@ -48,7 +48,7 @@ helpers:
 # EXAMPLE:
 #
 # spec_files:
-#   - **/*[sS]pec.js
+#   - '**/*[sS]pec.js'
 #
 spec_files:
   - '**/*[sS]pec.js'

data/lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine_helper.rb

@@ -1,15 +1,16 @@
-#Use this file to set/override Jasmine configuration options
-#You can remove it if you don't need it.
-#This file is loaded *after* jasmine.yml is interpreted.
+# Use this file to set/override Jasmine configuration options
+# You can remove it if you don't need it.
+# This file is loaded *after* jasmine.yml is interpreted.
 #
-#Example: using a different boot file.
-#Jasmine.configure do |config|
-#   config.boot_dir = '/absolute/path/to/boot_dir'
-#   config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] }
-#end
-#
-#Example: prevent PhantomJS auto install, uses PhantomJS already on your path.
-#Jasmine.configure do |config|
-#   config.prevent_phantom_js_auto_install = true
-#end
+# Example: using a different boot file.
+# Jasmine.configure do |config|
+#    config.boot_dir = '/absolute/path/to/boot_dir'
+#    config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] }
+# end
 #
+# Example: prevent PhantomJS auto install, uses PhantomJS already on your path.
+Jasmine.configure do |config|
+  if ENV['TRAVIS']
+    config.prevent_phantom_js_auto_install = true
+  end
+end

data/lib/jasmine/config.rb

@@ -108,7 +108,9 @@ module Jasmine
         config.css_files = lambda { yaml_config.css_files }
 
         config.spec_dir = yaml_config.spec_dir
-        config.spec_files = lambda { yaml_config.helpers + yaml_config.spec_files }
+        config.helper_files = yaml_config.helpers
+        config.spec_files =  yaml_config.spec_files
+        config.testing_files = lambda { config.helper_files + config.spec_files }
 
         config.show_console_log = yaml_config.show_console_log
         config.stop_spec_on_expectation_failure = yaml_config.stop_spec_on_expectation_failure
@@ -123,4 +125,10 @@ module Jasmine
     end
   end
 
+  def self.load_spec(spec_path)
+    return if spec_path.nil?
+    Jasmine.configure do |c|  
+      c.spec_files = [spec_path]
+    end
+  end
 end

data/lib/jasmine/configuration.rb

@@ -1,8 +1,9 @@
 module Jasmine
   class Configuration
     attr_writer :jasmine_css_files, :css_files
-    attr_writer :jasmine_files, :boot_files, :src_files, :spec_files, :runner_boot_files
-    attr_accessor :jasmine_path, :spec_path, :boot_path, :src_path, :image_path, :runner_boot_path
+    attr_writer :jasmine_files, :boot_files, :src_files, :runner_boot_files
+    attr_accessor :helper_files, :spec_files, :testing_files
+    attr_accessor :jasmine_path, :spec_path, :boot_path, :src_path, :image_path, :runner_boot_path, :helper_files
     attr_accessor :jasmine_dir, :spec_dir, :boot_dir, :src_dir, :images_dir, :runner_boot_dir
     attr_accessor :formatters
     attr_accessor :host
@@ -27,7 +28,7 @@ module Jasmine
       @boot_files = lambda { [] }
       @runner_boot_files = lambda { [] }
       @src_files = lambda { [] }
-      @spec_files = lambda { [] }
+      @testing_files = lambda { [] }
       @runner = lambda { |config| }
       @rack_options = {}
       @show_console_log = false
@@ -50,7 +51,7 @@ module Jasmine
         map(@boot_files, :boot) +
         map(@runner_boot_files, :runner_boot) +
         map(@src_files, :src) +
-        map(@spec_files, :spec)
+        map(@testing_files, :spec)
     end
 
     def rack_path_map

data/lib/jasmine/formatters/console.rb

@@ -14,6 +14,8 @@ module Jasmine
       def done(run_details)
         outputter.puts
 
+        global_failure_details(run_details)
+
         failure_count = results.count(&:failed?)
         if failure_count > 0
           outputter.puts('Failures:')
@@ -50,6 +52,15 @@ module Jasmine
         results.select(&:pending?).map { |spec| pending_message(spec) }.join("\n\n")
       end
 
+      def global_failure_details(run_details)
+        fails = run_details.fetch('failedExpectations', [])
+        if fails.size > 0
+          fail_result = Jasmine::Result.new('fullName' => 'Error occurred in afterAll', 'description' => '', 'failedExpectations' => fails)
+          outputter.puts(failure_message(fail_result))
+          outputter.puts
+        end
+      end
+
       def chars(results)
         results.map do |result|
           if result.succeeded?

data/lib/jasmine/formatters/exit_code.rb

@@ -3,6 +3,7 @@ module Jasmine
     class ExitCode
       def initialize
         @results = []
+        @global_failure = false
       end
 
       def format(results)
@@ -10,14 +11,11 @@ module Jasmine
       end
 
       def done(details)
-      end
-
-      def exit_code
-        @results.detect(&:failed?) ? 1 : 0
+        @global_failure = details.fetch('failedExpectations', []).size > 0
       end
 
       def succeeded?
-        !@results.detect(&:failed?)
+        !@results.detect(&:failed?) && !@global_failure
       end
     end
   end

data/lib/jasmine/runners/phantom_jasmine_run.js

@@ -13,7 +13,8 @@
   }
 
   var page = require('webpage').create();
-
+  configScript = configScript.replace(/['"]{2}/,"");
+  
   if (configScript !== '') {
     try {
       require(configScript).configure(page);

data/lib/jasmine/runners/phantom_js.rb

@@ -14,7 +14,7 @@ module Jasmine
 
       def run
         phantom_script = File.join(File.dirname(__FILE__), 'phantom_jasmine_run.js')
-        command = "#{phantom_js_path} '#{phantom_script}' \"#{jasmine_server_url}\" #{show_console_log} '#{@phantom_config_script}'"
+        command = "\"#{phantom_js_path}\" \"#{phantom_script}\" \"#{jasmine_server_url}\" \"#{show_console_log}\" \"#{@phantom_config_script}\""
         run_details = { 'random' => false }
         IO.popen(command) do |output|
           output.each do |line|

data/lib/jasmine/tasks/jasmine.rake

@@ -10,7 +10,7 @@ once. This should be done for you automatically if you installed jasmine's rake
 with either 'jasmine init' or 'rails g jasmine:install'.
 
 
-EOF
+  EOF
   raise Exception.new(message)
 end
 
@@ -43,6 +43,14 @@ namespace :jasmine do
 
   desc 'Run jasmine tests in a browser, random and seed override config'
   task :ci, [:random, :seed] => %w(jasmine:require_json jasmine:require jasmine:configure jasmine:configure_plugins) do |t, args|
+    if ENV['spec']
+      spec_path = ENV['spec'].dup
+      if spec_path.include? "spec/javascripts/" # crappy hack to allow for bash tab completion
+        spec_path.slice! "spec/javascripts/"
+      end
+      Jasmine.load_spec(spec_path)
+    end
+
     ci_runner = Jasmine::CiRunner.new(Jasmine.config, args.to_hash)
     exit(1) unless ci_runner.run
   end

data/lib/jasmine/version.rb

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/release_notes/v2.5.0.md

@@ -0,0 +1,35 @@
+# Jasmine Gem 2.5.0 Release Notes
+
+## Summary
+
+This release updated the jasmine-core dependency to 2.5.0. See the
+[jasmine-core release notes](https://github.com/jasmine/jasmine/blob/master/release_notes/2.5.0.md)
+for more information
+
+## Changes
+
+* Update rails examples to spell out `generate`
+  - Fixes [#270](https://github.com/jasmine/jasmine-gem/issues/270)
+
+* Update commented examples to be valid yaml
+  - Fixes [#266](https://github.com/jasmine/jasmine-gem/issues/266)
+
+* Document non auto install configuration
+  - Merges [#264](https://github.com/jasmine/jasmine-gem/issues/264) from @eric-hu
+
+* Clean up helper output
+  - Merges [#263](https://github.com/jasmine/jasmine-gem/issues/263) from @salbertson
+
+* Fix for windows phantom execution
+  - Merges [#260](https://github.com/jasmine/jasmine-gem/issues/260) from @pf-bajorek
+
+* Report failures in global afterAll
+  - Fixes [#811](https://github.com/jasmine/jasmine-gem/issues/811)
+
+* Add functionality to specify specific suites to run
+  - Fixes [#234](https://github.com/jasmine/jasmine-gem/issues/234)
+  - Merges [#251](https://github.com/jasmine/jasmine-gem/issues/251) from @hwayne
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

data/spec/base_spec.rb

@@ -11,4 +11,23 @@ describe Jasmine do
     File.should_receive(:expand_path) { |path| path }
     Jasmine.root('subdir1', 'subdir2').should == File.join('lib/jasmine', 'subdir1', 'subdir2')
   end
+  describe '#load_spec' do
+    it 'assigns the spec to the spec path' do
+      Jasmine.load_spec("spec/test")
+      Jasmine.config.spec_files.should == [ "spec/test" ]
+    end
+
+    it 'does not assign a spec path if passed a nil' do
+      Jasmine.load_spec("spec/test")
+      Jasmine.load_spec(nil)
+      Jasmine.config.spec_files.should == [ "spec/test" ]
+    end
+
+    it 'does not override nonspec files' do
+      Jasmine.config.helper_files = ["aaa"]
+      Jasmine.load_spec("spec/test")
+      Jasmine.config.spec_files.should == [ "spec/test" ]
+      Jasmine.config.helper_files.should == ["aaa"]
+    end
+  end
 end

data/spec/configuration_spec.rb

@@ -70,7 +70,7 @@ describe Jasmine::Configuration do
       config.jasmine_files = lambda { %w(jasmine) }
       config.src_files = lambda  { %w(src) }
       config.boot_files = lambda { %w(boot) }
-      config.spec_files = lambda { %w(spec) }
+      config.testing_files = lambda { %w(spec) }
       config.js_files.should == %w(
         mapped_jasmine/jasmine/jasmine
         mapped_boot/boot/boot mapped_src/src/src

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

@@ -165,6 +165,17 @@ describe Jasmine::Formatters::Console do
         outputter_output.should match(/Randomized with seed 4325/)
       end
     end
+
+    describe 'with errors in a global afterAll' do
+      it 'should show the errors' do
+        console = Jasmine::Formatters::Console.new(outputter)
+        console.done({ 'failedExpectations' => [{ 'message' => 'Global Failure', 'stack' => 'more info' }] })
+
+        expect(outputter_output).to match(/Error occurred in afterAll/)
+        expect(outputter_output).to match(/Global Failure/)
+        expect(outputter_output).to match(/more info/)
+      end
+    end
   end
 
   def failing_result

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

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Jasmine::Formatters::ExitCode do
+  subject(:formatter) { Jasmine::Formatters::ExitCode.new }
+
+  it 'is successful with no results' do
+    formatter.done({})
+    expect(formatter).to be_succeeded
+  end
+
+  it 'is unsuccessful with a failure' do
+    formatter.format([double(:result, failed?: true)])
+    formatter.done({})
+    expect(formatter).not_to be_succeeded
+  end
+
+  it 'finds a single failure to cause the error' do
+    formatter.format([double(failed?: false), double(failed?: false), double(failed?: true), double(failed?: false)])
+    formatter.done({})
+    expect(formatter).not_to be_succeeded
+  end
+
+  it 'is unsuccessful with a failedExpectation in done' do
+    formatter.done({
+      'failedExpectations' => [{}]
+    })
+    expect(formatter).not_to be_succeeded
+  end
+
+  it 'is still successful with empty failedExpectations in done' do
+    formatter.done({ 'failedExpectations' => [] })
+    expect(formatter).to be_succeeded
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +211,7 @@ files:
 - release_notes/v2.3.0.md
 - release_notes/v2.3.1.md
 - release_notes/v2.4.0.md
+- release_notes/v2.5.0.md
 - spec/application_integration_spec.rb
 - spec/application_spec.rb
 - spec/base_spec.rb
@@ -232,6 +233,7 @@ files:
 - spec/jasmine_pojs_spec.rb
 - spec/jasmine_rails_spec.rb
 - spec/lib/jasmine/formatters/console_spec.rb
+- spec/lib/jasmine/formatters/exit_code_spec.rb
 - spec/lib/jasmine/formatters/multi_spec.rb
 - spec/page_spec.rb
 - spec/path_expander_spec.rb
@@ -289,6 +291,7 @@ test_files:
 - spec/jasmine_pojs_spec.rb
 - spec/jasmine_rails_spec.rb
 - spec/lib/jasmine/formatters/console_spec.rb
+- spec/lib/jasmine/formatters/exit_code_spec.rb
 - spec/lib/jasmine/formatters/multi_spec.rb
 - spec/page_spec.rb
 - spec/path_expander_spec.rb