jasmine 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6e4feb31d891edcde8c1fc8f2b376dd2702c36d
-  data.tar.gz: 4aaf7e86cd765c88ef134656b6c009244a319f5b
+  metadata.gz: 52deb510769314254a492ff4249de9f05611b556
+  data.tar.gz: aea92ab6a204385dfde29409543117dcb4ab4c2e
 SHA512:
-  metadata.gz: 0704ccd63ed7ceea4fcb83271fb3985264a955e88c17297ab211c787c18b937351a9f3f3859c5a22d0cecd3cbe457953d3b3bbac467a82595ccc8500e93d740e
-  data.tar.gz: 014f79dc012747bb22e6ff6141dee04f6333f3466d10fba0f76f0ff612f0b05163a6617e4615eeea15b7818c98cc1aafb23f81e01e34e75f98fe5157c52de9da
+  metadata.gz: 726c7614bbdafc676f410db7b663688829d397b710b2ddfffbe0be4ffb76ab5cdfd91564245fc2a2cb4e16abcd8e6fcae016fb93716023d94daa31801f0f0b6d
+  data.tar.gz: 9a21eae3801cc9b3cc648db60a088b9d27417b7d889ce76ff11bdda5dd2a97ba4c60fb4de3157e3990588907ff278556f7127f5591a6a09b0427a65d5284c423

data/jasmine.gemspec

@@ -1,17 +1,7 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "jasmine/version"
-
-def ruby_version_less_than(target_version)
-  version_parts = RUBY_VERSION.split('.').map(&:to_i).zip(target_version)
-
-  version_parts.each do |(current_part, target_part)|
-    if current_part < target_part
-      return true
-    end
-  end
-  false
-end
+require "jasmine/ruby_versions"
 
 Gem::Specification.new do |s|
   s.name               = %q{jasmine}
@@ -51,7 +41,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency 'nokogiri'
   end
 
-  s.add_dependency 'jasmine-core', '>= 2.6.0', '< 3.0.0'
+  s.add_dependency 'jasmine-core', '>= 2.7.0', '< 3.0.0'
   s.add_dependency 'rack', '>= 1.2.1'
   s.add_dependency 'rake'
   s.add_dependency 'phantomjs'

data/lib/jasmine/base.rb

@@ -23,7 +23,7 @@ module Jasmine
     require 'socket'
     begin
       socket = TCPSocket.open(hostname, port)
-    rescue Errno::ECONNREFUSED, Errno::ENETUNREACH, Errno::EAFNOSUPPORT
+    rescue Errno::ECONNREFUSED, Errno::ENETUNREACH, Errno::EAFNOSUPPORT, Errno::EADDRNOTAVAIL, Errno::EHOSTUNREACH
       return false
     end
     socket.close

data/lib/jasmine/config.rb

@@ -108,9 +108,8 @@ module Jasmine
         config.css_files = lambda { yaml_config.css_files }
 
         config.spec_dir = yaml_config.spec_dir
-        config.helper_files = yaml_config.helpers
-        config.spec_files =  yaml_config.spec_files
-        config.testing_files = lambda { config.helper_files + config.spec_files }
+        config.helper_files = lambda { yaml_config.helpers }
+        config.spec_files = lambda { 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
@@ -127,8 +126,8 @@ module Jasmine
 
   def self.load_spec(spec_path)
     return if spec_path.nil?
-    Jasmine.configure do |c|  
-      c.spec_files = [spec_path]
+    Jasmine.configure do |c|
+      c.spec_files = lambda { [spec_path] }
     end
   end
 end

data/lib/jasmine/configuration.rb

@@ -2,8 +2,8 @@ module Jasmine
   class Configuration
     attr_writer :jasmine_css_files, :css_files
     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 :helper_files, :spec_files
+    attr_accessor :jasmine_path, :spec_path, :boot_path, :src_path, :image_path, :runner_boot_path
     attr_accessor :jasmine_dir, :spec_dir, :boot_dir, :src_dir, :images_dir, :runner_boot_dir
     attr_accessor :formatters
     attr_accessor :host
@@ -28,7 +28,9 @@ module Jasmine
       @boot_files = lambda { [] }
       @runner_boot_files = lambda { [] }
       @src_files = lambda { [] }
-      @testing_files = lambda { [] }
+      @helper_files = lambda { [] }
+      @spec_files = lambda { [] }
+      @testing_files = lambda { helper_files.call + spec_files.call}
       @runner = lambda { |config| }
       @rack_options = {}
       @show_console_log = false

data/lib/jasmine/dependencies.rb

@@ -18,10 +18,6 @@ module Jasmine
         defined?(Rails) && Rails.respond_to?(:version)
       end
 
-      def legacy_rack?
-        !defined?(Rack::Server)
-      end
-
       def use_asset_pipeline?
         assets_pipeline_available = (rails3? || rails4? || rails5?) && Rails.respond_to?(:application) && Rails.application.respond_to?(:assets)
         rails3_assets_enabled = rails3? && assets_pipeline_available && Rails.application.config.assets.enabled != false

data/lib/jasmine/ruby_versions.rb

@@ -0,0 +1,11 @@
+def ruby_version_less_than(target_version)
+  version_parts = RUBY_VERSION.split('.').map(&:to_i).zip(target_version)
+
+  version_parts.each do |(current_part, target_part)|
+    if current_part < target_part
+      return true
+    end
+  end
+  false
+end
+

data/lib/jasmine/server.rb

@@ -9,15 +9,9 @@ module Jasmine
 
     def start
       @env['PORT'] = @port.to_s
-      if Jasmine::Dependencies.legacy_rack?
-        handler = Rack::Handler.get('webrick')
-        handler.run(@application, :Port => @port, :AccessLog => [])
-      else
-        server = Rack::Server.new(@rack_options.merge(:Port => @port, :AccessLog => []))
-        # workaround for Rack bug, when Rack > 1.2.1 is released Rack::Server.start(:app => Jasmine.app(self)) will work
-        server.instance_variable_set(:@app, @application)
-        server.start
-      end
+      Rack::Server.start(@rack_options.merge(:Port => @port,
+                                             :AccessLog => [],
+                                             :app => @application))
     end
   end
 end

data/lib/jasmine/version.rb

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

data/release_notes/v2.6.1.md

@@ -0,0 +1,11 @@
+# Jasmine Gem 2.6.1 Release Notes
+
+## Pull Requests and Issues
+
+* Remove old code for legacy rack and set up the Jasmine application through proper channels
+  - Fixes [#284](https://github.com/jasmine/jasmine-gem/issues/284)
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

data/release_notes/v2.7.0.md

@@ -0,0 +1,28 @@
+# Jasmine Gem 2.7.0 Release Notes
+
+## Summary
+
+This release updates the jasmine-core dependency to 2.7.0. See the
+[jasmine-core release notes](https://github.com/jasmine/jasmine/blob/master/release_notes/2.7.0.md)
+for more information
+
+## Changes
+
+* Properly pick up new spec and helper files without having to restart
+
+## Pull Requests and Issues
+
+* catch Errno::EHOSTUNREACH while testing Jasmine#server_is_listening_on
+  - Merges [#288](https://github.com/jasmine/jasmine-gem/issues/288) from @doooby
+
+* Catch error "Errno::EADDRNOTAVAIL", if check socket connection at cli mode
+  - Merges [#286](https://github.com/jasmine/jasmine-gem/issues/286) from @websi
+  - Fixes [#285](https://github.com/jasmine/jasmine-gem/issues/285)
+
+* Remove old code for legacy rack and set up the Jasmine application through proper channels
+  - Fixes [#284](https://github.com/jasmine/jasmine-gem/issues/284)
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

data/spec/application_integration_spec.rb

@@ -5,10 +5,10 @@ describe "Jasmine::Application" do
   it "includes no-cache headers for specs" do
     pending
     get "/__spec__/example_spec.js"
-    last_response.headers.should have_key("Cache-Control")
-    last_response.headers["Cache-Control"].should == "max-age=0, private, must-revalidate"
+    expect(last_response.headers).to have_key("Cache-Control")
+    expect(last_response.headers["Cache-Control"]).to eq "max-age=0, private, must-revalidate"
     last_response.headers['Pragma'].each do |key|
-      last_response.headers[key].should == 'no-cache'
+      expect(last_response.headers[key]).to eq 'no-cache'
     end
   end
 

data/spec/application_spec.rb

@@ -11,20 +11,20 @@ describe 'Jasmine::Application' do
     builder = double('Rack::Builder.new')
     #Rack::Builder instance evals, so builder.run is invalid syntax,
     #this is the only way to stub out the 'run' dsl it gives to the block.
-    Jasmine::Application.stub(:run).with(handler1).and_return(app1)
-    Jasmine::Application.stub(:run).with(handler2).and_return(app2)
+    allow(Jasmine::Application).to receive(:run).with(handler1).and_return(app1)
+    allow(Jasmine::Application).to receive(:run).with(handler2).and_return(app2)
 
-    builder.should_receive(:map).twice do |path, &app|
+    expect(builder).to receive(:map).twice do |path, &app|
       if path == '/foo'
-        app.call.should == app1
+        expect(app.call).to eq app1
       elsif path == '/bar'
-        app.call.should == app2
+        expect(app.call).to eq app2
       else
         raise 'Unexpected path passed'
       end
     end
 
-    Jasmine::Application.app(config, builder).should == builder
+    expect(Jasmine::Application.app(config, builder)).to eq builder
   end
 
   it 'should run rack apps provided by the config' do
@@ -40,16 +40,16 @@ describe 'Jasmine::Application' do
         { :app => app4, :args => [:bar] }
     ])
     builder = double('Rack::Builder.new')
-    builder.should_receive(:use).with(app1)
-    builder.should_receive(:use) do |*args, &arg_block|
-      args.should == [app2]
-      arg_block.should == block
+    expect(builder).to receive(:use).with(app1)
+    expect(builder).to receive(:use) do |*args, &arg_block|
+      expect(args).to eq [app2]
+      expect(arg_block).to eq block
     end
-    builder.should_receive(:use) do |*args, &arg_block|
-      args.should == [app3, :foo, :bar]
-      arg_block.should == block
+    expect(builder).to receive(:use) do |*args, &arg_block|
+      expect(args).to eq [app3, :foo, :bar]
+      expect(arg_block).to eq block
     end
-    builder.should_receive(:use).with(app4, :bar)
-    Jasmine::Application.app(config, builder).should == builder
+    expect(builder).to receive(:use).with(app4, :bar)
+    expect(Jasmine::Application.app(config, builder)).to eq builder
   end
-end
+end

data/spec/base_spec.rb

@@ -2,32 +2,34 @@ require 'spec_helper'
 
 describe Jasmine do
   it "should provide the root path" do
-    File.stub(:dirname).and_return('lib/jasmine')
-    File.should_receive(:expand_path) { |path| path }
-    Jasmine.root.should == 'lib/jasmine'
+    allow(File).to receive(:dirname).and_return('lib/jasmine')
+    expect(File).to receive(:expand_path) { |path| path }
+    expect(Jasmine.root).to eq 'lib/jasmine'
   end
+
   it "should append passed file paths" do
-    File.stub(:dirname).and_return('lib/jasmine')
-    File.should_receive(:expand_path) { |path| path }
-    Jasmine.root('subdir1', 'subdir2').should == File.join('lib/jasmine', 'subdir1', 'subdir2')
+    allow(File).to receive(:dirname).and_return('lib/jasmine')
+    expect(File).to receive(:expand_path) { |path| path }
+    expect(Jasmine.root('subdir1', 'subdir2')).to eq 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" ]
+      expect(Jasmine.config.spec_files.call).to eq [ "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" ]
+      expect(Jasmine.config.spec_files.call).to eq [ "spec/test" ]
     end
 
     it 'does not override nonspec files' do
-      Jasmine.config.helper_files = ["aaa"]
+      Jasmine.config.helper_files = lambda { ["aaa"] }
       Jasmine.load_spec("spec/test")
-      Jasmine.config.spec_files.should == [ "spec/test" ]
-      Jasmine.config.helper_files.should == ["aaa"]
+      expect(Jasmine.config.spec_files.call).to eq [ "spec/test" ]
+      expect(Jasmine.config.helper_files.call).to eq ["aaa"]
     end
   end
 end

data/spec/configuration_spec.rb

@@ -53,10 +53,10 @@ describe Jasmine::Configuration do
       config.add_path_mapper(lambda { |c| test_mapper1.new(c) })
       config.add_path_mapper(lambda { |c| test_mapper2.new(c) })
       config.add_path_mapper(lambda { |c| test_mapper3.new(c) })
-      config.css_files.should == []
+      expect(config.css_files).to eq []
       config.jasmine_css_files = lambda { %w(jasmine_css) }
       config.css_files = lambda { %w(css) }
-      config.css_files.should == %w(mapped_jasmine/jasmine_css/jasmine mapped_src/css/src)
+      expect(config.css_files).to eq %w(mapped_jasmine/jasmine_css/jasmine mapped_src/css/src)
     end
   end
 
@@ -66,14 +66,16 @@ describe Jasmine::Configuration do
       config.add_path_mapper(lambda { |c| test_mapper1.new(c) })
       config.add_path_mapper(lambda { |c| test_mapper2.new(c) })
       config.add_path_mapper(lambda { |c| test_mapper3.new(c) })
-      config.js_files.should == []
+      expect(config.js_files).to eq []
       config.jasmine_files = lambda { %w(jasmine) }
       config.src_files = lambda  { %w(src) }
       config.boot_files = lambda { %w(boot) }
-      config.testing_files = lambda { %w(spec) }
-      config.js_files.should == %w(
+      config.spec_files = lambda { %w(spec) }
+      config.helper_files = lambda { %w(helper) }
+      expect(config.js_files).to eq %w(
         mapped_jasmine/jasmine/jasmine
         mapped_boot/boot/boot mapped_src/src/src
+        mapped_spec/helper/spec
         mapped_spec/spec/spec)
     end
   end
@@ -84,8 +86,8 @@ describe Jasmine::Configuration do
       result = double
       config.add_rack_path('some/path', lambda { result })
       map = config.rack_path_map
-      map['some/path'].should be
-      map['some/path'].call.should == result
+      expect(map['some/path']).to be
+      expect(map['some/path'].call).to eq result
     end
   end
 
@@ -94,7 +96,7 @@ describe Jasmine::Configuration do
       config = Jasmine::Configuration.new()
       app = double
       config.add_rack_app(app)
-      config.rack_apps.should == [{ :app => app, :args => [], :block => nil }]
+      expect(config.rack_apps).to eq [{ :app => app, :args => [], :block => nil }]
     end
 
     it 'permits the addition of arbitary rack apps with a config block' do
@@ -102,14 +104,14 @@ describe Jasmine::Configuration do
       app = double
       block = lambda { 'foo' }
       config.add_rack_app(app, &block)
-      config.rack_apps.should == [{ :app => app, :args => [], :block => block }]
+      expect(config.rack_apps).to eq [{ :app => app, :args => [], :block => block }]
     end
 
     it 'permits the addition of arbitary rack apps with arbitrary config' do
       config = Jasmine::Configuration.new()
       app = double
       config.add_rack_app(app, { :foo => 'bar' })
-      config.rack_apps.should == [{ :app => app, :args => [{ :foo => 'bar' }], :block => nil }]
+      expect(config.rack_apps).to eq [{ :app => app, :args => [{ :foo => 'bar' }], :block => nil }]
     end
 
     it 'permits the addition of arbitary rack apps with arbitrary config and a config block' do
@@ -117,19 +119,19 @@ describe Jasmine::Configuration do
       app = double
       block = lambda { 'foo' }
       config.add_rack_app(app, { :foo => 'bar' }, &block)
-      config.rack_apps.should == [{ :app => app, :args => [{ :foo => 'bar' }], :block => block }]
+      expect(config.rack_apps).to eq [{ :app => app, :args => [{ :foo => 'bar' }], :block => block }]
     end
   end
 
   describe 'host' do
     it 'should default to localhost' do
-      Jasmine::Configuration.new().host.should == 'http://localhost'
+      expect(Jasmine::Configuration.new().host).to eq 'http://localhost'
     end
 
     it 'returns host if set' do
       config = Jasmine::Configuration.new()
       config.host = 'foo'
-      config.host.should == 'foo'
+      expect(config.host).to eq 'foo'
     end
   end
 
@@ -137,7 +139,7 @@ describe Jasmine::Configuration do
     it 'returns value if set' do
       config = Jasmine::Configuration.new()
       config.spec_format = 'fish'
-      config.spec_format.should == 'fish'
+      expect(config.spec_format).to eq 'fish'
     end
   end
 
@@ -145,7 +147,7 @@ describe Jasmine::Configuration do
     it 'returns value if set' do
       config = Jasmine::Configuration.new()
       config.prevent_phantom_js_auto_install = true
-      config.prevent_phantom_js_auto_install.should == true
+      expect(config.prevent_phantom_js_auto_install).to eq true
     end
   end
 
@@ -153,36 +155,36 @@ describe Jasmine::Configuration do
     it 'returns value if set' do
       config = Jasmine::Configuration.new()
       config.show_full_stack_trace = true
-      config.show_full_stack_trace.should == true
+      expect(config.show_full_stack_trace).to eq true
     end
   end
 
   describe 'jasmine ports' do
     it 'returns new CI port and caches return value' do
       config = Jasmine::Configuration.new()
-      Jasmine.stub(:find_unused_port).and_return('1234')
-      config.port(:ci).should == '1234'
-      Jasmine.stub(:find_unused_port).and_return('4321')
-      config.port(:ci).should == '1234'
+      allow(Jasmine).to receive(:find_unused_port).and_return('1234')
+      expect(config.port(:ci)).to eq '1234'
+      allow(Jasmine).to receive(:find_unused_port).and_return('4321')
+      expect(config.port(:ci)).to eq '1234'
     end
 
     it 'returns ci port if configured' do
       config = Jasmine::Configuration.new()
       config.ci_port = '5678'
-      Jasmine.stub(:find_unused_port).and_return('1234')
-      config.port(:ci).should == '5678'
+      allow(Jasmine).to receive(:find_unused_port).and_return('1234')
+      expect(config.port(:ci)).to eq '5678'
     end
 
     it 'returns configured server port' do
       config = Jasmine::Configuration.new()
       config.server_port = 'fish'
-      config.port(:server).should == 'fish'
+      expect(config.port(:server)).to eq 'fish'
     end
 
     it 'returns default server port' do
       config = Jasmine::Configuration.new()
 
-      config.port(:server).should == 8888
+      expect(config.port(:server)).to eq 8888
     end
   end
 
@@ -190,13 +192,13 @@ describe Jasmine::Configuration do
     it 'returns value if set' do
       config = Jasmine::Configuration.new()
       config.formatters = ['pants']
-      config.formatters.should == ['pants']
+      expect(config.formatters).to eq ['pants']
     end
 
     it 'returns defaults' do
       config = Jasmine::Configuration.new()
 
-      config.formatters.should == [Jasmine::Formatters::Console]
+      expect(config.formatters).to eq [Jasmine::Formatters::Console]
     end
   end
 
@@ -205,7 +207,7 @@ describe Jasmine::Configuration do
       config = Jasmine::Configuration.new
       foo = double(:foo)
       config.runner = foo
-      config.runner.should == foo
+      expect(config.runner).to eq foo
     end
 
     it 'does nothing by default' do