jasmine 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f595bb93e25f76eafd50f76f967dff613f67b09
-  data.tar.gz: 742260eed0ee7f65a30d0b22a1275bc68b9ab58a
+  metadata.gz: 4f1c16c911f71c441feab00ae9f89b411dc361be
+  data.tar.gz: 782e71c3b4cc77c95596b1d09b261e996e869eec
 SHA512:
-  metadata.gz: 2cb8f13ca4b6e58053517a2c4d92d63e6b5ddf4336fec4e24a182f8ea13ea658a043fe1273302342f75a3484a293886fe67fa1b4e8f6300a8357cf4e7463d4a6
-  data.tar.gz: fdcc12240c1bfd77916fc47a1c2ab3add77d5743686b6fc6775a8a42f64881ba845e1006cebc4436daee60aca34823ddaee7965844730f13b117e21461361041
+  metadata.gz: 54271fc96fda2a5a1721708d8dc5a24ca23c7ae649c19f9d44af9aa4cee6f201813856503e55e04fa08243b75a0072ff86a64c9da42f83e62eb354940bfca2a4
+  data.tar.gz: 5a0f04eb85c8e9d4d61ab5643e2f928a316594e7a45d4aea3871600087f5479bd886bfbed8aa6f8154c26d888875e7b09bac5abfe155757a47a129da438caf4d

data/Gemfile

@@ -2,13 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-unless ENV['TRAVIS']
-  group :debug do
-    gem 'debugger', :platform => :mri
-    gem 'ruby-debug', :platform => :jruby
-  end
-end
-
 gem 'anchorman', :platform => :mri
 # during development, do not release
 if ENV['TRAVIS']

data/jasmine.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary            = %q{JavaScript BDD framework}
   s.description        = %q{Test your JavaScript without any framework dependencies, in any environment, and with a nice descriptive syntax.}
   s.email              = %q{jasmine-js@googlegroups.com}
-  s.homepage           = "http://pivotal.github.com/jasmine/"
+  s.homepage           = "http://jasmine.github.io/"
   s.license            = "MIT"
 
   s.files              = `git ls-files`.split("\n") | Dir.glob('jasmine/**/*')
@@ -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.2'
+  s.add_dependency 'jasmine-core', '~> 2.3'
   s.add_dependency 'rack', '>= 1.2.1'
   s.add_dependency 'rake'
   s.add_dependency 'phantomjs'

data/lib/generators/jasmine/examples/templates/spec/javascripts/helpers/jasmine_examples/SpecHelper.js

@@ -7,7 +7,7 @@ beforeEach(function () {
 
           return {
             pass: player.currentlyPlayingSong === expected && player.isPlaying
-          }
+          };
         }
       };
     }

data/lib/jasmine.rb

@@ -13,6 +13,7 @@ jasmine_files = ['base',
                  'result',
                  'path_expander',
                  'yaml_config_parser',
+                 'ci_runner',
                  File.join('formatters', 'exit_code'),
                  File.join('formatters', 'console'),
                  File.join('formatters', 'multi'),

data/lib/jasmine/ci_runner.rb

@@ -0,0 +1,48 @@
+module Jasmine
+  class CiRunner
+    def initialize(config, options={})
+      @config = config
+      @thread = options.fetch(:thread, Thread)
+      @application_factory = options.fetch(:application_factory, Jasmine::Application)
+      @server_factory = options.fetch(:server_factory, Jasmine::Server)
+      @outputter = options.fetch(:outputter, Kernel)
+    end
+
+    def run
+      formatters = config.formatters.map { |formatter_class| formatter_class.new }
+
+      exit_code_formatter = Jasmine::Formatters::ExitCode.new
+      formatters << exit_code_formatter
+
+      url = "#{config.host}:#{config.port(:ci)}/?throwFailures=#{config.stop_spec_on_expectation_failure}"
+      runner = config.runner.call(Jasmine::Formatters::Multi.new(formatters), url)
+
+      if runner.respond_to?(:boot_js)
+        config.runner_boot_dir = File.dirname(runner.boot_js)
+        config.runner_boot_files = lambda { [runner.boot_js] }
+      end
+
+      server = @server_factory.new(config.port(:ci), app, config.rack_options)
+
+      t = @thread.new do
+        server.start
+      end
+      t.abort_on_exception = true
+
+      Jasmine::wait_for_listener(config.port(:ci), 'jasmine server')
+      @outputter.puts 'jasmine server started'
+
+      runner.run
+
+      exit_code_formatter.succeeded?
+    end
+
+    private
+
+    attr_reader :config
+
+    def app
+      @application_factory.app(@config)
+    end
+  end
+end

data/lib/jasmine/config.rb

@@ -111,6 +111,7 @@ module Jasmine
         config.spec_files = lambda { yaml_config.helpers + yaml_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
         config.phantom_config_script = yaml_config.phantom_config_script
 
         config.rack_options = yaml_config.rack_options

data/lib/jasmine/configuration.rb

@@ -11,6 +11,7 @@ module Jasmine
     attr_accessor :rack_options
     attr_accessor :prevent_phantom_js_auto_install
     attr_accessor :show_console_log
+    attr_accessor :stop_spec_on_expectation_failure
     attr_accessor :phantom_config_script
     attr_accessor :show_full_stack_trace
     attr_reader :rack_apps
@@ -29,6 +30,7 @@ module Jasmine
       @runner = lambda { |config| }
       @rack_options = {}
       @show_console_log = false
+      @stop_spec_on_expectation_failure = false
       @phantom_config_script = nil
 
       @formatters = [Jasmine::Formatters::Console]

data/lib/jasmine/dependencies.rb

@@ -3,21 +3,16 @@ module Jasmine
 
     class << self
       def rails3?
-        safe_gem_check("railties", "~> 3") && running_rails3?
+        running_rails3?
       end
 
       def rails4?
-        safe_gem_check("railties", "~> 4") && running_rails4?
+        running_rails4?
       end
 
       def rails?
-        rails_available? && running_rails?
+        running_rails?
       end
-
-      def rails_available?
-        safe_gem_check("railties", '>= 3')
-      end
-
       def legacy_rack?
         !defined?(Rack::Server)
       end
@@ -41,17 +36,6 @@ module Jasmine
       def running_rails?
         defined?(Rails) && Rails.respond_to?(:version)
       end
-
-      def safe_gem_check(gem_name, version_string)
-        if Gem::Specification.respond_to?(:find_by_name)
-          Gem::Specification.find_by_name(gem_name, version_string)
-        elsif Gem.respond_to?(:available?)
-          Gem.available?(gem_name, version_string)
-        end
-      rescue Gem::LoadError
-        false
-      end
-
     end
   end
 end

data/lib/jasmine/formatters/console.rb

@@ -52,6 +52,8 @@ module Jasmine
             "\e[32m.\e[0m"
           elsif result.pending?
             "\e[33m*\e[0m"
+          elsif result.disabled?
+            ""
           else
             "\e[31mF\e[0m"
           end

data/lib/jasmine/result.rb

@@ -27,6 +27,10 @@ module Jasmine
       status == 'pending'
     end
 
+    def disabled?
+      status == 'disabled'
+    end
+
     attr_reader :full_name, :description, :failed_expectations, :suite_name, :pending_reason
 
     private

data/lib/jasmine/tasks/jasmine.rake

@@ -43,31 +43,8 @@ namespace :jasmine do
 
   desc 'Run continuous integration tests'
   task :ci => %w(jasmine:require_json jasmine:require jasmine:configure jasmine:configure_plugins) do
-    config = Jasmine.config
-
-    formatters = config.formatters.map { |formatter_class| formatter_class.new }
-
-    exit_code_formatter = Jasmine::Formatters::ExitCode.new
-    formatters << exit_code_formatter
-
-    url = "#{config.host}:#{config.port(:ci)}/"
-    runner = config.runner.call(Jasmine::Formatters::Multi.new(formatters), url)
-    if runner.respond_to?(:boot_js)
-      config.runner_boot_dir = File.dirname(runner.boot_js)
-      config.runner_boot_files = lambda { [runner.boot_js] }
-    end
-
-    server = Jasmine::Server.new(config.port(:ci), Jasmine::Application.app(config), config.rack_options)
-    t = Thread.new do
-      server.start
-    end
-    t.abort_on_exception = true
-    Jasmine::wait_for_listener(config.port(:ci), 'jasmine server')
-    puts 'jasmine server started.'
-
-    runner.run
-
-    exit(1) unless exit_code_formatter.succeeded?
+    ci_runner = Jasmine::CiRunner.new(Jasmine.config)
+    exit(1) unless ci_runner.run
   end
 
   task :server => %w(jasmine:require jasmine:configure jasmine:configure_plugins) do

data/lib/jasmine/version.rb

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

data/lib/jasmine/yaml_config_parser.rb

@@ -63,6 +63,10 @@ module Jasmine
       loaded_yaml['show_console_log'] || false
     end
 
+    def stop_spec_on_expectation_failure
+      loaded_yaml['stop_spec_on_expectation_failure'] || false
+    end
+
     def phantom_config_script
       return nil unless loaded_yaml['phantom_config_script']
       File.join @pwd, loaded_yaml['phantom_config_script']

data/release_notes/v2.3.0.md

@@ -0,0 +1,27 @@
+# Jasmine Gem 2.3.0 Release Notes
+
+## Summary
+
+This release updated the jasmine-core dependency to 2.3.0. See the
+[jasmine-core release notes](https://github.com/jasmine/jasmine/blob/master/release_notes/2.3.0.md)
+for more information
+
+## Changes
+
+* Bring back proper rails availability detection for specs
+* Allow jasmine:ci task to stop a spec when an expectation failure occurs
+* Extract jasmine:ci task running so it's more easily testable
+* Don't print a symbol for disabled specs
+* Properly format a disabled spec in the symbol summary
+
+## Pull Requests & Issues
+
+* No longer check for the gem itself when looking for Rails
+    - Fixes [#238](https://github.com/jasmine/jasmine-gem/issues/238)
+
+* Fix homepage URL in gemspec
+    - Merges [#237](https://github.com/jasmine/jasmine-gem/issues/237) from @jc00ke
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

data/spec/ci_runner_spec.rb

@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+describe Jasmine::CiRunner do
+  let(:runner) { double(:runner, :run => nil) }
+  let(:runner_factory) { double(:runner_factory, :call => runner) }
+
+  let(:config) do
+    double(:configuration,
+           :runner => runner_factory,
+           :formatters => [],
+           :host => 'foo.bar.com',
+           :port => '1234',
+           :rack_options => 'rack options',
+           :stop_spec_on_expectation_failure => false
+          )
+  end
+
+  let(:thread_instance) { double(:thread, :abort_on_exception= => nil) }
+  let(:fake_thread) do
+    thread = double(:thread)
+    allow(thread).to receive(:new) do |&block|
+      @thread_block = block
+      thread_instance
+    end
+    thread
+  end
+  let(:application_factory) { double(:application, :app => 'my fake app') }
+  let(:fake_server) { double(:server, :start => nil) }
+  let(:server_factory) { double(:server_factory, :new => fake_server) }
+  let(:outputter) { double(:outputter, :puts => nil) }
+
+  before do
+    allow(Jasmine).to receive(:wait_for_listener)
+  end
+
+  it 'starts a server and runner' do
+    ci_runner = Jasmine::CiRunner.new(config, thread: fake_thread, application_factory: application_factory, server_factory: server_factory, outputter: outputter)
+
+    ci_runner.run
+
+    expect(config).to have_received(:port).with(:ci).at_least(:once)
+    expect(config).not_to have_received(:port).with(:server)
+
+    expect(runner_factory).to have_received(:call).with(instance_of(Jasmine::Formatters::Multi), 'foo.bar.com:1234/?throwFailures=false')
+
+    expect(application_factory).to have_received(:app).with(config)
+    expect(server_factory).to have_received(:new).with('1234', 'my fake app', 'rack options')
+
+    expect(fake_thread).to have_received(:new)
+    expect(thread_instance).to have_received(:abort_on_exception=).with(true)
+
+    @thread_block.call
+    expect(fake_server).to have_received(:start)
+
+    expect(Jasmine).to have_received(:wait_for_listener).with('1234', 'jasmine server')
+
+    expect(runner).to have_received(:run)
+  end
+
+  it 'adds runner boot files when necessary' do
+    expect(runner).to receive(:boot_js).at_least(:once) { 'foo/bar/baz.js' }
+    expect(config).to receive(:runner_boot_dir=).with('foo/bar')
+    expect(config).to receive(:runner_boot_files=) do |proc|
+      expect(proc.call).to eq ['foo/bar/baz.js']
+    end
+
+    ci_runner = Jasmine::CiRunner.new(config, thread: fake_thread, application_factory: application_factory, server_factory: server_factory, outputter: outputter)
+
+    ci_runner.run
+  end
+
+  it 'returns true for a successful run' do
+    allow(Jasmine::Formatters::ExitCode).to receive(:new) { double(:exit_code, :succeeded? => true) }
+
+    ci_runner = Jasmine::CiRunner.new(config, thread: fake_thread, application_factory: application_factory, server_factory: server_factory, outputter: outputter)
+
+    expect(ci_runner.run).to be(true)
+  end
+
+  it 'returns false for a failed run' do
+    allow(Jasmine::Formatters::ExitCode).to receive(:new) { double(:exit_code, :succeeded? => false) }
+
+    ci_runner = Jasmine::CiRunner.new(config, thread: fake_thread, application_factory: application_factory, server_factory: server_factory, outputter: outputter)
+
+    expect(ci_runner.run).to be(false)
+  end
+
+  it 'can tell the jasmine page to throw expectation failures' do
+    allow(config).to receive(:stop_spec_on_expectation_failure) { true }
+
+    ci_runner = Jasmine::CiRunner.new(config, thread: fake_thread, application_factory: application_factory, server_factory: server_factory, outputter: outputter)
+
+    ci_runner.run
+
+    expect(runner_factory).to have_received(:call).with(instance_of(Jasmine::Formatters::Multi), 'foo.bar.com:1234/?throwFailures=true')
+  end
+end

data/spec/jasmine_rails_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'net/http'
 require 'yaml'
 
-if Jasmine::Dependencies.rails_available?
+if rails_available?
   describe 'A Rails app' do
     def bundle_install
       tries_remaining = 3

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

@@ -10,6 +10,36 @@ describe Jasmine::Formatters::Console do
     end
   end
 
+  describe '#format' do
+    it 'prints a dot for a successful spec' do
+      formatter = Jasmine::Formatters::Console.new(outputter)
+      formatter.format([passing_result])
+
+      expect(outputter_output).to include('.')
+    end
+
+    it 'prints a star for a pending spec' do
+      formatter = Jasmine::Formatters::Console.new(outputter)
+      formatter.format([pending_result])
+
+      expect(outputter_output).to include('*')
+    end
+
+    it 'prints an F for a failing spec' do
+      formatter = Jasmine::Formatters::Console.new(outputter)
+      formatter.format([failing_result])
+
+      expect(outputter_output).to include('F')
+    end
+
+    it 'prints a dot for a disabled spec' do
+      formatter = Jasmine::Formatters::Console.new(outputter)
+      formatter.format([disabled_result])
+
+      expect(outputter_output).to eq('')
+    end
+  end
+
   describe '#summary' do
     it 'shows the failure messages' do
       results = [failing_result, failing_result]
@@ -136,4 +166,8 @@ describe Jasmine::Formatters::Console do
   def pending_result
     Jasmine::Result.new(pending_raw_result)
   end
+
+  def disabled_result
+    Jasmine::Result.new(disabled_raw_result)
+  end
 end

data/spec/spec_helper.rb

@@ -11,6 +11,16 @@ $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../lib')))
 require 'jasmine'
 require 'rspec'
 
+def rails_available?
+  if Gem::Specification.respond_to?(:find_by_name)
+    Gem::Specification.find_by_name('railties', '>= 3')
+  elsif Gem.respond_to?(:available?)
+    Gem.available?('railties', '>= 3')
+  end
+rescue Gem::LoadError
+  false
+end
+
 def create_temp_dir
   tmp = File.join(Dir.tmpdir, "jasmine-gem-test_#{Time.now.to_f}")
   FileUtils.rm_r(tmp, :force => true)
@@ -61,6 +71,10 @@ def pending_raw_result
   {'id' => 123, 'status' => 'pending', 'fullName' => 'Passing test', 'description' => 'Pending', 'failedExpectations' => [], 'pendingReason' => 'I pend because'}
 end
 
+def disabled_raw_result
+  {'id' => 123, 'status' => 'disabled', 'fullName' => 'Disabled test', 'description' => 'Disabled', 'failedExpectations' => []}
+end
+
 def failing_raw_result
   {
     'status' => 'failed',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -10,132 +10,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-04-28 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.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !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
@@ -173,6 +173,7 @@ files:
 - lib/jasmine/asset_expander.rb
 - lib/jasmine/asset_pipeline_mapper.rb
 - lib/jasmine/base.rb
+- lib/jasmine/ci_runner.rb
 - lib/jasmine/command_line_install.txt
 - lib/jasmine/command_line_tool.rb
 - lib/jasmine/config.rb
@@ -207,9 +208,11 @@ files:
 - release_notes/v2.0.3.md
 - release_notes/v2.1.0.md
 - release_notes/v2.2.0.md
+- release_notes/v2.3.0.md
 - spec/application_integration_spec.rb
 - spec/application_spec.rb
 - spec/base_spec.rb
+- spec/ci_runner_spec.rb
 - spec/configuration_spec.rb
 - spec/fixture/Rakefile
 - spec/fixture/afterall_spec.js
@@ -237,28 +240,28 @@ files:
 - spec/server_spec.rb
 - spec/spec_helper.rb
 - spec/yaml_config_parser_spec.rb
-homepage: http://pivotal.github.com/jasmine/
+homepage: http://jasmine.github.io/
 licenses:
 - MIT
 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.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: JavaScript BDD framework
@@ -266,6 +269,7 @@ test_files:
 - spec/application_integration_spec.rb
 - spec/application_spec.rb
 - spec/base_spec.rb
+- spec/ci_runner_spec.rb
 - spec/configuration_spec.rb
 - spec/fixture/Rakefile
 - spec/fixture/afterall_spec.js