jasmine 2.0.0.rc3 → 2.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5805b801f003eafc553273cb7ee5c5719e390f11
-  data.tar.gz: 6b1872c956711198c0c80f6398ed57ab99e99520
+  metadata.gz: 25b9d87800d70c9fce241ec4e329cb4a3768b314
+  data.tar.gz: 57f4d922f245cfa8b84b9201f9ba245a728529f3
 SHA512:
-  metadata.gz: fe9d0640516dfe16120a9540c6b1e40eb1ba5e2b7955b4173fdb1cba5fa05954e1a881df606dff69f190a01575cc4448ec47eabbfe60e418917f42c33b978576
-  data.tar.gz: 5eed88cc462358bd3d8d36eadcb2ca84e1b4e272717969eb244b1a847a473cf89ae1b27341435d9c570ba94281e6e7d9e906021a44ca762cfaca7cdd69cd1d37
+  metadata.gz: 068395a81cacb184dc6b3f76b7dcae19892583604b78d66602d9018f5ce3196b4e217b7d6076c36f232890a555f5e2de2d7fb63dc98c9c57e97fb3e5ad2062cf
+  data.tar.gz: e6a447e4757b4cbc4e50cfeda058f305b97c839b5f763140d906184086b523d6bdcd23381c412b3fda280ab989ba529f5c0fb6ae82986fe86aedcf172aa8c4ac

data/lib/jasmine/asset_pipeline_mapper.rb

@@ -8,7 +8,8 @@ module Jasmine
 
     def map_src_paths(src_paths)
       src_paths.map do |src_path|
-        @asset_expander.call(@config.src_dir, src_path) || src_path
+        expanded_assets = @asset_expander.call(@config.src_dir, src_path)
+        expanded_assets.empty? ? src_path : expanded_assets
       end.flatten.uniq
     end
 

data/lib/jasmine/formatters/exit_code.rb

@@ -15,6 +15,10 @@ module Jasmine
       def exit_code
         @results.detect(&:failed?) ? 1 : 0
       end
+
+      def succeeded?
+        !@results.detect(&:failed?)
+      end
     end
   end
 end

data/lib/jasmine/tasks/jasmine.rake

@@ -48,7 +48,7 @@ namespace :jasmine do
     runner = config.runner.call(Jasmine::Formatters::Multi.new(formatters), url)
     runner.run
 
-    exit exit_code_formatter.exit_code
+    break unless exit_code_formatter.succeeded?
   end
 
   task :server => %w(jasmine:require jasmine:configure) do

data/lib/jasmine/version.rb

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "2.0.0.rc3"
+  VERSION = "2.0.0.rc4"
 end

data/release_notes/v2.0.0.rc3.md

@@ -0,0 +1,78 @@
+# Jasmine Gem 2.0 Release Notes
+
+These notes cover version 2.0.0.rc3
+
+## Summary
+
+This release is focused on support for Jasmine 2.0, gem configuration simplification, and improvement of Rails support (including Rails 4).
+
+The `Jasmine.configure` block now allows for fine-tuned configuration of how a project's suite is run. There are two new/refined concepts: Runners and Formatters.
+
+Formatters are responsible for taking the results from the Jasmine suite and presenting the data in a specific format. Runners take a URL and a Formatter and are responsible for running the Jasmine suite and passing results to the given formatter.
+
+The default Runner uses PhantomJS to run the suite. The default Formatter sends results to the console. There are Ruby gems for a [Selenium/Webdriver Runner][selenium] and a [JUnit XML Formatter][junit]. These projects are great examples for writing a Runner or Formatter for your environment.
+
+## Dropped Support
+
+* _Most_ ENV variables removed - use `Jasmine.configure` to set browser, ports, etc.
+* Dropped support for 1.8.x Rubies, Rails 2, RSpec 1 - please continue to use Jasmine gem 1.3.2
+* "self-test" is gone as [Jasmine core now tests itself](http://travis-ci.org/pivotal/jasmine)
+
+## Changes
+
+* Support for changes in Jasmine 2.0
+    * Hooks in `jasmine.yml` and configuration for `boot_dir` and `boot_files`
+    * Support for changes to results interface
+* Results Formatters:
+    * New console results formatter for CI tasks - Jasmine Gem no longer depend on RSpec for console output
+    * Optional JUnit XML results formatter for CI tasks
+    * Projects can provide custom formatters
+* Rails 4 support
+* Better support for non-Rails Ruby projects
+* Loosely pinning to the `jasmine-core` gem, allowing for Jasmine Core's build to work on release for Jasmine build to work.
+    * SHA: 42021e3a86e57f6b7b23dfbe921867d7560f4e4f
+* Add warning to `jasmine init`
+    * SHA: e071474b014e7d6909d69f86988b84eacb801201
+* Globbing should now return files in a consistent, predictable order across systems
+* Improved integration tests with Rails
+* Added the configuration option to specify your own Webdriver instance
+* Brought back the Jasmine Favicon
+
+### In RC3
+
+* Better re-work of Runners and Formatters
+* In Rails 4, turn off turbolink processing of jasmine runner spec links so spec links work
+* User can copy `boot.js` into their project for customization - usage: `jasmine copy_boot_js`
+* Allow user to configure path to `jasmine.yml` via an ENV variable.
+* More data printed out to console when starting the Jasmine server
+* Support for specs to be written in CoffeeScript when used with Rails
+* Fix stylesheet asset expansion for Rails 4
+* Remove RSpec dependency - Jasmine gem builds its own output
+* Remove Selenium dependency - builds run against PhantomJS by default
+* Remove accidental sqllite development dependency
+* Jasmine example code no longer installed when `jasmine init` is run. Examples are now installed explicitly with `jasmine examples`
+* Extraction to separate gems for:
+    * JUnit XML formatter
+    * Selenium/Webdriver integration
+
+## Accepted Pull Requests
+
+* Fix README.markdown and add config example #[144](http://github.com/pivotal/jasmine-gem/pull/144) from @enrapt-mochizuki
+* Use a relative path to jasmine repo in Gemfile #[161](http://github.com/pivotal/jasmine-gem/pull/161) from @zephyr-dev
+* Problem when using a asset prefix other than '/assets' #[155](http://github.com/pivotal/jasmine-gem/pull/155) from @janv
+* Remove unused code - #[154](http://github.com/pivotal/jasmine-gem/pull/154) from @daytonn
+* Fix default path for :spec_helper in template #[147](http://github.com/pivotal/jasmine-gem/pull/147) from @kmayer
+* Improve Gemfile installation instructions #[141](http://github.com/pivotal/jasmine-gem/pull/141)
+
+### In RC3
+
+* Use IE=edge for IE compatibility because this will put IE into the highest available mode for each version of IE - see [Question on StackOverflow](http://stackoverflow.com/questions/3449286/force-ie-compatibility-mode-off-in-ie-using-tags
+) - #[168](http://github.com/pivotal/jasmine-gem/pull/168) from @iwz
+
+
+------
+
+_Release Notes generated with [Anchorman](http://github.com/infews/anchorman)_
+
+[selenium]: https://github.com/jasmine/jasmine_selenium_runner
+[junit]: https://github.com/jasmine/jasmine_junitxml_formatter

data/release_notes/v2.0.0.rc4.md

@@ -0,0 +1,89 @@
+# Jasmine Gem 2.0 Release Notes
+
+These notes cover version 2.0.0.rc3
+
+## Summary
+
+This release is focused on support for Jasmine 2.0, gem configuration simplification, and improvement of Rails support (including Rails 4).
+
+The `Jasmine.configure` block now allows for fine-tuned configuration of how a project's suite is run. There are two new/refined concepts: Runners and Formatters.
+
+Formatters are responsible for taking the results from the Jasmine suite and presenting the data in a specific format. Runners take a URL and a Formatter and are responsible for running the Jasmine suite and passing results to the given formatter.
+
+The default Runner uses PhantomJS to run the suite. The default Formatter sends results to the console. There are Ruby gems for a [Selenium/Webdriver Runner][selenium] and a [JUnit XML Formatter][junit]. These projects are great examples for writing a Runner or Formatter for your environment.
+
+## Dropped Support
+
+* _Most_ ENV variables removed - use `Jasmine.configure` to set browser, ports, etc.
+* Dropped support for 1.8.x Rubies, Rails 2, RSpec 1 - please continue to use Jasmine gem 1.3.2
+* "self-test" is gone as [Jasmine core now tests itself](http://travis-ci.org/pivotal/jasmine)
+
+## Changes
+
+* Support for changes in Jasmine 2.0
+    * Hooks in `jasmine.yml` and configuration for `boot_dir` and `boot_files`
+    * Support for changes to results interface
+* Results Formatters:
+    * New console results formatter for CI tasks - Jasmine Gem no longer depend on RSpec for console output
+    * Optional JUnit XML results formatter for CI tasks
+    * Projects can provide custom formatters
+* Rails 4 support
+* Better support for non-Rails Ruby projects
+* Loosely pinning to the `jasmine-core` gem, allowing for Jasmine Core's build to work on release for Jasmine build to work.
+    * SHA: 42021e3a86e57f6b7b23dfbe921867d7560f4e4f
+* Add warning to `jasmine init`
+    * SHA: e071474b014e7d6909d69f86988b84eacb801201
+* Globbing should now return files in a consistent, predictable order across systems
+* Improved integration tests with Rails
+* Added the configuration option to specify your own Webdriver instance
+* Brought back the Jasmine Favicon
+
+### In RC4
+
+* `jasmine:ci` rake task doesn't call exit and stop other rake tasks
+
+* Respect source js files outside the asset pipeline
+
+[Finish #37284657](http://www.pivotaltracker.com/story/37284657)
+    * SHA: ad8f6c839bce5d362409e59c46043b0ecc762faf
+    * Gregg Van Hove and Tim Jarratt, pair+gvanhove+tjarratt@pivotallabs.com
+
+
+### In RC3
+
+* Better re-work of Runners and Formatters
+* In Rails 4, turn off turbolink processing of jasmine runner spec links so spec links work
+* User can copy `boot.js` into their project for customization - usage: `jasmine copy_boot_js`
+* Allow user to configure path to `jasmine.yml` via an ENV variable.
+* More data printed out to console when starting the Jasmine server
+* Support for specs to be written in CoffeeScript when used with Rails
+* Fix stylesheet asset expansion for Rails 4
+* Remove RSpec dependency - Jasmine gem builds its own output
+* Remove Selenium dependency - builds run against PhantomJS by default
+* Remove accidental sqllite development dependency
+* Jasmine example code no longer installed when `jasmine init` is run. Examples are now installed explicitly with `jasmine examples`
+* Extraction to separate gems for:
+    * JUnit XML formatter
+    * Selenium/Webdriver integration
+
+## Accepted Pull Requests
+
+* Fix README.markdown and add config example #[144](http://github.com/pivotal/jasmine-gem/pull/144) from @enrapt-mochizuki
+* Use a relative path to jasmine repo in Gemfile #[161](http://github.com/pivotal/jasmine-gem/pull/161) from @zephyr-dev
+* Problem when using a asset prefix other than '/assets' #[155](http://github.com/pivotal/jasmine-gem/pull/155) from @janv
+* Remove unused code - #[154](http://github.com/pivotal/jasmine-gem/pull/154) from @daytonn
+* Fix default path for :spec_helper in template #[147](http://github.com/pivotal/jasmine-gem/pull/147) from @kmayer
+* Improve Gemfile installation instructions #[141](http://github.com/pivotal/jasmine-gem/pull/141)
+
+### In RC3
+
+* Use IE=edge for IE compatibility because this will put IE into the highest available mode for each version of IE - see [Question on StackOverflow](http://stackoverflow.com/questions/3449286/force-ie-compatibility-mode-off-in-ie-using-tags
+) - #[168](http://github.com/pivotal/jasmine-gem/pull/168) from @iwz
+
+
+------
+
+_Release Notes generated with [Anchorman](http://github.com/infews/anchorman)_
+
+[selenium]: https://github.com/jasmine/jasmine_selenium_runner
+[junit]: https://github.com/jasmine/jasmine_junitxml_formatter

data/spec/fixture/non_asset_pipeline.js

@@ -0,0 +1 @@
+window.NonAssetPipeline = true;

data/spec/fixture/non_asset_pipeline_test.js

@@ -0,0 +1,5 @@
+describe("non asset pipeline", function() {
+  it("should work too", function() {
+    expect(window.NonAssetPipeline).toBe(true);
+  });
+});

data/spec/jasmine_rails_spec.rb

@@ -130,5 +130,20 @@ if Jasmine::Dependencies.rails_available?
         end
       end
     end
+
+    it "should load js files outside of the assets path too" do
+      yaml = custom_jasmine_config('public-assets') do |jasmine_config|
+        jasmine_config['src_files'] << 'public/javascripts/**/*.js'
+        jasmine_config['spec_files'] = ['non_asset_pipeline_test.js']
+      end
+      FileUtils.mkdir_p(File.join('public', 'javascripts'))
+      FileUtils.cp(File.join(@root, 'spec', 'fixture', 'non_asset_pipeline.js'), File.join('public', 'javascripts'))
+      FileUtils.cp(File.join(@root, 'spec', 'fixture', 'non_asset_pipeline_test.js'), File.join('spec', 'javascripts'))
+
+      Bundler.with_clean_env do
+        output = `bundle exec rake jasmine:ci JASMINE_CONFIG_PATH=#{yaml}`
+        output.should include('1 spec, 0 failures')
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0.rc4
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -188,6 +188,8 @@ files:
 - release_notes/v1.2.1.md
 - release_notes/v1.3.2.md
 - release_notes/v2.0.0.rc2.md
+- release_notes/v2.0.0.rc3.md
+- release_notes/v2.0.0.rc4.md
 - spec/application_integration_spec.rb
 - spec/application_spec.rb
 - spec/base_spec.rb
@@ -197,6 +199,8 @@ files:
 - spec/fixture/failing_runner.rb
 - spec/fixture/failing_test.js
 - spec/fixture/large_test_suite_spec.js
+- spec/fixture/non_asset_pipeline.js
+- spec/fixture/non_asset_pipeline_test.js
 - spec/jasmine_command_line_tool_spec.rb
 - spec/jasmine_pojs_spec.rb
 - spec/jasmine_rails_spec.rb
@@ -232,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: JavaScript BDD framework
@@ -246,6 +250,8 @@ test_files:
 - spec/fixture/failing_runner.rb
 - spec/fixture/failing_test.js
 - spec/fixture/large_test_suite_spec.js
+- spec/fixture/non_asset_pipeline.js
+- spec/fixture/non_asset_pipeline_test.js
 - spec/jasmine_command_line_tool_spec.rb
 - spec/jasmine_pojs_spec.rb
 - spec/jasmine_rails_spec.rb