jasmine-rails 0.8.1 → 0.9.0

data/README.md

@@ -129,8 +129,8 @@ Again, it's the opinion of the present author that this shouldn't be necessary i
 
 ### Custom Helpers
 
-If you need to write a custom spec runner template (for example, using requireJS to load components from your specs), you might benifit from 
-custom helper functions.  The controller will attempt to load JasmineRails::SpecHelper if it exists. An example:
+If you need to write a custom spec runner template (for example, using requireJS to load components from your specs), you might benefit from 
+custom helper functions.  The controller will attempt to load `JasmineRails::SpecHelper` if it exists. An example:
 
 ```ruby
 # in lib/jasmine_rails/spec_helper.rb
@@ -143,13 +143,15 @@ Module JasmineRails
 end
 ```
 
-Create a custom layout in app/layouts/jasmine_rails/spec_runner.html.erb and reference your helper
+Create a custom layout in app/layouts/jasmine_rails/spec_runner.html.erb and reference your helper:
+
 ```erb
 <%= custom_function %>
 ```
 
-If you wanted to do something like this using requirejs-rails https://github.com/jwhitley/requirejs-rails, your helper 
-might look like this
+If you wanted to do something like this using [requirejs-rails](https://github.com/jwhitley/requirejs-rails), your helper 
+might look like this:
+
 ```
 
 # in lib/jasmine_rails_spec_helper.rb
@@ -161,7 +163,7 @@ Module JasmineRails
 end
 ```
 
-Remove any reference to src_files in `spec/javascripts/support/jasmine.yml`, to ensure files aren't loaded prematurely
+Remove any reference to `src_files` in `spec/javascripts/support/jasmine.yml`, to ensure files aren't loaded prematurely.
 
 Create your custom layout `app/layouts/jasmine_rails/spec_runner.html.erb` like so:
 ```erb
@@ -184,7 +186,7 @@ Create your custom layout `app/layouts/jasmine_rails/spec_runner.html.erb` like
 
 ```
 
-Use require with a callback to load your components
+Use require with a callback to load your components:
 
 ```coffeescript
 
@@ -193,3 +195,30 @@ describe 'test my module', ->
 		it 'does something', ->
 			expect(Module.method).toEqual 'something'
 ```
+
+### Custom Reporter
+
+You can configure custom reporter files to use when running from the
+command line in `jasmine.yml`:
+
+```yml
+reporters:
+  cool-reporter:
+    - "cool-reporter.js"
+  awesome-reporter:
+    - "awesome-part-1.js"
+    - "awesome-part-2.js"
+```
+
+Then, specify which reporters to use when you run the rake task:
+
+```
+RAILS_ENV=test REPORTERS='cool-reporter,awesome-reporter' rake spec:javascripts
+```
+
+The console reporter shipped with jasmine-rails will be used by
+default, and you can explicitly use it by the name `console`.
+
+See [jasmine-junitreporter][j-junit] for an example with JUnit output.
+
+[j-junit]: https://github.com/shepmaster/jasmine-junitreporter-gem

data/app/helpers/jasmine_rails/spec_runner_helper.rb

@@ -16,16 +16,13 @@ module JasmineRails
     # all files are fetched through the Rails asset pipeline
     # includes:
     # * core jasmine libraries
-    # * (optional) jasmine-console-reporter.js for CLI output
+    # * (optional) reporter libraries
     # * jasmine-boot.js test runner
     # * jasmine-specs.js built by asset pipeline which merges application specific libraries and specs
     def jasmine_js_files
       files = Jasmine::Core.js_files
       files << jasmine_boot_file
-      if params[:console]
-        files << 'jasmine-console-shims.js'
-        files << 'jasmine-console-reporter.js'
-      end
+      files += JasmineRails.reporter_files params[:reporters]
       files << 'jasmine-specs.js'
       files
     end

data/lib/jasmine-rails.rb

@@ -2,6 +2,8 @@ require "jasmine_rails/engine"
 
 module JasmineRails
   DEFAULT_TMP_DIR = 'tmp/jasmine'
+  CONSOLE_REPORTERS = {'console' => ['jasmine-console-shims.js',
+                                     'jasmine-console-reporter.js']}
   class << self
     # return the relative path to access the spec runner
     # for the host Rails application
@@ -29,6 +31,15 @@ module JasmineRails
       Rails.root.join(path)
     end
 
+    def reporter_files(types_string)
+      types = types_string.to_s.split(',')
+
+      reporters = jasmine_config['reporters'] || {}
+      reporters = reporters.merge(JasmineRails::CONSOLE_REPORTERS)
+
+      reporters.values_at(*types).compact.flatten
+    end
+
     # returns list of all files to be included into the jasmine testsuite
     # includes:
     # * application src_files

data/lib/jasmine_rails/runner.rb

@@ -5,13 +5,13 @@ module JasmineRails
     class << self
       # Run the Jasmine testsuite via phantomjs CLI
       # raises an exception if any errors are encountered while running the testsuite
-      def run(spec_filter = nil)
+      def run(spec_filter = nil, reporters = 'console')
         override_rails_config do
           require 'phantomjs'
           require 'fileutils'
 
           include_offline_asset_paths_helper
-          html = get_spec_runner(spec_filter)
+          html = get_spec_runner(spec_filter, reporters)
           FileUtils.mkdir_p JasmineRails.tmp_dir
           runner_path = JasmineRails.tmp_dir.join('runner.html')
           asset_prefix = Rails.configuration.assets.prefix.gsub(/\A\//,'')
@@ -51,12 +51,12 @@ module JasmineRails
         ActionController::Base.asset_host = original_assets_host
       end
 
-      def get_spec_runner(spec_filter)
+      def get_spec_runner(spec_filter, reporters)
         app = ActionDispatch::Integration::Session.new(Rails.application)
         app.https!(JasmineRails.force_ssl)
         path = JasmineRails.route_path
         JasmineRails::OfflineAssetPaths.disabled = false
-        app.get path, :console => 'true', :spec => spec_filter
+        app.get path, :reporters => reporters, :spec => spec_filter
         JasmineRails::OfflineAssetPaths.disabled = true
         unless app.response.success?
           raise "Jasmine runner at '#{path}' returned a #{app.response.status} error: #{app.response.message} \n\n" +

data/lib/jasmine_rails/version.rb

@@ -1,3 +1,3 @@
 module JasmineRails
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

data/lib/tasks/jasmine-rails_tasks.rake

@@ -4,7 +4,8 @@ namespace :spec do
   task :javascript => [:environment] do
     require 'jasmine_rails/runner'
     spec_filter = ENV['SPEC']
-    JasmineRails::Runner.run spec_filter
+    reporters = ENV.fetch('REPORTERS', 'console')
+    JasmineRails::Runner.run spec_filter, reporters
   end
 
   # alias

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -149,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1022083536610826392
+      hash: -2099432972387832543
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1022083536610826392
+      hash: -2099432972387832543
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23