jasmine-rails 0.4.5 → 0.4.6

data/README.md

@@ -37,7 +37,7 @@ mount JasmineRails::Engine => "/specs" if defined?(JasmineRails)
 
 ## Configuration
 
-In order to run any specs, you'll need a Jasmine configuration in `spec/javascripts/support/jasmine.yml`. [Here's an example](https://github.com/searls/jasmine-rails/tree/master/spec/dummy/spec/javascripts/support) from this repo's [dummy project](https://github.com/searls/jasmine-rails/tree/master/spec/dummy).
+In order to run any specs, you'll need a Jasmine configuration in `spec/javascripts/support/jasmine.yml`. [Here's an example](https://github.com/searls/jasmine-rails/tree/master/spec/javascripts/support) from this repo's [dummy project](https://github.com/searls/jasmine-rails/tree/master/spec/dummy).
 
 ``` yaml
 # path to parent directory of src_files
@@ -87,11 +87,16 @@ spec_files:
   - "**/*[Ss]pec.{js,coffee}"
 ```
 
+You can write a spec to test Foo in `spec/javascripts/foo_spec.js`:
+
 ```javascript
-//= require helpers/spec_helper  (includes spec/javascripts/helpers/spec_helper.js)
-//= require foo                  (includes app/assets/javascripts/foo.js)
+// include spec/javascripts/helpers/spec_helper.js and app/assets/javascripts/foo.js
+//= require helpers/spec_helper
+//= require foo
 describe('Foo', function() {
-  it('does something');
+  it("does something", function() {
+    expect(1 + 1).toBe(2);
+  });
 });
 ```
 
@@ -99,7 +104,7 @@ describe('Foo', function() {
 
 If you were to run:
 
-    bundle exec rake spec:javascript
+    RAILS_ENV=test bundle exec rake spec:javascript
 
 You'd hopefully see something like:
 
@@ -109,7 +114,7 @@ You'd hopefully see something like:
 
 You can filter execution by passing the `SPEC` option as well:
 
-    bundle exec rake spec:javascript SPEC=my_test
+    RAILS_ENV=test bundle exec rake spec:javascript SPEC=my_test
 
 If you experience an error at this point, the most likely cause is JavaScript being loaded out of order, or otherwise conflicting with other existing JavaScript in your project. See "Debugging" below.
 

data/app/controllers/jasmine_rails/spec_runner_controller.rb

@@ -1,5 +1,5 @@
 module JasmineRails
-  class SpecRunnerController < ApplicationController
+  class SpecRunnerController < JasmineRails::ApplicationController
     def index
       JasmineRails.reload_jasmine_config
     end

data/app/helpers/jasmine_rails/spec_runner_helper.rb

@@ -20,6 +20,7 @@ module JasmineRails
     def jasmine_js_files
       files = Jasmine::Core.js_files
       if params[:console]
+        files << 'jasmine-console-shims.js'
         files << 'jasmine-console-reporter.js'
       end
       files << 'jasmine-boot.js'

data/lib/assets/javascripts/jasmine-console-reporter.js

@@ -91,7 +91,7 @@
   };
 
   proto.reportSuiteResults = function(suite) {
-    if (!suite.parentSuite) { return; }
+    if (suite.parentSuite) { return; }
     var results = suite.results();
     if (results.totalCount === 0) {
       return;

data/lib/assets/javascripts/jasmine-console-shims.js

@@ -0,0 +1,31 @@
+(function() {
+  /**
+   * Function.bind Polyfill for ECMAScript 5 Support
+   * Kangax's bind with Broofa's arg optimization.
+   * http://www.broofa.com/Tools/JSLitmus/tests/PrototypeBind.html
+   *
+   * Copied from https://gist.github.com/rxgx/1597825
+   */
+  if (typeof Function.prototype.bind !== "function") {
+    Function.prototype.bind = function() {
+      var slice = Array.prototype.slice;
+      return function(context) {
+        var fn = this,
+          args = slice.call(arguments, 1);
+        if (args.length) {
+          return function() {
+            return arguments.length
+              ? fn.apply(context, args.concat(slice.call(arguments)))
+              : fn.apply(context, args);
+          };
+        }
+        return function() {
+          return arguments.length
+            ? fn.apply(context, arguments)
+            : fn.call(context);
+        };
+      };
+    };
+  }
+})();
+

data/lib/{tasks/runner.js → assets/javascripts/jasmine-runner.js}

@@ -36,7 +36,7 @@
       var fs = require("fs");
       fs.write(data.filename, data.text, 'w');
     } else {
-      console.log('unkown event callback: ' + data);
+      console.log('unknown event callback: ' + data);
     }
   };
 

data/lib/jasmine-rails.rb

@@ -58,7 +58,8 @@ module JasmineRails
 
     def jasmine_config
       @config ||= begin
-        path = Rails.root.join('spec', 'javascripts', 'support', 'jasmine.yml')
+        path = Rails.root.join('config', 'jasmine.yml')      
+        path = Rails.root.join('spec', 'javascripts', 'support', 'jasmine.yml') unless File.exists?(path)
         initialize_jasmine_config_if_absent(path)
         YAML.load_file(path)
       end

data/lib/jasmine_rails/runner.rb

@@ -0,0 +1,56 @@
+require 'jasmine_rails/offline_asset_paths'
+
+module JasmineRails
+  module Runner
+    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)
+        override_rails_config do
+          include_offline_asset_paths_helper
+          html = get_spec_runner(spec_filter)
+          runner_path = Rails.root.join('spec/tmp/runner.html')
+          File.open(runner_path, 'w') {|f| f << html.gsub('/assets', './assets')}
+
+          phantomjs_runner_path = File.join(File.dirname(__FILE__), '..', 'assets', 'javascripts', 'jasmine-runner.js')
+          run_cmd %{phantomjs "#{phantomjs_runner_path}" "file://#{runner_path.to_s}?spec=#{spec_filter}"}
+        end
+      end
+
+      private
+      def include_offline_asset_paths_helper
+        if Rails::VERSION::MAJOR >= 4
+          Sprockets::Rails::Helper.send :include, JasmineRails::OfflineAssetPaths
+        else
+          ActionView::AssetPaths.send :include, JasmineRails::OfflineAssetPaths
+        end
+      end
+
+      def override_rails_config
+        config = Rails.application.config
+
+        original_asssets_debug = config.assets.debug
+        config.assets.debug = false
+        yield
+        config.assets.debug = original_asssets_debug
+      end
+
+      def get_spec_runner(spec_filter)
+        app = ActionDispatch::Integration::Session.new(Rails.application)
+        path = JasmineRails.route_path
+        JasmineRails::OfflineAssetPaths.disabled = false
+        app.get path, :console => 'true', :spec => spec_filter
+        JasmineRails::OfflineAssetPaths.disabled = true
+        raise "Jasmine runner at '#{path}' returned a #{app.response.status} error: #{app.response.message}" unless app.response.success?
+        app.response.body
+      end
+
+      def run_cmd(cmd)
+        puts "Running `#{cmd}`"
+        unless system(cmd)
+          raise "Error executing command: #{cmd}"
+        end
+      end
+    end
+  end
+end

data/lib/jasmine_rails/version.rb

@@ -1,3 +1,3 @@
 module JasmineRails
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/lib/tasks/jasmine-rails_tasks.rake

@@ -1,31 +1,10 @@
 namespace :spec do
-  def run_cmd(cmd)
-    puts "$ #{cmd}"
-    unless system(cmd)
-      raise "Error executing command: #{cmd}"
-    end
-  end
 
   desc "run test with phantomjs"
-  task :javascript => :environment do
-    Rails.application.config.assets.debug = false
-    require 'jasmine_rails/offline_asset_paths'
-    if Rails::VERSION::MAJOR == 4
-      Sprockets::Rails::Helper.send :include, JasmineRails::OfflineAssetPaths
-    else
-      ActionView::AssetPaths.send :include, JasmineRails::OfflineAssetPaths
-    end
+  task :javascript => [:environment] do
+    require 'jasmine_rails/runner'
     spec_filter = ENV['SPEC']
-    app = ActionController::Integration::Session.new(Rails.application)
-    path = JasmineRails.route_path
-    app.get path, :console => 'true', :spec => spec_filter
-    JasmineRails::OfflineAssetPaths.disabled = true
-    raise "Jasmine runner at '#{path}' returned a #{app.response.status} error: #{app.response.message}" unless app.response.success?
-    html = app.response.body
-    runner_path = Rails.root.join('spec/tmp/runner.html')
-    File.open(runner_path, 'w') {|f| f << html.gsub('/assets', './assets')}
-
-    run_cmd %{phantomjs "#{File.join(File.dirname(__FILE__), 'runner.js')}" "file://#{runner_path.to_s}?spec=#{spec_filter}"}
+    JasmineRails::Runner.run spec_filter
   end
 
   # alias

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,13 +95,15 @@ files:
 - config/routes.rb
 - lib/assets/javascripts/jasmine-boot.js
 - lib/assets/javascripts/jasmine-console-reporter.js
+- lib/assets/javascripts/jasmine-console-shims.js
+- lib/assets/javascripts/jasmine-runner.js
 - lib/assets/javascripts/jasmine-specs.js.erb
 - lib/jasmine-rails.rb
 - lib/jasmine_rails/engine.rb
 - lib/jasmine_rails/offline_asset_paths.rb
+- lib/jasmine_rails/runner.rb
 - lib/jasmine_rails/version.rb
 - lib/tasks/jasmine-rails_tasks.rake
-- lib/tasks/runner.js
 - MIT-LICENSE
 - Rakefile
 - README.md
@@ -119,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -657665096791402886
+      hash: 384198483
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -657665096791402886
+      hash: 384198483
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23