jasmine 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52deb510769314254a492ff4249de9f05611b556
-  data.tar.gz: aea92ab6a204385dfde29409543117dcb4ab4c2e
+  metadata.gz: dce5824ff98a45b69356d1237216ce704e6f4ece
+  data.tar.gz: aea8fa5a135b9f3e93d35c9cfe214550406c5187
 SHA512:
-  metadata.gz: 726c7614bbdafc676f410db7b663688829d397b710b2ddfffbe0be4ffb76ab5cdfd91564245fc2a2cb4e16abcd8e6fcae016fb93716023d94daa31801f0f0b6d
-  data.tar.gz: 9a21eae3801cc9b3cc648db60a088b9d27417b7d889ce76ff11bdda5dd2a97ba4c60fb4de3157e3990588907ff278556f7127f5591a6a09b0427a65d5284c423
+  metadata.gz: 66114efd12806fb943ade76075cc526c56ed614a20150015a7811e825484be30f6c0b17ec08409f22e045a18559eeec7176526968d8a8c55e951421b131bf4c1
+  data.tar.gz: 23fe694b931ee99689cc57a14e3f34a0af8777b703d9d66bfe6e1227e8ca3487aecba23cba7329fb12c9c4052cbdcf8491428b2f63062beadd9700675eac960a

data/README.markdown

@@ -87,9 +87,10 @@ In your jasmine_helper.rb:
 
 ## Support
 
+Documentation: [jasmine.github.io](https://jasmine.github.io)
 Jasmine Mailing list: [jasmine-js@googlegroups.com](mailto:jasmine-js@googlegroups.com)
 Twitter: [@jasminebdd](http://twitter.com/jasminebdd)
 
 Please file issues here at Github
 
-Copyright (c) 2008-2013 Pivotal Labs. This software is licensed under the MIT License.
+Copyright (c) 2008-2017 Pivotal Labs. This software is licensed under the MIT License.

data/jasmine.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency 'nokogiri'
   end
 
-  s.add_dependency 'jasmine-core', '>= 2.7.0', '< 3.0.0'
+  s.add_dependency 'jasmine-core', '>= 2.8.0', '< 3.0.0'
   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

@@ -122,6 +122,16 @@ boot_files:
 # rack_options:
 #   server: 'thin'
 
+# phantom_cli_options
+#
+# Extra options to be passed to the phantomjs cli,
+# e.g. to enable localStorage in PhantomJs 2.5
+#
+# EXAMPLE
+#
+# phantom_cli_options:
+#   local-storage-quota: 5000
+
 # random
 #
 # Run specs in semi-random order.

data/lib/jasmine/base.rb

@@ -30,12 +30,12 @@ module Jasmine
     true
   end
 
-  def self.wait_for_listener(port, name = "required process", seconds_to_wait = 20)
+  def self.wait_for_listener(port, host = "localhost", seconds_to_wait = 20)
     time_out_at = Time.now + seconds_to_wait
     until server_is_listening_on "localhost", port
       sleep 0.1
       puts "Waiting for #{name} on #{port}..."
-      raise "#{name} didn't show up on port #{port} after #{seconds_to_wait} seconds." if Time.now > time_out_at
+      raise "jasmine server didn't show up on port #{port} after #{seconds_to_wait} seconds." if Time.now > time_out_at
     end
   end
 

data/lib/jasmine/ci_runner.rb

@@ -31,7 +31,7 @@ module Jasmine
       end
       t.abort_on_exception = true
 
-      Jasmine::wait_for_listener(config.port(:ci), 'jasmine server')
+      Jasmine::wait_for_listener(config.port(:ci), config.host.sub(/\Ahttps?:\/\//, ''))
       @outputter.puts 'jasmine server started'
 
       runner.run

data/lib/jasmine/config.rb

@@ -80,7 +80,8 @@ module Jasmine
                                       @config.prevent_phantom_js_auto_install,
                                       @config.show_console_log,
                                       @config.phantom_config_script,
-                                      @config.show_full_stack_trace)
+                                      @config.show_full_stack_trace,
+                                      @config.phantom_cli_options)
     end
   end
 
@@ -115,6 +116,7 @@ module Jasmine
         config.stop_spec_on_expectation_failure = yaml_config.stop_spec_on_expectation_failure
         config.random = yaml_config.random
         config.phantom_config_script = yaml_config.phantom_config_script
+        config.phantom_cli_options = yaml_config.phantom_cli_options
 
         config.rack_options = yaml_config.rack_options
       end

data/lib/jasmine/configuration.rb

@@ -15,6 +15,7 @@ module Jasmine
     attr_accessor :stop_spec_on_expectation_failure
     attr_accessor :random
     attr_accessor :phantom_config_script
+    attr_accessor :phantom_cli_options
     attr_accessor :show_full_stack_trace
     attr_reader :rack_apps
 
@@ -37,6 +38,7 @@ module Jasmine
       @stop_spec_on_expectation_failure = false
       @random = false
       @phantom_config_script = nil
+      @phantom_cli_options = {}
 
       @formatters = [Jasmine::Formatters::Console]
 

data/lib/jasmine/runners/phantom_js.rb

@@ -3,18 +3,19 @@ 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, show_full_stack_trace)
+      def initialize(formatter, jasmine_server_url, prevent_phantom_js_auto_install, show_console_log, phantom_config_script, show_full_stack_trace, cli_options = nil)
         @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
+        @cli_options = cli_options || {}
       end
 
       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}\" \"#{cli_options_string}\" \"#{phantom_script}\" \"#{jasmine_server_url}\" \"#{show_console_log}\" \"#{@phantom_config_script}\""
         run_details = { 'random' => false }
         IO.popen(command) do |output|
           output.each do |line|
@@ -59,6 +60,12 @@ module Jasmine
         File.expand_path('phantom_boot.js', File.dirname(__FILE__))
       end
 
+      def cli_options_string
+        @cli_options.
+            map {|(k, v)| "--#{k}=#{v}"}.
+            join(' ')
+      end
+
       private
       attr_reader :formatter, :jasmine_server_url, :prevent_phantom_js_auto_install, :show_console_log
     end

data/lib/jasmine/version.rb

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "2.7.0"
+  VERSION = "2.8.0"
 end

data/lib/jasmine/yaml_config_parser.rb

@@ -76,6 +76,10 @@ module Jasmine
       File.join @pwd, loaded_yaml['phantom_config_script']
     end
 
+    def phantom_cli_options
+      loaded_yaml['phantom_cli_options'] || {}
+    end
+
     def rack_options
       loaded_yaml.fetch('rack_options', {}).inject({}) do |memo, (key, value)|
         memo[key.to_sym] = value

data/release_notes/v2.8.0.md

@@ -0,0 +1,21 @@
+# Jasmine Gem 2.8.0 Release Notes
+
+## Summary
+
+This release updates the jasmine-core dependency to 2.8.0. See the
+[jasmine-core release notes](https://github.com/jasmine/jasmine/blob/master/release_notes/2.8.0.md)
+for more information
+
+## Pull Requests & Issues
+
+* Add support to pass cli options to the phantomjs command
+  - Merges [#290](https://github.com/jasmine/jasmine-gem/issues/290) from @cice
+
+
+* Listen for the server on the host we're going to load it on
+  - Fixes [#269](https://github.com/jasmine/jasmine-gem/issues/269)
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

data/spec/ci_runner_spec.rb

@@ -8,7 +8,7 @@ describe Jasmine::CiRunner do
     double(:configuration,
            :runner => runner_factory,
            :formatters => [],
-           :host => 'foo.bar.com',
+           :host => 'http://foo.bar.com',
            :port => '1234',
            :rack_options => 'rack options',
            :stop_spec_on_expectation_failure => false,
@@ -54,7 +54,7 @@ describe Jasmine::CiRunner do
     @thread_block.call
     expect(fake_server).to have_received(:start)
 
-    expect(Jasmine).to have_received(:wait_for_listener).with('1234', 'jasmine server')
+    expect(Jasmine).to have_received(:wait_for_listener).with('1234', 'foo.bar.com')
 
     expect(runner).to have_received(:run)
   end

data/spec/jasmine_rails_spec.rb

@@ -193,7 +193,7 @@ if rails_available?
       Bundler.with_clean_env do
         begin
           pid = IO.popen("bundle exec rake jasmine #{options}").pid
-          Jasmine::wait_for_listener(8888, 'jasmine server', 60)
+          Jasmine::wait_for_listener(8888, 'localhost', 60)
 
           # if the process we started is not still running, it's very likely this test
           # will fail because another server is already running on port 8888

data/spec/phantom_js_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Jasmine::Runners::PhantomJs do
+  it 'converts a given cli options hash to a cli arguments string' do
+    options = {
+      'local-storage-quota' => 5000,
+      'local-storage-path' => 'tmp/xyz'
+    }
+
+    phantom_js = Jasmine::Runners::PhantomJs.new(nil, nil,nil,nil, nil,nil, options)
+
+    expect(phantom_js.cli_options_string).to eq('--local-storage-quota=5000 --local-storage-path=tmp/xyz')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Gregg Van Hove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,7 +86,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -96,7 +96,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -222,6 +222,7 @@ files:
 - release_notes/v2.6.0.md
 - release_notes/v2.6.1.md
 - release_notes/v2.7.0.md
+- release_notes/v2.8.0.md
 - spec/application_integration_spec.rb
 - spec/application_spec.rb
 - spec/base_spec.rb
@@ -249,6 +250,7 @@ files:
 - spec/path_expander_spec.rb
 - spec/path_mapper_spec.rb
 - spec/performance/phantom_js_runner_performance_spec.rb
+- spec/phantom_js_spec.rb
 - spec/rack/jasmine/runner_spec.rb
 - spec/result_spec.rb
 - spec/server_spec.rb
@@ -307,6 +309,7 @@ test_files:
 - spec/path_expander_spec.rb
 - spec/path_mapper_spec.rb
 - spec/performance/phantom_js_runner_performance_spec.rb
+- spec/phantom_js_spec.rb
 - spec/rack/jasmine/runner_spec.rb
 - spec/result_spec.rb
 - spec/server_spec.rb